Changeset 38636 in vbox for trunk/src/VBox/Main

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.

Location:

trunk/src/VBox/Main

Files:

• src-client/win/dllmain.cpp (modified) (1 diff)
• src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (2 diffs)
• src-server/darwin/iokit.cpp (modified) (1 diff)
• src-server/generic/OpenGLTestApp.cpp (modified) (1 diff)
• src-server/win/svcmain.cpp (modified) (3 diffs)
• src-server/xpcom/server.cpp (modified) (2 diffs)
• testcase/tstAPI.cpp (modified) (1 diff)
• testcase/tstCollector.cpp (modified) (1 diff)
• testcase/tstOVF.cpp (modified) (1 diff)
• webservice/vboxweb.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/win/dllmain.cpp

@@ -46 +46 @@
 
         // idempotent, so doesn't harm, and needed for COM embedding scenario
-        RTR3Init();
+        RTR3InitDll(0);
     }
     else if (dwReason == DLL_PROCESS_DETACH)

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

@@ -1746 +1746 @@
      * Initialize IPRT and check that we're correctly installed.
      */
-    int rc = RTR3Init();
+    int rc = RTR3InitExe(argc, &argv, 0);
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);
@@ -1885 +1885 @@
     NOREF(hPrevInstance); NOREF(nShowCmd); NOREF(lpCmdLine);
 
-    int rc = RTR3Init();
+    int rc = RTR3InitExeNoArguments(0);
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -1683 +1683 @@
 int main(int argc, char **argv)
 {
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
 
     if (1)

trunk/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp

@@ -211 +211 @@
     int rc = 0;
 
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
 
     if(argc < 2)

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);
 

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -789 +789 @@
      * the support driver
      */
-    RTR3Init();
+    int vrc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(vrc))
+        return RTMsgInitFailure(vrc);
 
     static const RTGETOPTDEF s_aOptions[] =
@@ -811 +813 @@
 
     RTGETOPTSTATE   GetOptState;
-    int vrc = RTGetOptInit(&GetOptState, argc, argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    vrc = RTGetOptInit(&GetOptState, argc, argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
     AssertRC(vrc);
 

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -201 +201 @@
      * the support driver.
      */
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
 
     HRESULT rc;

trunk/src/VBox/Main/testcase/tstCollector.cpp

@@ -148 +148 @@
      * the support driver.
      */
-    int rc = RTR3Init();
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("tstCollector: RTR3Init() -> %d\n", rc);
+    int rc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("tstCollector: RTR3InitExe() -> %d\n", rc);
         return 1;
     }

trunk/src/VBox/Main/testcase/tstOVF.cpp

@@ -282 +282 @@
 int main(int argc, char *argv[])
 {
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
 
     HRESULT rc = S_OK;

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -784 +784 @@
 {
     // initialize runtime
-    int rc = RTR3Init();
+    int rc = RTR3InitExe(argc, &argv, 0);
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);