Changeset 3861 in vbox for trunk

Timestamp:

Jul 26, 2007 9:15:14 AM (18 years ago)

Author:

vboxsync

Message:

use generic functions for determining paths instead of home-brewn solutions

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxProblemReporter.cpp (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (1 diff)
• Main/glue/initterm.cpp (modified) (9 diffs)
• VMM/PDMLdr.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -64 +64 @@
 #define BOOL PRBool
 #endif
+
+#include <iprt/param.h>
+#include <iprt/path.h>
 
 #if defined (VBOX_GUI_DEBUG)
@@ -1998 +2001 @@
     QString selectedLangId = gVBoxBuiltInLangName;
 
-    QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
+    char szNlsPath[RTPATH_MAX];
+    int rc;
+
+    RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
+    Assert(RT_SUCCESS(rc));
+
+    QString nlsPath = QString(szNlsPath) + gVBoxLangSubDir;
     QDir nlsDir (nlsPath);
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -40 +40 @@
 
 #include <iprt/err.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
 
 #if defined (Q_WS_WIN32)
@@ -1761 +1763 @@
               HH_DISPLAY_TOPIC, NULL);
 #elif defined (Q_WS_X11)
-    QString fullProgPath = qApp->applicationDirPath();
+    char szDocsPath[RTPATH_MAX];
+    int rc;
+
+    RTPathAppDocs(szDocsPath, sizeof(szDocsPath));
+    Assert(RT_SUCCESS(rc));
+
+    QString fullProgPath = QString(szDocsPath);
     QProcess kchmViewer (fullProgPath + "/kchmviewer");
     kchmViewer.addArgument (fullProgPath + "/VirtualBox.chm");

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4656 +4656 @@
 #ifdef VBOX_WITH_XPCOM
     // VBoxC is located in the components subdirectory
-    char szPathProgram[RTPATH_MAX + sizeof("/components/VBoxC")];
-    rc = RTPathProgram(szPathProgram, RTPATH_MAX);                                  AssertRC(rc);
-    strcat(szPathProgram, "/components/VBoxC");
-    rc = CFGMR3InsertString(pMod,   "Path",  szPathProgram);                           RC_CHECK();
+    char szPathVBoxC[RTPATH_MAX];
+    rc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX - sizeof("/components/VBoxC")); AssertRC(rc);
+    strcat(szPathVBoxC, "/components/VBoxC");
+    rc = CFGMR3InsertString(pMod,   "Path",  szPathVBoxC);                             RC_CHECK();
 #else
     rc = CFGMR3InsertString(pMod,   "Path",  "VBoxC");                                 RC_CHECK();

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2788 +2788 @@
     /* get the path to the executable */
     char path [RTPATH_MAX];
-    RTPathProgram (path, RTPATH_MAX);
+    RTPathAppPrivateArch (path, RTPATH_MAX);
     size_t sz = strlen (path);
     path [sz++] = RTPATH_DELIMITER;

trunk/src/VBox/Main/glue/initterm.cpp

@@ -64 +64 @@
     DirectoryServiceProvider()
         : mCompRegLocation (NULL), mXPTIDatLocation (NULL)
+        , mComponentDirLocation (NULL), mCurrProcDirLocation (NULL)
         {}
 
@@ -69 +70 @@
 
     HRESULT init (const char *aCompRegLocation,
-                  const char *aXPTIDatLocation);
+                  const char *aXPTIDatLocation,
+                  const char *aComponentDirLocation,
+                  const char *aCurrProcDirLocation);
 
     NS_DECL_NSIDIRECTORYSERVICEPROVIDER
@@ -77 +80 @@
     char *mCompRegLocation;
     char *mXPTIDatLocation;
+    char *mComponentDirLocation;
+    char *mCurrProcDirLocation;
 };
 
@@ -92 +97 @@
         RTStrFree (mXPTIDatLocation);
         mXPTIDatLocation = NULL;
+    }
+    if (mComponentDirLocation)
+    {
+        RTStrFree (mComponentDirLocation);
+        mComponentDirLocation = NULL;
+    }
+    if (mCurrProcDirLocation)
+    {
+        RTStrFree (mCurrProcDirLocation);
+        mCurrProcDirLocation = NULL;
     }
 }
