Changeset 15320 in vbox for trunk/src/recompiler_new

Timestamp:

Dec 11, 2008 5:30:31 PM (16 years ago)

Author:

vboxsync

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

40747

Message:

VBoxREMWrapper.cpp: Use SUPR3HardenedLdrLoadAppPriv. Cleanup.

File:

• trunk/src/recompiler_new/VBoxREMWrapper.cpp (modified) (8 diffs)

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -179 +179 @@
 # define USE_REM_IMPORT_JUMP_GLUE
 #endif
+
 
 /*******************************************************************************
@@ -1941 +1942 @@
 # endif
 }
-#endif
-
+
+#endif /* USE_REM_STUBS */
 #ifdef VBOX_USE_BITNESS_SELECTOR
-static bool isRem64Needed(PVM pVM)
-{
-    PCFGMNODE pRoot = CFGMR3GetRoot(pVM);
-    uint64_t u64Value = 0;
-
-    CFGMR3QueryIntegerDef(pRoot, "Rem64Enabled", &u64Value, 0);
-
-    return u64Value == 1;
-}
+
+/**
+ * Checks if 64-bit support is enabled.
+ *
+ * @returns true / false.
+ * @param   pVM         Pointer to the shared VM structure.
+ */
+static bool remIs64bitEnabled(PVM pVM)
+{
+    bool f;
+    int rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "Rem64Enabled", &f, false);
+    AssertRCReturn(rc, false);
+    return f;
+}
+
 
 /**
@@ -1961 +1968 @@
 static int remLoadProperObj(PVM pVM)
 {
-    size_t  offFilename;
-    char    szPath[RTPATH_MAX];
-    int     rc = RTPathAppPrivateArch(szPath, sizeof(szPath) - 32);
-    AssertRCReturn(rc, rc);
-    offFilename = strlen(szPath);
-
     /*
      * Load the VBoxREM32/64 object/DLL.
      */
-    strcpy(&szPath[offFilename], isRem64Needed(pVM) ? "/VBoxREM64" : "/VBoxREM32");
-    rc = RTLdrLoad(szPath, &g_ModREM2);
+    int rc = SUPR3HardenedLdrLoadAppPriv(remIs64bitEnabled(pVM) ? "VBoxREM64" : "VBoxREM32", &g_ModREM2);
     if (RT_SUCCESS(rc))
     {
-        if (RT_SUCCESS(rc))
+        /*
+         * Resolve exports.
+         */
+        unsigned i;
+        for (i = 0; i < RT_ELEMENTS(g_aExports); i++)
         {
-            /*
-             * Resolve exports.
-             */
-            unsigned i;
-            for (i = 0; i < RT_ELEMENTS(g_aExports); i++)
-            {
-                void* Value;
-                rc = RTLdrGetSymbol(g_ModREM2, g_aExports[i].pszName, &Value);
-                AssertMsgRC(rc, ("%s rc=%Rrc\n", g_aExports[i].pszName, rc));
-                if (RT_FAILURE(rc))
-                    break;
-                *(void **)g_aExports[i].pv = Value;
-            }
+            void *pvValue;
+            rc = RTLdrGetSymbol(g_ModREM2, g_aExports[i].pszName, &pvValue);
+            AssertLogRelMsgRCBreak(rc, ("%s rc=%Rrc\n", g_aExports[i].pszName, rc));
+            *(void **)g_aExports[i].pv = pvValue;
         }
     }
-    
+
     return rc;
 }
+
 
 /**
@@ -2000 +1996 @@
 static void remUnloadProperObj(void)
 {
-    unsigned i;
-
     /* close module. */
     RTLdrClose(g_ModREM2);
     g_ModREM2 = NIL_RTLDRMOD;
 }
-#endif
-
+
+#endif /* VBOX_USE_BITNESS_SELECTOR */
 
 REMR3DECL(int) REMR3Init(PVM pVM)
@@ -2013 +2007 @@
 #ifdef USE_REM_STUBS
     return VINF_SUCCESS;
-#elif VBOX_USE_BITNESS_SELECTOR
+
+#elif defined(VBOX_USE_BITNESS_SELECTOR)
     if (!pfnREMR3Init)
     {
@@ -2021 +2016 @@
     }
     return pfnREMR3Init(pVM);
+
 #else
     if (!pfnREMR3Init)
@@ -2036 +2032 @@
 #ifdef USE_REM_STUBS
     return VINF_SUCCESS;
-#elif VBOX_USE_BITNESS_SELECTOR
+
+#elif defined(VBOX_USE_BITNESS_SELECTOR)
     int rc;
     Assert(VALID_PTR(pfnREMR3Term));
@@ -2042 +2039 @@
     remUnloadProperObj();
     return rc;
+
 #else
     int rc;