From b6f5088ad16247cd8b2bc802b554b48ec4acb364 Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Tue, 17 Jul 2001 02:24:16 +0000 Subject: [PATCH] Backing out existing fix for 87193 -- r=mstolz, sr=shaver, attinasi git-svn-id: svn://10.0.0.236/trunk@99374 18797224-902f-48f8-a5cc-f745e15eee43 --- .../js/src/xpconnect/src/xpccomponents.cpp | 5 +- .../xpcom/components/nsComponentManager.cpp | 64 +------------------ mozilla/xpcom/components/nsComponentManager.h | 5 +- .../xpcom/components/nsIComponentManager.idl | 12 ---- 4 files changed, 4 insertions(+), 82 deletions(-) diff --git a/mozilla/js/src/xpconnect/src/xpccomponents.cpp b/mozilla/js/src/xpconnect/src/xpccomponents.cpp index 4eb1877093b..8bb1113dd38 100644 --- a/mozilla/js/src/xpconnect/src/xpccomponents.cpp +++ b/mozilla/js/src/xpconnect/src/xpccomponents.cpp @@ -1781,13 +1781,10 @@ nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName { static const NS_NAMED_LITERAL_STRING(s_interfaces, "interfaces"); static const NS_NAMED_LITERAL_STRING(s_results, "results"); - static const NS_NAMED_LITERAL_STRING(s_manager, "manager"); const nsDependentString name(propertyName); - if(name.Equals(s_interfaces) || - name.Equals(s_results) || - name.Equals(s_manager)) + if(name.Equals(s_interfaces) || name.Equals(s_results)) *_retval = CloneAllAccess(); else *_retval = nsnull; diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index 43e6425071d..17696b74bfe 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -417,9 +417,8 @@ nsComponentManagerImpl::~nsComponentManagerImpl() PR_LOG(nsComponentManagerLog, PR_LOG_ALWAYS, ("nsComponentManager: Destroyed.")); } -NS_IMPL_ISUPPORTS4(nsComponentManagerImpl, nsIComponentManager, - nsISupportsWeakReference, nsIInterfaceRequestor, - nsISecurityCheckedComponent) +NS_IMPL_ISUPPORTS3(nsComponentManagerImpl, nsIComponentManager, + nsISupportsWeakReference, nsIInterfaceRequestor) //////////////////////////////////////////////////////////////////////////////// // nsComponentManagerImpl: Platform methods @@ -1974,12 +1973,6 @@ RegisterDeferred_enumerate(nsHashKey *key, void *aData, void *aClosure) return NS_SUCCEEDED(closure->status) ? PR_TRUE : PR_FALSE; } -nsresult -nsComponentManagerImpl::RefreshComponents(void) -{ - return AutoRegister(NS_Script, nsnull); -} - nsresult nsComponentManagerImpl::AutoRegister(PRInt32 when, nsIFile *inDirSpec) { @@ -2345,56 +2338,3 @@ NS_GetGlobalComponentManager(nsIComponentManager* *result) } //////////////////////////////////////////////////////////////////////////////// - - -//////////////////////////////////////////////////////////////////////////////// -// nsComponentManagerImpl: methods for nsISecurityCheckedComponent interface -//////////////////////////////////////////////////////////////////////////////// - - -static char* CloneAllAccess() -{ - static const char allAccess[] = "AllAccess"; - return (char*)nsMemory::Clone(allAccess, sizeof(allAccess)); -} - -/* string canCreateWrapper (in nsIIDPtr iid); */ -NS_IMETHODIMP -nsComponentManagerImpl::CanCreateWrapper(const nsIID * iid, char **_retval) -{ - // We let anyone do this... - *_retval = CloneAllAccess(); - return NS_OK; -} - -/* string canCallMethod (in nsIIDPtr iid, in wstring methodName); */ -NS_IMETHODIMP -nsComponentManagerImpl::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) -{ - // Allow unprivileged scripts to call Components.manager.refreshComponents - static const NS_NAMED_LITERAL_STRING(s_refreshComponents, "refreshComponents"); - - if(! nsCRT::strcmp(methodName, s_refreshComponents.get())) - *_retval = CloneAllAccess(); - else - *_retval = nsnull; - return NS_OK; -} - -/* string canGetProperty (in nsIIDPtr iid, in wstring propertyName); */ -NS_IMETHODIMP -nsComponentManagerImpl::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) -{ - // If you have to ask, then the answer is NO - *_retval = nsnull; - return NS_OK; -} - -/* string canSetProperty (in nsIIDPtr iid, in wstring propertyName); */ -NS_IMETHODIMP -nsComponentManagerImpl::CanSetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) -{ - // If you have to ask, then the answer is NO - *_retval = nsnull; - return NS_OK; -} diff --git a/mozilla/xpcom/components/nsComponentManager.h b/mozilla/xpcom/components/nsComponentManager.h index 7036f9e598f..40e2ad56e01 100644 --- a/mozilla/xpcom/components/nsComponentManager.h +++ b/mozilla/xpcom/components/nsComponentManager.h @@ -36,7 +36,6 @@ #include "nsWeakReference.h" #include "nsXPIDLString.h" #include "nsIFile.h" -#include "nsISecurityCheckedComponent.h" class nsFactoryEntry; class nsDll; @@ -55,13 +54,11 @@ extern const char XPCOM_LIB_PREFIX[]; class nsComponentManagerImpl : public nsIComponentManager, public nsSupportsWeakReference, - public nsIInterfaceRequestor, public nsISecurityCheckedComponent -{ + public nsIInterfaceRequestor { public: NS_DECL_ISUPPORTS NS_DECL_NSICOMPONENTMANAGER NS_DECL_NSIINTERFACEREQUESTOR - NS_DECL_NSISECURITYCHECKEDCOMPONENT // nsComponentManagerImpl methods: nsComponentManagerImpl(); diff --git a/mozilla/xpcom/components/nsIComponentManager.idl b/mozilla/xpcom/components/nsIComponentManager.idl index ea430748185..db474915b6d 100644 --- a/mozilla/xpcom/components/nsIComponentManager.idl +++ b/mozilla/xpcom/components/nsIComponentManager.idl @@ -326,18 +326,6 @@ interface nsIComponentManager : nsISupports * @return : enumerator for ContractIDs. */ nsIEnumerator enumerateContractIDs(); - - /** - * refreshComponents - * - * Enumerates directory looking for modules of all types and registers - * modules who have changed (modtime or size) since the last time - * autoRegister() was invoked. Same as autoRegister, except that it - * always uses the default components directory. Web scripts may - * call this function but may not call autoRegister. - */ - void refreshComponents(); - }; %{ C++