Changeset 28992 in vbox for trunk/src/libs/xpcom18a4/xpcom/build

Timestamp:

May 4, 2010 5:55:32 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

61016

Message:

xpcom: spaces, temp hack to fetch proxy release into the image on darwin - right fix is to add all .a into final library unconditionally, like done on Linux and Solaris

File:

• trunk/src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp (modified) (19 diffs)

trunk/src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp

@@ -71 +71 @@
 #ifdef VBOX
 # include "nsEventQueueUtils.h"
+# include "nsProxyRelease.h"
 #endif /* VBOX */
 
@@ -230 +231 @@
     if (NS_FAILED(rv)) return rv;
 
-    rv = registrar->RegisterFactory(info->mCID, 
+    rv = registrar->RegisterFactory(info->mCID,
                                     info->mDescription,
-                                    info->mContractID, 
+                                    info->mContractID,
                                     fact);
     NS_RELEASE(fact);
@@ -247 +248 @@
     nsresult rv;
     nsCOMPtr<nsIProperties> directoryService;
-    nsDirectoryService::Create(nsnull, 
-                               NS_GET_IID(nsIProperties), 
-                               getter_AddRefs(directoryService));  
-    
-    if (!directoryService) 
+    nsDirectoryService::Create(nsnull,
+                               NS_GET_IID(nsIProperties),
+                               getter_AddRefs(directoryService));
+
+    if (!directoryService)
         return PR_FALSE;
 
     nsCOMPtr<nsIFile> file;
-    rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, 
-                               NS_GET_IID(nsIFile), 
+    rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR,
+                               NS_GET_IID(nsIFile),
                                getter_AddRefs(file));
 
@@ -265 +266 @@
 
     file->AppendNative(nsDependentCString(".autoreg"));
-    
+
     PRBool exists;
     file->Exists(&exists);
@@ -276 +277 @@
                                getter_AddRefs(compregFile));
 
-    
+
     if (NS_FAILED(rv)) {
         NS_WARNING("Getting NS_XPCOM_COMPONENT_REGISTRY_FILE failed");
@@ -327 +328 @@
     nsCOMPtr<nsICategoryManager> catman(do_GetService(NS_CATEGORYMANAGER_CONTRACTID));
     if (catman)
-        catman->DeleteCategoryEntry(NS_XPCOM_STARTUP_OBSERVER_ID, 
+        catman->DeleteCategoryEntry(NS_XPCOM_STARTUP_OBSERVER_ID,
                                     IPC_DCONNECTSERVICE_CONTRACTID, PR_TRUE);
     return NS_OK;
@@ -482 +483 @@
     if (!gDebug)
     {
-        rv = nsDebugImpl::Create(nsnull, 
-                                 NS_GET_IID(nsIDebug), 
+        rv = nsDebugImpl::Create(nsnull,
+                                 NS_GET_IID(nsIDebug),
                                  (void**)&gDebug);
     }
@@ -501 +502 @@
     if (!gTraceRefcnt)
     {
-        rv = nsTraceRefcntImpl::Create(nsnull, 
-                                       NS_GET_IID(nsITraceRefcnt), 
+        rv = nsTraceRefcntImpl::Create(nsnull,
+                                       NS_GET_IID(nsITraceRefcnt),
                                        (void**)&gTraceRefcnt);
     }
@@ -544 +545 @@
 
     // If the locale hasn't already been setup by our embedder,
-    // get us out of the "C" locale and into the system 
+    // get us out of the "C" locale and into the system
     if (strcmp(setlocale(LC_ALL, NULL), "C") == 0)
         setlocale(LC_ALL, "");
@@ -578 +579 @@
             return NS_ERROR_OUT_OF_MEMORY;
         NS_ADDREF(compMgr);
-        
+
         nsCOMPtr<nsIFile> xpcomLib;
-                
+
         PRBool value;
         if (binDirectory)
@@ -592 +593 @@
         }
         else {
-            gDirectoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, 
-                                   NS_GET_IID(nsIFile), 
+            gDirectoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR,
+                                   NS_GET_IID(nsIFile),
                                    getter_AddRefs(xpcomLib));
         }
@@ -601 +602 @@
             gDirectoryService->Set(NS_XPCOM_LIBRARY_FILE, xpcomLib);
         }
-        
+
         if (appFileLocationProvider) {
             rv = dirService->RegisterProvider(appFileLocationProvider);
@@ -666 +667 @@
     }
     rv = nsComponentManagerImpl::gComponentManager->ReadPersistentRegistry();
-#ifdef DEBUG    
+#ifdef DEBUG
     if (NS_FAILED(rv)) {
-        printf("No Persistent Registry Found.\n");        
+        printf("No Persistent Registry Found.\n");
     }
 #endif
@@ -683 +684 @@
         nsComponentManagerImpl::gComponentManager->AutoRegister(nsnull);
 
-        // If the application is using a GRE, then, 
+        // If the application is using a GRE, then,
         // auto register components in the GRE directory as well.
         //
@@ -713 +714 @@
                 int loaderCount = nsComponentManagerImpl::gComponentManager->GetLoaderCount();
                 rv = nsComponentManagerImpl::gComponentManager->AutoRegister(greDir);
-                
-                if (loaderCount != nsComponentManagerImpl::gComponentManager->GetLoaderCount()) 
-                    nsComponentManagerImpl::gComponentManager->AutoRegisterNonNativeComponents(nsnull);        
+
+                if (loaderCount != nsComponentManagerImpl::gComponentManager->GetLoaderCount())
+                    nsComponentManagerImpl::gComponentManager->AutoRegisterNonNativeComponents(nsnull);
 
 #ifdef DEBUG_dougt
                 printf("end - Registering GRE components\n");
-#endif          
+#endif
                 if (NS_FAILED(rv)) {
                     NS_ERROR("Could not AutoRegister GRE components");
@@ -760 +761 @@
         compregFile->SetLastModifiedTime(PR_Now() / 1000);
     }
-    
+
     // Pay the cost at startup time of starting this singleton.
     nsIInterfaceInfoManager* iim = XPTI_GetInterfaceInfoManager();
@@ -772 +773 @@
     if (NS_FAILED(rv)) {
       NS_ERROR("Could not create event queue for main thread");
+      /* this is just a build-time hack, to reference NS_ProxyRelease */
+      if (rv == 666)
+          NS_ProxyRelease(nsnull, nsnull);
       return rv;
     }
@@ -777 +781 @@
 
     // Notify observers of xpcom autoregistration start
-    NS_CreateServicesFromCategory(NS_XPCOM_STARTUP_OBSERVER_ID, 
+    NS_CreateServicesFromCategory(NS_XPCOM_STARTUP_OBSERVER_ID,
                                   nsnull,
                                   NS_XPCOM_STARTUP_OBSERVER_ID);
-    
+
     return NS_OK;
 }
@@ -906 +910 @@
         currentQ = 0;
     }
-    
+
     nsProxyObjectManager::Shutdown();