Changeset 73192 in vbox

Timestamp:

Jul 17, 2018 8:24:51 PM (7 years ago)

Author:

vboxsync

Message:

Fe/Qt: Don't look for the --startvm and --separate option in the non-VM runner process, just initialize IPRT without trying to initalize SUPLIB.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (8 diffs)

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

@@ -606 +606 @@
 }
 
-#if !defined(VBOX_WITH_HARDENING) || defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI)
+#if !defined(VBOX_WITH_HARDENING) || (defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI))
 
 int main(int argc, char **argv, char **envp)
@@ -616 +616 @@
 # endif /* VBOX_WS_X11 */
 
-    /* Initialize VBox Runtime.
-     * Initialize the SUPLib as well only if we are really about to start a VM.
+    /*
+     * Initialize VBox Runtime.
+     */
+# if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
+    /* Initialize the SUPLib as well only if we are really about to start a VM.
      * Don't do this if we are only starting the selector window or a separate VM process. */
     bool fStartVM = false;
@@ -628 +631 @@
         if (   !::strcmp(argv[i], "--startvm")
             || !::strcmp(argv[i], "-startvm"))
-        {
             fStartVM = true;
-        }
         else if (   !::strcmp(argv[i], "--separate")
                  || !::strcmp(argv[i], "-separate"))
-        {
             fSeparateProcess = true;
-        }
     }
 
     uint32_t fFlags = fStartVM && !fSeparateProcess ? RTR3INIT_FLAGS_SUPLIB : 0;
-
+#else
+    uint32_t fFlags = 0;
+#endif
     int rc = RTR3InitExe(argc, &argv, fFlags);
 
@@ -652 +653 @@
 # ifdef Q_OS_SOLARIS
         a.setStyle("fusion");
-# endif /* Q_OS_SOLARIS */
+# endif
 
         /* Prepare the error-message: */
@@ -664 +665 @@
 # ifdef RT_OS_LINUX
                 strText += g_QStrHintLinuxNoDriver;
-# else /* RT_OS_LINUX */
+# else
                 strText += g_QStrHintOtherNoDriver;
-# endif /* !RT_OS_LINUX */
+# endif
                 break;
 # ifdef RT_OS_LINUX
@@ -672 +673 @@
                 strText += g_QStrHintLinuxNoMemory;
                 break;
-# endif /* RT_OS_LINUX */
+# endif
             case VERR_VM_DRIVER_NOT_ACCESSIBLE:
                 strText += QApplication::tr("Kernel driver not accessible");
@@ -679 +680 @@
 # ifdef RT_OS_LINUX
                 strText += g_QStrHintLinuxWrongDriverVersion;
-# else /* RT_OS_LINUX */
+# else
                 strText += g_QStrHintOtherWrongDriverVersion;
-# endif /* !RT_OS_LINUX */
+# endif
                 break;
             default:
@@ -697 +698 @@
     }
 
-    /* Actual main function: */
+    /*
+     * Call actual main function:
+     */
     return TrustedMain(argc, argv, envp);
 }
 
-#endif
+#endif /* !VBOX_WITH_HARDENING || (VBOX_GUI_WITH_SHARED_LIBRARY && !VBOX_RUNTIME_UI) */
 
 #ifdef VBOX_WITH_HARDENING