Changeset 608 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Feb 4, 2007 9:29:38 PM (18 years ago)

Author:

vboxsync

Message:

worked around weird mac crash starting tstAPI.

File:

• trunk/src/libs/xpcom18a4/xpcom/glue/standalone/nsGREDirServiceProvider.cpp (modified) (15 diffs)

trunk/src/libs/xpcom18a4/xpcom/glue/standalone/nsGREDirServiceProvider.cpp

@@ -89 +89 @@
 //*****************************************************************************
 // nsGREDirServiceProvider::nsISupports
-//*****************************************************************************   
+//*****************************************************************************
 
 NS_IMPL_ISUPPORTS1(nsGREDirServiceProvider, nsIDirectoryServiceProvider)
-  
+
 //*****************************************************************************
 // nsGREDirServiceProvider::nsIDirectoryServiceProvider
-//*****************************************************************************   
+//*****************************************************************************
 
 NS_IMETHODIMP
@@ -125 +125 @@
 //*****************************************************************************
 // Implementations from nsXPCOMGlue.h and helper functions.
-//*****************************************************************************   
+//*****************************************************************************
 
 PRBool
@@ -163 +163 @@
             CFRelease(bundleURL);
         }
+#if 0 /* bird: Causes crashes in objc_msgSend() later if released. I dunno why really.
+               Something could be seriously screwed up somewhere else, but this'll have
+               to do for now. (appBundle isn't released in the other place it's used.) */
         CFRelease(appBundle);
+#endif
     }
     if (*buffer) return PR_TRUE;
@@ -178 +182 @@
         buf2[0] = '\0';
 
-        /* 
+        /*
          * Env.var. VBOX_XPCOM_HOME first.
          */
@@ -186 +190 @@
             if (strlen(psz) < MAXPATHLEN)
             {
-                if (!realpath(psz, buf2)) 
+                if (!realpath(psz, buf2))
                     strcpy(buf2, psz);
                 strcat(buf2, "/x"); /* for the filename stripping */
@@ -213 +217 @@
             char buf[MAXPATHLEN];
             int cchLink = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
-            if (cchLink > 0 || cchLink != sizeof(buf) - 1) 
+            if (cchLink > 0 || cchLink != sizeof(buf) - 1)
              {
                 buf[cchLink] = '\0';
@@ -232 +236 @@
             #ifdef DEBUG
                 printf("debug: (1) VBOX_XPCOM_HOME=%s\n", buf2);
-            #endif 
+            #endif
                 strcpy(szPath, buf2);
                 fPathSet = true;
@@ -252 +256 @@
     // The MOZ_DEFAULT_VBOX_XPCOM_HOME variable can be set at configure time with
     // a --with-default-mozilla-five-home=foo autoconf flag.
-    // 
+    //
     // The idea here is to allow for builds that have a default VBOX_XPCOM_HOME
     // regardless of the environment.  This makes it easier to write apps that
-    // embed mozilla without having to worry about setting up the environment 
+    // embed mozilla without having to worry about setting up the environment
     //
     // We do this py putenv()ing the default value into the environment.  Note that
@@ -333 +337 @@
 
 #endif
-    
+
   return PR_FALSE;
 }
@@ -350 +354 @@
   if (*sGRELocation)
     return sGRELocation;
-    
+
   char buffer[MAXPATHLEN];
-    
+
   // If the xpcom library exists in the current process directory,
   // then we will not use any GRE.  The assumption here is that the
@@ -362 +366 @@
     struct stat libStat;
     int statResult = stat(buffer, &libStat);
-        
+
     if (statResult != -1) {
       //found our xpcom lib in the current process directory
@@ -395 +399 @@
   if (env && *env) {
     sprintf(buffer, "%s" XPCOM_FILE_PATH_SEPARATOR GRE_CONF_NAME, env);
-    
+
     if (GRE_GetPathFromConfigFile(buffer, sGRELocation)) {
       return sGRELocation;
@@ -420 +424 @@
   }
 #endif
-  
+
 #if XP_WIN32
   char szKey[256];
   HKEY hRegKey = NULL;
   DWORD dwLength = MAXPATHLEN;
-    
+
   // A couple of key points here:
   // 1. Note the usage of the "Software\\Mozilla\\GRE" subkey - this allows
@@ -438 +442 @@
   //
   strcpy(szKey, GRE_WIN_REG_LOC GRE_BUILD_ID);
-    
+
   if (::RegOpenKeyEx(HKEY_CURRENT_USER, szKey, 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS) {
     if (::RegQueryValueEx(hRegKey, "GreHome", NULL, NULL, (BYTE *)sGRELocation, &dwLength) != ERROR_SUCCESS) {
@@ -567 +571 @@
 static char sXPCOMPath[MAXPATHLEN];
 
-extern "C" const char* 
+extern "C" const char*
 GRE_GetXPCOMPath()
 {