Changeset 35542 in vbox

Timestamp:

Jan 13, 2011 3:42:16 PM (14 years ago)

Author:

vboxsync

Message:

VBoxExtPackHelperApp.cpp: Fixed issue with non-ascii characters in the argument list on windows that prevent installing extension packs residing in directory with non-ascii names.

File:

• trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -1855 +1855 @@
     g_hInstance = hInstance;
     NOREF(hPrevInstance); NOREF(nShowCmd); NOREF(lpCmdLine);
-    return main(__argc, __argv);
+
+    int rc = RTR3Init();
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
+
+    LPWSTR pwszCmdLine = GetCommandLineW();
+    if (!pwszCmdLine)
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "GetCommandLineW failed");
+
+    char *pszCmdLine;
+    rc = RTUtf16ToUtf8(pwszCmdLine, &pszCmdLine); /* leaked */
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to convert the command line: %Rrc", rc);
+
+    int    cArgs;
+    char **papszArgs;
+    rc = RTGetOptArgvFromString(&papszArgs, &cArgs, pszCmdLine, NULL);
+    if (RT_SUCCESS(rc))
+    {
+
+        rc = main(cArgs, papszArgs);
+
+        RTGetOptArgvFree(papszArgs);
+    }
+    else
+        rc = RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvFromString failed: %Rrc", rc);
+    RTStrFree(pszCmdLine);
+
+    return rc;
 }
 #endif