Changeset 7611 in vbox for trunk

Timestamp:

Mar 27, 2008 11:06:44 PM (17 years ago)

Author:

vboxsync

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

29111

Message:

Main/FE/Qt: Use "GUI/Qt3" or "gui" session type to start Qt3 GUI and "GUI/Qt4" to start Qt4 GUI (supercedes r29094 and r29096).

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)
• Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (5 diffs)

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

@@ -929 +929 @@
 #endif
 
-#if defined (Q_WS_MAC) /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
-    env += "\nVBOXGUIPATH=../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
-#elif defined (Q_WS_WIN)
-    env += "\nVBOXGUIPATH=VirtualBox.exe";
-#else
-    env += "\nVBOXGUIPATH=VirtualBox";
-#endif
-
-    CProgress progress = vbox.OpenRemoteSession (session, id, "gui", env);
+    CProgress progress = vbox.OpenRemoteSession (session, id, "GUI/Qt3", env);
     if (!vbox.isOk())
     {

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -543 +543 @@
 
     mVMCtxtMenu = new QMenu (this);
-    mVMCtxtMenu->addAction (vmConfigAction); 
+    mVMCtxtMenu->addAction (vmConfigAction);
     mVMCtxtMenu->addAction (vmDeleteAction);
     mVMCtxtMenu->addSeparator();
@@ -933 +933 @@
 #endif
 
-#if defined (Q_WS_MAC) /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
-    env += "\nVBOXGUIPATH=../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM4";
-#elif defined (Q_WS_WIN)
-    env += "\nVBOXGUIPATH=VirtualBox4.exe";
-#else
-    env += "\nVBOXGUIPATH=VirtualBox4";
-#endif
-
-    CProgress progress = vbox.OpenRemoteSession (session, id, "gui", env);
+    CProgress progress = vbox.OpenRemoteSession (session, id, "GUI/Qt4", env);
     if (!vbox.isOk())
     {

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1630 +1630 @@
     if (id.isEmpty() || aBus == StorageBus_Null)
         return E_INVALIDARG;
- 
+
     AutoCaller autoCaller (this);
     CheckComRCReturnRC (autoCaller.rc());
@@ -1800 +1800 @@
     if (aBus == StorageBus_Null)
         return E_INVALIDARG;
- 
+
     AutoCaller autoCaller (this);
     CheckComRCReturnRC (autoCaller.rc());
@@ -3159 +3159 @@
 
     Bstr type (aType);
-    if (type == "gui")
-    {
-        char *VirtualBox_exe = (char *) RTMemAlloc (sz);
-        size_t cchActual;
-        vrc = RTEnvGetEx (env, "VBOXGUIPATH", VirtualBox_exe, sz, &cchActual);
-        AssertRCBreak (vrc, RTStrFree (VirtualBox_exe));
+    if (type == "gui" || type == "GUI/Qt3")
+    {
+#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
+        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
+#else
+        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
+#endif
+        Assert (sz >= sizeof (VirtualBox_exe));
         strcpy (cmd, VirtualBox_exe);
 
@@ -3175 +3177 @@
 #endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
-        RTStrFree (VirtualBox_exe);
+    }
+    else
+    if (type == "GUI/Qt4")
+    {
+#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
+        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM4";
+#else
+        const char VirtualBox_exe[] = "VirtualBox4" HOSTSUFF_EXE;
+#endif
+        Assert (sz >= sizeof (VirtualBox_exe));
+        strcpy (cmd, VirtualBox_exe);
+
+        Utf8Str idStr = mData->mUuid.toString();
+#ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
+        const char * args[] = {path, "-startvm", idStr, 0 };
+#else
+        Utf8Str name = mUserData->mName;
+        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
+#endif
+        vrc = RTProcCreate (path, args, env, 0, &pid);
     }
     else
@@ -7142 +7163 @@
     if (mIPCSem < 0 && error == ENOSYS)
     {
-        setError(E_FAIL, 
+        setError(E_FAIL,
                 tr ("Cannot create IPC semaphore. Most likely your host kernel lacks "
                      "support for SysV IPC. Check the host kernel configuration for "