Changeset 45350 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 4, 2013 8:22:25 PM (12 years ago)

Author:

vboxsync

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

84766

Message:

More ntBldSymDb.cpp work.

File:

• trunk/src/VBox/Runtime/r3/init.cpp (modified) (1 diff)

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

@@ -276 +276 @@
             return VERR_NO_MEMORY;
 
-        for (int i = 0; i < cArgs; i++)
+#ifdef RT_OS_WINDOWS
+        /* HACK ALERT! Try convert from unicode versions if possible.
+           Unfortunately for us, __wargv is only initialized if we have a
+           unicode main function.  So, we have to use CommandLineToArgvW to get
+           something similar. It should do the same conversion... :-) */
+        int    cArgsW     = -1;
+        PWSTR *papwszArgs = NULL;
+        if (   papszOrgArgs == __argv
+            && cArgs        == __argc
+            && (papwszArgs = CommandLineToArgvW(GetCommandLineW(), &cArgsW)) != NULL )
         {
-            int rc = RTStrCurrentCPToUtf8(&papszArgs[i], papszOrgArgs[i]);
-            if (RT_FAILURE(rc))
+            AssertMsg(cArgsW == cArgs, ("%d vs %d\n", cArgsW, cArgs));
+            for (int i = 0; i < cArgs; i++)
             {
-                while (i--)
-                    RTStrFree(papszArgs[i]);
-                RTMemFree(papszArgs);
-                return rc;
+                int rc = RTUtf16ToUtf8(papwszArgs[i], &papszArgs[i]);
+                if (RT_FAILURE(rc))
+                {
+                    while (i--)
+                        RTStrFree(papszArgs[i]);
+                    RTMemFree(papszArgs);
+                    LocalFree(papwszArgs);
+                    return rc;
+                }
+            }
+            LocalFree(papwszArgs);
+        }
+        else
+#endif
+        {
+            for (int i = 0; i < cArgs; i++)
+            {
+                int rc = RTStrCurrentCPToUtf8(&papszArgs[i], papszOrgArgs[i]);
+                if (RT_FAILURE(rc))
+                {
+                    while (i--)
+                        RTStrFree(papszArgs[i]);
+                    RTMemFree(papszArgs);
+                    return rc;
+                }
             }
         }
+
         papszArgs[cArgs] = NULL;