@@ -101 +116 @@
 HRESULT
 DirectoryServiceProvider::init (const char *aCompRegLocation,
-                                const char *aXPTIDatLocation)
+                                const char *aXPTIDatLocation,
+                                const char *aComponentDirLocation,
+                                const char *aCurrProcDirLocation)
 {
     AssertReturn (aCompRegLocation, NS_ERROR_INVALID_ARG);
@@ -109 +126 @@
     if (RT_SUCCESS (vrc))
         vrc = RTStrUtf8ToCurrentCP (&mXPTIDatLocation, aXPTIDatLocation);
+    if (RT_SUCCESS (vrc) && aComponentDirLocation)
+        vrc = RTStrUtf8ToCurrentCP (&mComponentDirLocation, aComponentDirLocation);
+    if (RT_SUCCESS (vrc) && aCurrProcDirLocation)
+        vrc = RTStrUtf8ToCurrentCP (&mCurrProcDirLocation, aCurrProcDirLocation);
 
     return RT_SUCCESS (vrc) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
@@ -130 +151 @@
     else if (strcmp (aProp, NS_XPCOM_XPTI_REGISTRY_FILE) == 0)
         fileLocation = mXPTIDatLocation;
+    else if (mComponentDirLocation && strcmp (aProp, NS_XPCOM_COMPONENT_DIR) == 0)
+        fileLocation = mComponentDirLocation;
+    else if (mCurrProcDirLocation && strcmp (aProp, NS_XPCOM_CURRENT_PROCESS_DIR) == 0)
+        fileLocation = mCurrProcDirLocation;
     else
         return NS_ERROR_FAILURE;
@@ -185 +210 @@
         /* prepare paths for registry files */
         char homeDir [RTPATH_MAX];
+        char privateArchDir [RTPATH_MAX];
         int vrc = GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
         if (RT_SUCCESS (vrc))
+            vrc = RTPathAppPrivateArch (privateArchDir, sizeof (privateArchDir));
+        if (RT_SUCCESS (vrc))
         {
             char compReg [RTPATH_MAX];
             char xptiDat [RTPATH_MAX];
+            char compDir [RTPATH_MAX];
 
             RTStrPrintf (compReg, sizeof (compReg), "%s%c%s",
@@ -195 +224 @@
             RTStrPrintf (xptiDat, sizeof (xptiDat), "%s%c%s",
                          homeDir, RTPATH_DELIMITER, "xpti.dat");
+            RTStrPrintf (compDir, sizeof (compDir), "%s%c/components",
+                         privateArchDir, RTPATH_DELIMITER);
 
             dsProv = new DirectoryServiceProvider();
             if (dsProv)
-                rc = dsProv->init (compReg, xptiDat);
+                rc = dsProv->init (compReg, xptiDat, compDir, privateArchDir);
             else
                 rc = NS_ERROR_OUT_OF_MEMORY;

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -940 +940 @@
 static char * pdmR3File(const char *pszFile, const char *pszDefaultExt, bool fShared)
 {
-    char    *pszRet;
-
-#ifdef VBOX_PATH_PRIVATE_LIBS
-
-    /*
-     * Unix: Search in /usr/lib/virtualbox
-     */
-    pszRet = pdmR3FileConstruct(
-# ifdef VBOX_PATH_SHARED_LIBS
-                                fShared ? VBOX_PATH_SHARED_LIBS : VBOX_PATH_PRIVATE_LIBS,
-# else
-                                VBOX_PATH_PRIVATE_LIBS,
-# endif
-                                pszFile, pszDefaultExt);
-
-#else
-
-    NOREF(fShared);
-
-    /*
-     * Default: Search in the program path.
-     */
-    char     szPath[RTPATH_MAX];
-    int rc = RTPathProgram(szPath, sizeof(szPath));
+    char szPath[RTPATH_MAX];
+    int  rc;
+    
+    rc = fShared ? RTPathSharedLibs(szPath, sizeof(szPath)) 
+                 : RTPathAppPrivateArch(szPath, sizeof(szPath));
     if (!VBOX_SUCCESS(rc))
     {
@@ -970 +951 @@
     }
 
-    pszRet = pdmR3FileConstruct(szPath, pszFile, pszDefaultExt);
-
-#endif
-
-    return pszRet;
+    return pdmR3FileConstruct(szPath, pszFile, pszDefaultExt);
 }