Changeset 1495 in vbox for trunk/src

Timestamp:

Mar 15, 2007 1:19:30 AM (18 years ago)

Author:

vboxsync

Message:

Set VBOX_XPCOM_HOME like the default glue code in Main/glue. No reason why all the other apps should work fine but not the Qt GUI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• COMDefs.cpp (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

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

@@ -65 +65 @@
 #undef ASSERT
 #include <VBox/com/assert.h>
+#include <iprt/env.h>
+#include <iprt/path.h>
+#include <iprt/param.h>
+#include <iprt/err.h>
 
 nsIComponentManager *COMBase::gComponentManager = nsnull;
@@ -137 +141 @@
         LogFlowFuncLeave();
         return S_OK;
+    }
+
+    /*
+     * Set VBOX_XPCOM_HOME if not present like we do in the common glue code.
+     * (XPCOMGlueStartup will query this.)
+     */
+    if (!RTEnvExist ("VBOX_XPCOM_HOME"))
+    {
+        /* get the executable path */
+        char szPathProgram [RTPATH_MAX];
+        int rcVBox = RTPathProgram (szPathProgram, sizeof (szPathProgram));
+        if (RT_SUCCESS (rcVBox))
+            RTEnvSet ("VBOX_XPCOM_HOME", szPathProgram);
     }
 

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

@@ -112 +112 @@
 }
 
-#ifdef __DARWIN__
-#include <iprt/path.h>
-#include <iprt/process.h>
-#include <iprt/env.h>
-
-/**
- * App bundle tweaks.
- */
-static void DarwinInit (void)
-{
-    /* This probably belongs else where. */
-    static struct
-    {
-        char var[sizeof ("VBOX_XPCOM_HOME=") - 1];
-        char path[RTPATH_MAX];
-    } s;
-
-    strcpy (s.var, "VBOX_XPCOM_HOME=");
-    int rc = RTPathProgram (&s.path[0], sizeof (s.path));
-    if (RT_FAILURE (rc))
-    {
-        RTPrintf ("RTPathProgram failed!\n");
-        exit (1);
-    }
-
-    if (!RTEnvGet ("VBOX_XPCOM_HOME"))
-        RTEnvPut (s.var);
-
-    /** @todo automatically start VBoxSVC. */
-}
-
-#endif
-
-
 int main( int argc, char ** argv )
 {
@@ -162 +128 @@
     sigaction (SIGBUS, &sa, NULL);
     sigaction (SIGUSR1, &sa, NULL);
-#endif
-
-#ifdef __DARWIN__
-    DarwinInit();
 #endif