Changeset 60773 in vbox for trunk/src/VBox/Runtime/r3/init.cpp

Timestamp:

May 1, 2016 12:58:10 PM (9 years ago)

Author:

vboxsync

Message:

IPRT/SUPR3Init/win: Must initialize the program path before the support library. On windows SUPR3Init will query the path if the driver service isn't registered.

File:

• trunk/src/VBox/Runtime/r3/init.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -430 +430 @@
     AssertMsgRCReturn(rc, ("Failed to initialize threads, rc=%Rrc!\n", rc), rc);
 
+    /*
+     * The executable path before SUPLib (windows requirement).
+     */
+    rc = rtR3InitProgramPath(pszProgramPath);
+    AssertLogRelMsgRCReturn(rc, ("Failed to get executable directory path, rc=%Rrc!\n", rc), rc);
+
 #if !defined(IN_GUEST) && !defined(RT_NO_GIP)
+    /*
+     * Initialize SUPLib here so the GIP can get going as early as possible
+     * (improves accuracy for the first client).
+     */
     if (fFlags & RTR3INIT_FLAGS_SUPLIB)
     {
-        /*
-         * Init GIP first.
-         * (The more time for updates before real use, the better.)
-         */
         rc = SUPR3Init(NULL);
         AssertMsgRCReturn(rc, ("Failed to initializable the support library, rc=%Rrc!\n", rc), rc);
@@ -443 +449 @@
 
     /*
-     * The executable path, name and directory.  Convert arguments.
-     */
-    rc = rtR3InitProgramPath(pszProgramPath);
-    AssertLogRelMsgRCReturn(rc, ("Failed to get executable directory path, rc=%Rrc!\n", rc), rc);
-
+     * Convert arguments.
+     */
     rc = rtR3InitArgv(fFlags, cArgs, ppapszArgs);
     AssertLogRelMsgRCReturn(rc, ("Failed to convert the arguments, rc=%Rrc!\n", rc), rc);