Changeset 48681 in vbox for trunk

Timestamp:

Sep 25, 2013 1:00:44 PM (11 years ago)

Author:

vboxsync

Message:

Main,IPRT: Added RTR3INIT_FLAGS_UTF8_ARGV so VBoxExtPackHelperApp can stop IPRT from converting UTF-8 argument strings to UTF-8 again as ANSI. Fixes #6963.

Location:

trunk

Files:

• include/iprt/initterm.h (modified) (1 diff)
• src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/init.cpp (modified) (2 diffs)

trunk/include/iprt/initterm.h

@@ -49 +49 @@
 /** We are sharing a process space, so we need to behave. */
 #define RTR3INIT_FLAGS_UNOBTRUSIVE  RT_BIT(2)
+/** The caller ensures that the argument bector is UTF-8. */
+#define RTR3INIT_FLAGS_UTF8_ARGV    RT_BIT(3)
 /** @} */
 

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

@@ -1768 +1768 @@
      * Initialize IPRT and check that we're correctly installed.
      */
+#ifdef RT_OS_WINDOWS
+    int rc = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_UTF8_ARGV); /* WinMain gives us UTF-8, see below. */
+#else
     int rc = RTR3InitExe(argc, &argv, 0);
+#endif
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);

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

@@ -278 +278 @@
         }
 
-        /*
-         * Convert the arguments.
-         */
-        char **papszArgs = (char **)RTMemAllocZ((cArgs + 1) * sizeof(char *));
-        if (!papszArgs)
-            return VERR_NO_MEMORY;
+        if (!(fFlags & RTR3INIT_FLAGS_UTF8_ARGV))
+        {
+            /*
+             * Convert the arguments.
+             */
+            char **papszArgs = (char **)RTMemAllocZ((cArgs + 1) * sizeof(char *));
+            if (!papszArgs)
+                return VERR_NO_MEMORY;
 
 #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 )
-        {
-            AssertMsg(cArgsW == cArgs, ("%d vs %d\n", cArgsW, cArgs));
-            for (int i = 0; i < cArgs; i++)
+            /* 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 = RTUtf16ToUtf8(papwszArgs[i], &papszArgs[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);
-                    LocalFree(papwszArgs);
-                    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;
+                    }
                 }
             }
-            LocalFree(papwszArgs);
+
+            papszArgs[cArgs] = NULL;
+
+            g_papszrtOrgArgs = papszOrgArgs;
+            g_papszrtArgs    = papszArgs;
+            g_crtArgs        = cArgs;
+
+            *ppapszArgs = papszArgs;
         }
         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;
-                }
-            }
+            /*
+             * The arguments are already UTF-8, no conversion needed.
+             */
+            g_papszrtOrgArgs = papszOrgArgs;
+            g_papszrtArgs    = papszOrgArgs;
+            g_crtArgs        = cArgs;
         }
-
-        papszArgs[cArgs] = NULL;
-
-        g_papszrtOrgArgs = papszOrgArgs;
-        g_papszrtArgs    = papszArgs;
-        g_crtArgs        = cArgs;
-
-        *ppapszArgs = papszArgs;
     }
 
@@ -543 +555 @@
     Assert(!(fFlags & ~(  RTR3INIT_FLAGS_DLL
                         | RTR3INIT_FLAGS_SUPLIB
-                        | RTR3INIT_FLAGS_UNOBTRUSIVE)));
+                        | RTR3INIT_FLAGS_UNOBTRUSIVE
+                        | RTR3INIT_FLAGS_UTF8_ARGV)));
     Assert(!(fFlags & RTR3INIT_FLAGS_DLL) || cArgs == 0);