From 478a8a09940007c854339bdd131799cf5ba16a67 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Tue, 22 Mar 2005 20:37:18 +0000 Subject: [PATCH] Bug 267040 - Remove obsolete XPCOM dllexports for the old component manager r=darin git-svn-id: svn://10.0.0.236/trunk@171000 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/components/Makefile.in | 2 - .../components/nsComponentManagerObsolete.cpp | 325 ------------------ .../components/nsComponentManagerObsolete.h | 190 ---------- mozilla/xpcom/proxy/src/nsProxyEvent.cpp | 1 - .../xpcom/proxy/src/nsProxyObjectManager.cpp | 1 - 5 files changed, 519 deletions(-) delete mode 100644 mozilla/xpcom/components/nsComponentManagerObsolete.cpp delete mode 100644 mozilla/xpcom/components/nsComponentManagerObsolete.h diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in index f20364a65c5..cb0e04529d1 100644 --- a/mozilla/xpcom/components/Makefile.in +++ b/mozilla/xpcom/components/Makefile.in @@ -53,7 +53,6 @@ REQUIRES = string \ CPPSRCS = \ nsCategoryManager.cpp \ nsComponentManager.cpp \ - nsComponentManagerObsolete.cpp \ nsNativeComponentLoader.cpp \ nsServiceManagerObsolete.cpp \ xcDll.cpp \ @@ -65,7 +64,6 @@ endif EXPORTS = \ nsCategoryManagerUtils.h \ - nsComponentManagerObsolete.h \ nsIServiceManagerObsolete.h \ nsModule.h \ nsNativeComponentLoader.h \ diff --git a/mozilla/xpcom/components/nsComponentManagerObsolete.cpp b/mozilla/xpcom/components/nsComponentManagerObsolete.cpp deleted file mode 100644 index c87dc293162..00000000000 --- a/mozilla/xpcom/components/nsComponentManagerObsolete.cpp +++ /dev/null @@ -1,325 +0,0 @@ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is XPCOM. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -//////////////////////////////////////////////////////////////////////////////// -// Global Static Component Manager Methods -// (for when you need to link with xpcom) - -#include "nsXPCOM.h" -#include "nsIComponentManagerObsolete.h" -#include "nsComponentManagerObsolete.h" - - -nsresult -nsComponentManager::Initialize(void) -{ - NS_NOTREACHED("nsComponentManager::Initialize is deprecated"); - return NS_OK; -} - -nsresult -nsComponentManager::FindFactory(const nsCID &aClass, - nsIFactory **aFactory) -{ - NS_NOTREACHED("nsComponentManager::FindFactory is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->FindFactory(aClass, aFactory); -} - -nsresult -nsComponentManager::GetClassObject(const nsCID &aClass, const nsIID &aIID, - void **aResult) -{ - NS_NOTREACHED("nsComponentManager::GetClassObject is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->GetClassObject(aClass, aIID, aResult); -} - -nsresult -nsComponentManager::GetClassObjectByContractID(const char *aContractID, - const nsIID &aIID, - void **aResult) -{ - NS_NOTREACHED("nsComponentManager::GetClassObjectByContractID is deprecated"); - - nsCOMPtr cm; - nsresult rv = NS_GetComponentManager(getter_AddRefs(cm)); - if (NS_FAILED(rv)) return rv; - return cm->GetClassObjectByContractID(aContractID, aIID, aResult); -} - -nsresult -nsComponentManager::ContractIDToClassID(const char *aContractID, - nsCID *aClass) -{ - NS_NOTREACHED("nsComponentManager::ContractIDToClassID is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->ContractIDToClassID(aContractID, aClass); -} - -nsresult -nsComponentManager::CLSIDToContractID(nsCID *aClass, - char* *aClassName, - char* *aContractID) -{ - NS_NOTREACHED("nsComponentManager::CLSIDToContractID is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->CLSIDToContractID(*aClass, aClassName, aContractID); -} - -nsresult -nsComponentManager::CreateInstance(const nsCID &aClass, - nsISupports *aDelegate, - const nsIID &aIID, - void **aResult) -{ - NS_NOTREACHED("nsComponentManager::CreateInstance is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->CreateInstance(aClass, aDelegate, aIID, aResult); -} - -nsresult -nsComponentManager::CreateInstance(const char *aContractID, - nsISupports *aDelegate, - const nsIID &aIID, - void **aResult) -{ - NS_NOTREACHED("nsComponentManager::CreateInstance is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->CreateInstanceByContractID(aContractID, aDelegate, aIID, aResult); -} - -nsresult -nsComponentManager::RegisterFactory(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory *aFactory, - PRBool aReplace) -{ - NS_NOTREACHED("nsComponentManager::RegisterFactory is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->RegisterFactory(aClass, aClassName, aContractID, - aFactory, aReplace); -} - -nsresult -nsComponentManager::RegisterComponent(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - const char *aLibraryPersistentDescriptor, - PRBool aReplace, - PRBool aPersist) -{ - NS_NOTREACHED("nsComponentManager::RegisterComponent is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->RegisterComponent(aClass, aClassName, aContractID, - aLibraryPersistentDescriptor, aReplace, aPersist); -} - -nsresult -nsComponentManager::RegisterComponentSpec(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFile *aLibrary, - PRBool aReplace, - PRBool aPersist) -{ - NS_NOTREACHED("nsComponentManager::RegisterComponentSpec is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->RegisterComponentSpec(aClass, aClassName, aContractID, - aLibrary, aReplace, aPersist); -} - -nsresult -nsComponentManager::RegisterComponentLib(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - const char *adllName, - PRBool aReplace, - PRBool aPersist) -{ - NS_NOTREACHED("nsComponentManager::RegisterComponentLib is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->RegisterComponentLib(aClass, aClassName, aContractID, - adllName, aReplace, aPersist); -} - -nsresult -nsComponentManager::UnregisterFactory(const nsCID &aClass, - nsIFactory *aFactory) -{ - NS_NOTREACHED("nsComponentManager::UnregisterFactory is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->UnregisterFactory(aClass, aFactory); -} - -nsresult -nsComponentManager::UnregisterComponent(const nsCID &aClass, - const char *aLibrary) -{ - NS_NOTREACHED("nsComponentManager::UnregisterComponent is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->UnregisterComponent(aClass, aLibrary); -} - -nsresult -nsComponentManager::UnregisterComponentSpec(const nsCID &aClass, - nsIFile *aLibrarySpec) -{ - NS_NOTREACHED("nsComponentManager::UnregisterComponentSpec is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->UnregisterComponentSpec(aClass, aLibrarySpec); -} - -nsresult -nsComponentManager::FreeLibraries(void) -{ - NS_NOTREACHED("nsComponentManager::FreeLibraries is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->FreeLibraries(); -} - -nsresult -nsComponentManager::AutoRegister(PRInt32 when, nsIFile *directory) -{ - NS_NOTREACHED("nsComponentManager::AutoRegister is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->AutoRegister(when, directory); -} - -nsresult -nsComponentManager::AutoRegisterComponent(PRInt32 when, - nsIFile *fullname) -{ - NS_NOTREACHED("nsComponentManager::AutoRegisterComponent is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->AutoRegisterComponent(when, fullname); -} - -nsresult -nsComponentManager::AutoUnregisterComponent(PRInt32 when, - nsIFile *fullname) -{ - NS_NOTREACHED("nsComponentManager::AutoUnregisterComponent is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->AutoUnregisterComponent(when, fullname); -} - -nsresult -nsComponentManager::IsRegistered(const nsCID &aClass, - PRBool *aRegistered) -{ - NS_NOTREACHED("nsComponentManager::IsRegistered is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->IsRegistered(aClass, aRegistered); -} - -nsresult -nsComponentManager::EnumerateCLSIDs(nsIEnumerator** aEnumerator) -{ - NS_NOTREACHED("nsComponentManager::EnumerateCLSIDs is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->EnumerateCLSIDs(aEnumerator); -} - -nsresult -nsComponentManager::EnumerateContractIDs(nsIEnumerator** aEnumerator) -{ - NS_NOTREACHED("nsComponentManager::EnumerateContractIDs is deprecated"); - - nsIComponentManagerObsolete* cm; - nsresult rv = NS_GetGlobalComponentManager((nsIComponentManager**)&cm); - if (NS_FAILED(rv)) return rv; - return cm->EnumerateContractIDs(aEnumerator); -} diff --git a/mozilla/xpcom/components/nsComponentManagerObsolete.h b/mozilla/xpcom/components/nsComponentManagerObsolete.h deleted file mode 100644 index da529be35fc..00000000000 --- a/mozilla/xpcom/components/nsComponentManagerObsolete.h +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is XPCOM. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -#ifndef nsComponentManagerObsolete_h___ -#define nsComponentManagerObsolete_h___ - -#include "nsIComponentManager.h" -#include "nsIComponentManagerObsolete.h" - -class nsIEnumerator; -class nsIFactory; -class nsIFile; -//////////////////////////////////////////////////////////////////// -// -// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -// -// Functions, classes, interfaces and types in this file are -// obsolete. Use at your own risk. -// Please see nsIComponentManager.idl for the supported interface -// to the component manager. -// -//////////////////////////////////////////////////////////////////// - - - -//////////////////////////////////////////////////////////////////// -// God save me from this evilness. Below is a very bad -// function. Its out var is really a nsIComponentManagerObsolete -// but it has been cast to a nsIComponentManager. -// The reason for such uglyness is that this function is require for -// backward compatiblity of some plugins. This funciton will -// be removed at some point. -//////////////////////////////////////////////////////////////////// - -extern NS_COM nsresult -NS_GetGlobalComponentManager(nsIComponentManager* *result); - - - - -class NS_COM nsComponentManager { -public: - static nsresult Initialize(void); - - // Finds a factory for a specific class ID - static nsresult FindFactory(const nsCID &aClass, - nsIFactory **aFactory); - - // Get the singleton class object that implements the CID aClass - static nsresult GetClassObject(const nsCID &aClass, const nsIID &aIID, - void **aResult); - - // Get the singleton class object that implements the CID aClass - static nsresult GetClassObjectByContractID(const char *aContractID, - const nsIID &aIID, - void **aResult); - - // Finds a class ID for a specific Program ID - static nsresult ContractIDToClassID(const char *aContractID, - nsCID *aClass); - - // Finds a Program ID for a specific class ID - // caller frees the result with delete[] - static nsresult CLSIDToContractID(nsCID *aClass, - char* *aClassName, - char* *aContractID); - - // Creates a class instance for a specific class ID - static nsresult CreateInstance(const nsCID &aClass, - nsISupports *aDelegate, - const nsIID &aIID, - void **aResult); - - // Convenience routine, creates a class instance for a specific ContractID - static nsresult CreateInstance(const char *aContractID, - nsISupports *aDelegate, - const nsIID &aIID, - void **aResult); - - // Manually registry a factory for a class - static nsresult RegisterFactory(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory *aFactory, - PRBool aReplace); - - // Manually register a dynamically loaded component. - // The libraryPersistentDescriptor is what gets passed to the library - // self register function from ComponentManager. The format of this string - // is the same as nsIFile::GetPath() - // - // This function will go away in favour of RegisterComponentSpec. In fact, - // it internally turns around and calls RegisterComponentSpec. - static nsresult RegisterComponent(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - const char *aLibraryPersistentDescriptor, - PRBool aReplace, - PRBool aPersist); - - // Register a component using its FileSpec as its identification - // This is the more prevalent use. - static nsresult RegisterComponentSpec(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFile *aLibrary, - PRBool aReplace, - PRBool aPersist); - - // Register a component using its dllName. This could be a dll name with - // no path so that LD_LIBRARY_PATH on unix or PATH on win can load it. Or - // this could be a code fragment name on the Mac. - static nsresult RegisterComponentLib(const nsCID &aClass, - const char *aClassName, - const char *aContractID, - const char *adllName, - PRBool aReplace, - PRBool aPersist); - - - // Manually unregister a factory for a class - static nsresult UnregisterFactory(const nsCID &aClass, - nsIFactory *aFactory); - - // Manually unregister a dynamically loaded component - static nsresult UnregisterComponent(const nsCID &aClass, - const char *aLibrary); - - // Manually unregister a dynamically loaded component - static nsresult UnregisterComponentSpec(const nsCID &aClass, - nsIFile *aLibrarySpec); - - // Unload dynamically loaded factories that are not in use - static nsresult FreeLibraries(void); - ////////////////////////////////////////////////////////////////////////////// - // DLL registration support - - // If directory is NULL, then AutoRegister will try registering components - // in the default components directory. - static nsresult AutoRegister(PRInt32 when, nsIFile* directory); - static nsresult AutoRegisterComponent(PRInt32 when, nsIFile *component); - static nsresult AutoUnregisterComponent(PRInt32 when, nsIFile *component); - - // Is the given CID currently registered? - static nsresult IsRegistered(const nsCID &aClass, - PRBool *aRegistered); - - // Get an enumeration of all the CIDs - static nsresult EnumerateCLSIDs(nsIEnumerator** aEmumerator); - - // Get an enumeration of all the ContractIDs - static nsresult EnumerateContractIDs(nsIEnumerator** aEmumerator); - -}; - - -#endif diff --git a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp index 013879a283c..2d5ac2dd151 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp @@ -58,7 +58,6 @@ #include "xptcall.h" #include "nsIComponentManager.h" -#include "nsComponentManagerObsolete.h" #include "nsIServiceManager.h" #include "nsMemory.h" #include "nsIEventQueueService.h" diff --git a/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp b/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp index 0abda04a6f0..566c4e8199d 100644 --- a/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp @@ -55,7 +55,6 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" -#include "nsComponentManagerObsolete.h" #include "nsCOMPtr.h" #include "nsIEventQueueService.h"