Changeset 38636 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Sep 5, 2011 1:49:45 PM (13 years ago)

Author:

vboxsync

Message:

*,IPRT: Redid the ring-3 init to always convert the arguments to UTF-8.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -159 +159 @@
     LPCTSTR lpCmdLine = GetCommandLine(); /* this line necessary for _ATL_MIN_CRT */
 
-    /* Need to parse the command line before initializing the VBox runtime. */
+    /*
+     * Need to parse the command line before initializing the VBox runtime.
+     */
     TCHAR szTokens[] = _T("-/");
     LPCTSTR lpszToken = FindOneOf(lpCmdLine, szTokens);
@@ -188 +190 @@
      * the support driver.
      */
-    RTR3Init();
+    int    argc = __argc;
+    char **argv = __argv;
+    RTR3InitExe(argc, &argv, 0);
 
     /* Note that all options are given lowercase/camel case/uppercase to
@@ -233 +237 @@
 
     RTGETOPTSTATE   GetOptState;
-    int vrc = RTGetOptInit(&GetOptState, __argc, __argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    int vrc = RTGetOptInit(&GetOptState, argc, argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
     AssertRC(vrc);