Changeset 38636 in vbox for trunk/src/libs/xpcom18a4/java

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/libs/xpcom18a4/java

Files:

• src/nsJavaInterfaces.cpp (modified) (2 diffs)
• tools/genifaces/GenerateJavaInterfaces.cpp (modified) (1 diff)

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