Changeset 38636 in vbox for trunk/src/libs

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.

Location:

trunk/src/libs/xpcom18a4

Files:

• ipc/ipcd/daemon/src/ipcdUnix.cpp (modified) (1 diff)
• ipc/ipcd/shared/src/ipcLog.cpp (modified) (2 diffs)
• java/src/nsJavaInterfaces.cpp (modified) (2 diffs)
• java/tools/genifaces/GenerateJavaInterfaces.cpp (modified) (1 diff)
• nsprpub/pr/src/io/prlog.c (modified) (3 diffs)
• nsprpub/pr/src/misc/prinit.c (modified) (1 diff)
• python/src/module/_xpcom.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -474 +474 @@
 #ifdef VBOX
     /* Set up the runtime without loading the support driver. */
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
 #endif
 

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcLog.cpp

@@ -52 +52 @@
 #undef PAGE_SIZE
 #endif
-#include <iprt/initterm.h> // for RTR3Init
+#include <iprt/initterm.h> // for RTR3InitDll
 #else // !VBOX
 PRBool ipcLogEnabled = PR_FALSE;
@@ -122 +122 @@
 #ifdef VBOX
     // initialize VBox Runtime
-    RTR3Init();
+    RTR3InitDll(0);
 
     PL_strncpyz(ipcLogPrefix, prefix, sizeof(ipcLogPrefix));

trunk/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp

@@ -147 +147 @@
 {
 #if defined(VBOX_PATH_APP_PRIVATE_ARCH) && defined(VBOX_PATH_SHARED_LIBS)
-    rv = RTR3Init();
-#else
-    const char *home  = nsnull;
+    rv = RTR3InitDll(0);
+#else
+    const char *pszHome  = nsnull;
     const char *jhome = nsnull;
     jstring path = nsnull;
@@ -164 +164 @@
     {
         path = (jstring)env->CallObjectMethod(aVBoxBinDirectory, getPathMID);
-        home = jhome = env->GetStringUTFChars(path, nsnull);
-    }
-
-    if (home == nsnull)
-        home = getenv("VBOX_PROGRAM_PATH");
-
-    if (home) {
-      size_t len = strlen(home);
-      char *exepath = (char *)alloca(len + 32);
-      memcpy(exepath, home, len);
-      memcpy(exepath + len, "/javafake", sizeof("/javafake"));
-      rv = RTR3InitWithProgramPath(exepath);
+        pszHome = jhome = env->GetStringUTFChars(path, nsnull);
+    }
+
+    if (pszHome == nsnull)
+        pszHome = getenv("VBOX_PROGRAM_PATH");
+
+    if (pszHome) {
+      size_t cchHome = strlen(pszHome);
+      char *pszExePath = (char *)alloca(cchHome + 32);
+      memcpy(pszExePath, pszHome, cchHome);
+      memcpy(pszExePath + cchHome, "/javafake", sizeof("/javafake"));
+      rv = RTR3InitEx(RTR3INIT_VER_CUR, RTR3INIT_FLAGS_DLL, 0, NULL, pszExePath);
     } else {
-      rv = RTR3Init();
+      rv = RTR3InitDll(0);
     }
 

trunk/src/libs/xpcom18a4/java/tools/genifaces/GenerateJavaInterfaces.cpp

@@ -874 +874 @@
 #ifdef VBOX
 #if defined(VBOX_PATH_APP_PRIVATE_ARCH) && defined(VBOX_PATH_SHARED_LIBS)
-    rv = RTR3Init();
+  rv = RTR3InitExe(argc, &argv, 0);
 #else
-    const char *home = getenv("VBOX_PROGRAM_PATH");
-    if (home) {
-      size_t len = strlen(home);
-      char *exepath = (char *)alloca(len + 32);
-      memcpy(exepath, home, len);
-      memcpy(exepath + len, "/pythonfake", sizeof("/pythonfake"));
-      rv = RTR3InitWithProgramPath(exepath);
-    } else {
-      rv = RTR3Init();
-    }
+  const char *pszHome = getenv("VBOX_PROGRAM_PATH");
+  if (pszHome) {
+    size_t cchHome = strlen(pszHome);
+    char *pszExePath = (char *)alloca(cchHome + 32);
+    memcpy(pszExePath, pszHome, cchHome);
+    memcpy(pszExePath + cchHome, "/pythonfake", sizeof("/pythonfake"));
+    rc = RTR3InitEx(RTR3INIT_VER_CUR, 0, argc, &argv, pszExePath);
+  } else {
+    rv = RTR3InitExe(argc, &argv, 0);
+  }
 #endif
 #endif

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prlog.c

@@ -51 +51 @@
 
 #if defined(VBOX) && defined(DEBUG)
-# include <iprt/initterm.h> /* for RTR3Init */
+# include <iprt/initterm.h> /* for RTR3InitDll */
 # include <iprt/log.h>
 #endif
@@ -424 +424 @@
     if (strcmp(file, "IPRT") == 0) {
         /* initialize VBox Runtime */
-        RTR3Init();
+        RTR3InitDll(0);
         newLogFile = IPRT_DEBUG_FILE;
     }
@@ -465 +465 @@
     if (strcmp(file, "IPRT") == 0) {
         /* initialize VBox Runtime */
-        RTR3Init();
+        RTR3InitDll(0);
         logFile = IPRT_DEBUG_FILE;
         return PR_TRUE;

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -177 +177 @@
     _pr_initialized = PR_TRUE;
 #ifdef VBOX_USE_IPRT_IN_NSPR
-    RTR3Init();
+    RTR3InitDll(0);
 #endif
 #ifdef _PR_ZONE_ALLOCATOR

trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

@@ -781 +781 @@
 
 #if defined(VBOX_PATH_APP_PRIVATE_ARCH) && defined(VBOX_PATH_SHARED_LIBS)
-    rc = RTR3Init();
+    rc = RTR3InitDll(0);
 #else
     const char *home = getenv("VBOX_PROGRAM_PATH");
@@ -789 +789 @@
       memcpy(exepath, home, len);
       memcpy(exepath + len, "/pythonfake", sizeof("/pythonfake"));
-      rc = RTR3InitWithProgramPath(exepath);
+      rc = RTR3InitEx(RTR3INIT_VER_CUR, RTR3INIT_FLAGS_DLL, 0, NULL, exepath);
     } else {
-      rc = RTR3Init();
+      rc = RTR3InitDll(0);
     }
 #endif