API Freeze for nsIServiceManager r=shaver@mozilla.org, sr=rpotts@netscape.com bug 99147

Author: dougt%netscape.com

build/mac/build_scripts/MozillaBuildList.pm

@@ -571,6 +571,7 @@ sub BuildClientDist()
     InstallFromManifest(":mozilla:xpcom:threads:MANIFEST_IDL",                     "$distdirectory:idl:");
     InstallFromManifest(":mozilla:xpcom:components:MANIFEST_IDL",                  "$distdirectory:idl:");
 
+    InstallFromManifest(":mozilla:xpcom:build:MANIFEST",                           "$distdirectory:xpcom:");
     InstallFromManifest(":mozilla:xpcom:glue:MANIFEST",                            "$distdirectory:xpcom:");
     InstallFromManifest(":mozilla:xpcom:base:MANIFEST",                            "$distdirectory:xpcom:");
     InstallFromManifest(":mozilla:xpcom:components:MANIFEST",                      "$distdirectory:xpcom:");

chrome/tools/chromereg/regchrome.cpp

@@ -25,7 +25,7 @@
 
 int main(int argc, char **argv)
 {
-  NS_InitXPCOM(nsnull, nsnull);
+  NS_InitXPCOM2(nsnull, nsnull, nsnull);
 
   nsCOMPtr <nsIChromeRegistry> chromeReg = 
     do_GetService("@mozilla.org/chrome/chrome-registry;1");

config/bin2rc.exe

@@ -89,7 +89,7 @@ void GetACookie(nsICookieService *cookieService, const char* aSpec, char* *aCook
 
 int main(PRInt32 argc, char *argv[])
 {
-    nsresult rv = NS_InitXPCOM(nsnull, nsnull);
+    nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
     if (NS_FAILED(rv)) return -1;
 
     // Create the Event Queue for this thread...

config/makecopy.exe

@@ -179,10 +179,10 @@ PyXPCOMMethod_GetGlobalServiceManager(PyObject *self, PyObject *args)
 {
 	if (!PyArg_ParseTuple(args, ""))
 		return NULL;
-	nsIServiceManager* sm;
+	nsIServiceManagerObsolete* sm;
 	nsresult rv;
 	Py_BEGIN_ALLOW_THREADS;
-	rv = nsServiceManager::GetGlobalServiceManager(&sm);
+	rv = nsServiceManager::GetGlobalServiceManager((nsIServiceManager**)&sm);
 	Py_END_ALLOW_THREADS;
 	if ( NS_FAILED(rv) )
 		return PyXPCOM_BuildPyException(rv);
@@ -509,10 +509,10 @@ PRBool PyXPCOM_Globals_Ensure()
 
 			nsCOMPtr<nsILocalFile> ns_bin_dir;
 			NS_NewLocalFile(landmark, PR_FALSE, getter_AddRefs(ns_bin_dir));
-			nsresult rv = NS_InitXPCOM(nsnull, ns_bin_dir);
+			nsresult rv = NS_InitXPCOM2(nsnull, ns_bin_dir, nsnull);
 #else
 			// Elsewhere, Mozilla can find it itself (we hope!)
-			nsresult rv = NS_InitXPCOM(nsnull, nsnull);
+			nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
 #endif // XP_WIN			
 			if (NS_FAILED(rv)) {
 				PyErr_SetString(PyExc_RuntimeError, "The XPCOM subsystem could not be initialized");

config/makedep.exe

@@ -126,7 +126,7 @@ int main (int argc, char* argv[])
 
   nsIServiceManager *servMgr;
 
-  rv = NS_InitXPCOM(&servMgr, nsnull);
+  rv = NS_InitXPCOM2(&servMgr, nsnull, nsnull);
   if (NS_FAILED(rv)) return rv;
 
   if (argc > 2) {