Changeset 38636 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

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

73843

Message:

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

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -244 +244 @@
      * the support driver.
      */
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
 
     /*
@@ -329 +329 @@
     if (FAILED(hrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM!");
-
-    /*
-     * The input is ASSUMED to be in the current process codeset (NT guarantees
-     * ACP, unixy systems doesn't guarantee anything).  This loop converts all
-     * the argv[*] strings to UTF-8, which is a tad ugly but who cares.
-     * (As a rule all strings in VirtualBox are UTF-8.)
-     */
-    for (int i = iCmdArg; i < argc; i++)
-    {
-        char *pszConverted;
-        int rc = RTStrCurrentCPToUtf8(&pszConverted, argv[i]);
-        if (RT_SUCCESS(rc))
-            argv[i] = pszConverted;
-        else
-            /* Conversion was not possible,probably due to invalid characters.
-             * Keep in mind that we do RTStrFree on the whole array below. */
-            argv[i] = RTStrDup(argv[i]);
-    }
 
     RTEXITCODE rcExit = RTEXITCODE_FAILURE;
@@ -500 +482 @@
     com::Shutdown();
 
-    /*
-     * Free converted argument vector
-     */
-    for (int i = iCmdArg; i < argc; i++)
-    {
-        RTStrFree(argv[i]);
-        argv[i] = NULL;
-    }
-
     return rcExit;
 #else  /* VBOX_ONLY_DOCS */