Changeset 16394 in vbox for trunk

Timestamp:

Jan 29, 2009 11:07:40 PM (16 years ago)

Author:

vboxsync

Message:

XPCOM-darwin/amd64: Take the UNIX path in nsAppFileLocationProvider.cpp.

File:

• trunk/src/libs/xpcom18a4/xpcom/io/nsAppFileLocationProvider.cpp (modified) (16 diffs)

trunk/src/libs/xpcom18a4/xpcom/io/nsAppFileLocationProvider.cpp

@@ -49 +49 @@
 #include "nsCRT.h"
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if (defined(XP_MAC) || defined(XP_MACOSX)) && (!defined(VBOX) || !defined(RT_ARCH_AMD64))
 #include <Folders.h>
 #include <Script.h>
@@ -148 +148 @@
     *persistant = PR_TRUE;
 
-#if defined (XP_MAC) || defined(XP_MACOSX)
+#if (defined (XP_MAC) || defined(XP_MACOSX)) && (!defined(VBOX) || !defined(RT_ARCH_AMD64))
     short foundVRefNum;
     long foundDirID;
@@ -154 +154 @@
     nsCOMPtr<nsILocalFileMac> macFile;
 #endif
-    
+
     if (nsCRT::strcmp(prop, NS_APP_APPLICATION_REGISTRY_DIR) == 0)
     {
@@ -212 +212 @@
             rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
     }
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if (defined(XP_MAC) || defined(XP_MACOSX)) && (!defined(VBOX) || !defined(RT_ARCH_AMD64))
     else if (nsCRT::strcmp(prop, NS_MACOSX_USER_PLUGIN_DIR) == 0)
     {
@@ -269 +269 @@
     }
     else if (nsCRT::strcmp(prop, NS_APP_INSTALL_CLEANUP_DIR) == 0)
-    {   
+    {
         // This is cloned so that embeddors will have a hook to override
-        // with their own cleanup dir.  See bugzilla bug #105087 
+        // with their own cleanup dir.  See bugzilla bug #105087
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
 #ifdef XP_MAC
@@ -278 +278 @@
 #endif
 
-    } 
+    }
 
     if (localFile && NS_SUCCEEDED(rv))
         return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)_retval);
-        
+
     return rv;
 }
@@ -341 +341 @@
 
 #if defined(XP_MAC)
-    nsCOMPtr<nsIProperties> directoryService = 
+    nsCOMPtr<nsIProperties> directoryService =
              do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
@@ -350 +350 @@
     rv = directoryService->Get(prop, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
     if (NS_FAILED(rv)) return rv;
-#elif defined(XP_MACOSX)
+#elif defined(XP_MACOSX) && (!defined(VBOX) || !defined(RT_ARCH_AMD64))
     FSRef fsRef;
     OSErr err = ::FSFindFolder(kUserDomain, kDomainLibraryFolderType, kCreateFolder, &fsRef);
@@ -360 +360 @@
     if (NS_FAILED(rv)) return rv;
 #elif defined(XP_OS2)
-    nsCOMPtr<nsIProperties> directoryService = 
+    nsCOMPtr<nsIProperties> directoryService =
              do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
@@ -366 +366 @@
     if (NS_FAILED(rv)) return rv;
 #elif defined(XP_WIN)
-    nsCOMPtr<nsIProperties> directoryService = 
+    nsCOMPtr<nsIProperties> directoryService =
              do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
@@ -470 +470 @@
     }
 
-    NS_IMETHOD HasMoreElements(PRBool *result) 
+    NS_IMETHOD HasMoreElements(PRBool *result)
     {
         while (!mNext && *mCurrentKey)
@@ -486 +486 @@
     }
 
-    NS_IMETHOD GetNext(nsISupports **result) 
+    NS_IMETHOD GetNext(nsISupports **result)
     {
         NS_ENSURE_ARG_POINTER(result);
@@ -495 +495 @@
         if (!hasMore)
             return NS_ERROR_FAILURE;
-            
+
         *result = mNext;
         NS_IF_ADDREF(*result);
         mNext = nsnull;
-        
+
         return *result ? NS_OK : NS_ERROR_FAILURE;
     }
@@ -543 +543 @@
     }
 
-    NS_IMETHOD HasMoreElements(PRBool *result) 
+    NS_IMETHOD HasMoreElements(PRBool *result)
     {
         if (mEndPath)
@@ -582 +582 @@
     *_retval = nsnull;
     nsresult rv = NS_ERROR_FAILURE;
-    
+
     if (!nsCRT::strcmp(prop, NS_APP_PLUGINS_DIR_LIST))
     {
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if (defined(XP_MAC) || defined(XP_MACOSX)) && (!defined(VBOX) || !defined(RT_ARCH_AMD64))
         static const char* osXKeys[] = { NS_APP_PLUGINS_DIR, NS_MACOSX_USER_PLUGIN_DIR, NS_MACOSX_LOCAL_PLUGIN_DIR, nsnull };
         static const char* os9Keys[] = { NS_APP_PLUGINS_DIR, NS_MAC_CLASSIC_PLUGIN_DIR, nsnull };
         static const char** keys;
-        
+
         if (!keys) {
             OSErr err;
             long response;
-            err = ::Gestalt(gestaltSystemVersion, &response); 
+            err = ::Gestalt(gestaltSystemVersion, &response);
             keys = (!err && response >= 0x00001000) ? osXKeys : os9Keys;
         }
@@ -607 +607 @@
 #endif
         NS_IF_ADDREF(*_retval);
-        rv = *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;        
+        rv = *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
     }
     return rv;