Changeset 35191 in vbox

Timestamp:

Dec 16, 2010 3:25:20 PM (14 years ago)

Author:

vboxsync

Message:

Some cleanup. Pass RTLDRLOAD_FLAGS_LOCAL instead of 0, since it's defined.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (2 diffs)
• include/iprt/ldr.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• src/VBox/Main/ConsoleVRDPServer.cpp (modified) (1 diff)
• src/VBox/Main/ExtPackManagerImpl.cpp (modified) (2 diffs)
• src/VBox/Main/VRDEServerImpl.cpp (modified) (1 diff)
• src/VBox/Main/hgcm/HGCM.cpp (modified) (1 diff)
• src/VBox/Runtime/common/ldr/ldrNative.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/posix/ldrNative-posix.cpp (modified) (1 diff)
• src/recompiler/VBoxREMWrapper.cpp (modified) (3 diffs)

trunk/include/VBox/sup.h

@@ -1036 +1036 @@
  * @param   pszFilename     Image filename. This must have a path.
  * @param   phLdrMod        Where to store the handle to the loaded module.
- * @param   fFlags          See RTLDRFLAGS_.
+ * @param   fFlags          See RTLDRLOAD_FLAGS_XXX.
  * @param   pErrInfo        Where to return extended error information.
  *                          Optional.
@@ -1052 +1052 @@
  * @param   pszFilename     Image filename.
  * @param   phLdrMod        Where to store the handle to the loaded module.
- * @param   fFlags          See RTLDRFLAGS_*.
+ * @param   fFlags          See RTLDRLOAD_FLAGS_XXX.
  * @param   pErrInfo        Where to return extended error information.
  *                          Optional.

trunk/include/iprt/ldr.h

@@ -36 +36 @@
  */
 
-/** Symbols defined in this library are not made available to resolve
- * references in subsequently loaded libraries (default). */
-#define RTLDRFLAGS_LOCAL        0
-/** Symbols defined in this library will be made available for symbol
- * resolution of subsequently loaded libraries. */
-#define RTLDRFLAGS_GLOBAL       RT_BIT(0)
-
 
 RT_C_DECLS_BEGIN
@@ -97 +90 @@
  * @param   pszFilename Image filename.
  * @param   phLdrMod    Where to store the handle to the loader module.
- * @param   fFlags      See RTLDFLAGS_.
+ * @param   fFlags      See RTLDRLOAD_FLAGS_XXX.
  * @param   pErrInfo    Where to return extended error information. Optional.
  */
 RTDECL(int) RTLdrLoadEx(const char *pszFilename, PRTLDRMOD phLdrMod, uint32_t fFlags, PRTERRINFO pErrInfo);
+
+/** @defgroup RTLDRLOAD_FLAGS_XXX RTLdrLoadEx flags.
+ * @{ */
+/** Symbols defined in this library are not made available to resolve
+ * references in subsequently loaded libraries (default). */
+#define RTLDRLOAD_FLAGS_LOCAL       UINT32_C(0)
+/** Symbols defined in this library will be made available for symbol
+ * resolution of subsequently loaded libraries. */
+#define RTLDRLOAD_FLAGS_GLOBAL      RT_BIT_32(0)
+/** The mask of valid flag bits. */
+#define RTLDRLOAD_FLAGS_VALID_MASK  UINT32_C(0x00000001)
+/** @} */
 
 /**

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -841 +841 @@
             Log2(("VBoxHeadless: loading VBoxFFmpegFB shared library\n"));
             RTErrInfoInitStatic(&ErrInfo);
-            rrc = SUPR3HardenedLdrLoadAppPriv("VBoxFFmpegFB", &hLdrFFmpegFB, 0 /*fFlags*/, &ErrInfo.Core);
+            rrc = SUPR3HardenedLdrLoadAppPriv("VBoxFFmpegFB", &hLdrFFmpegFB, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
 
             if (RT_SUCCESS(rrc))

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -5115 +5115 @@
         RTERRINFOSTATIC ErrInfo;
         RTErrInfoInitStatic(&ErrInfo);
-        int vrc = SUPR3HardenedLdrLoadAppPriv("VBoxDbg", &mhVBoxDbg, 0 /*fFlags*/, &ErrInfo.Core);
+        int vrc = SUPR3HardenedLdrLoadAppPriv("VBoxDbg", &mhVBoxDbg, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
         if (RT_FAILURE(vrc))
         {

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -2213 +2213 @@
      * Try load it.
      */
-    return RTLdrLoadEx(pszFilename, phLdrMod, 0 /*fFlags*/, pErrInfo);
+    return RTLdrLoadEx(pszFilename, phLdrMod, RTLDRLOAD_FLAGS_LOCAL, pErrInfo);
 }
 

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -2341 +2341 @@
             rc = SUPR3HardenedLdrLoadPlugIn(pszLibraryName, &mVRDPLibrary, &ErrInfo.Core);
         else
-            rc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &mVRDPLibrary, 0 /*fFlags*/, &ErrInfo.Core);
+            rc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &mVRDPLibrary, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -1177 +1177 @@
     if (fIsNative)
     {
-        vrc = RTLdrLoadEx(m->strMainModPath.c_str(), &m->hMainMod, 0 /*fFlags*/, &ErrInfo.Core);
+        vrc = SUPR3HardenedLdrLoadPlugIn(m->strMainModPath.c_str(), &m->hMainMod, &ErrInfo.Core);
         if (RT_FAILURE(vrc))
         {
@@ -1771 +1771 @@
     if (a_enmContext == VBOXEXTPACKCTX_PER_USER_DAEMON)
     {
-        int vrc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &m->hVBoxVMM, RTLDRFLAGS_GLOBAL, NULL);
+        int vrc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &m->hVBoxVMM, RTLDRLOAD_FLAGS_GLOBAL, NULL);
         if (RT_FAILURE(vrc))
             m->hVBoxVMM = NIL_RTLDRMOD;

trunk/src/VBox/Main/VRDEServerImpl.cpp

@@ -494 +494 @@
         rc = SUPR3HardenedLdrLoadPlugIn(pszLibraryName, &hmod, &ErrInfo.Core);
     else
-        rc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &hmod, 0 /*fFlags*/, &ErrInfo.Core);
+        rc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &hmod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -265 +265 @@
     RTErrInfoInitStatic (&ErrInfo);
 
-    int rc = SUPR3HardenedLdrLoadAppPriv (m_pszSvcLibrary, &m_hLdrMod, 0 /*fFlags*/, &ErrInfo.Core);
+    int rc = SUPR3HardenedLdrLoadAppPriv (m_pszSvcLibrary, &m_hLdrMod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
 
     if (RT_SUCCESS(rc))

trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp

@@ -96 +96 @@
 RTDECL(int) RTLdrLoad(const char *pszFilename, PRTLDRMOD phLdrMod)
 {
-    return RTLdrLoadEx(pszFilename, phLdrMod, 0 /*fFlags*/, NULL);
+    return RTLdrLoadEx(pszFilename, phLdrMod, RTLDRLOAD_FLAGS_LOCAL, NULL);
 }
 RT_EXPORT_SYMBOL(RTLdrLoad);
@@ -111 +111 @@
     AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
     AssertPtrReturn(phLdrMod, VERR_INVALID_POINTER);
+    AssertReturn(!(fFlags & ~RTLDRLOAD_FLAGS_VALID_MASK), VERR_INVALID_PARAMETER);
 
     /*

trunk/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp

@@ -70 +70 @@
      */
     int fFlagsNative = RTLD_NOW;
-    if (fFlags & RTLDRFLAGS_GLOBAL)
+    if (fFlags & RTLDRLOAD_FLAGS_GLOBAL)
         fFlagsNative |= RTLD_GLOBAL;
     else

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -1983 +1983 @@
     if (g_ModVMM != NIL_RTLDRMOD)
     {
-        rc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &g_ModVMM, 0 /*fFlags*/, NULL);
+        rc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &g_ModVMM, RTLDRLOAD_FLAGS_LOCAL, NULL);
         AssertRCReturn(rc, rc);
         for (size_t i = 0; i < RT_ELEMENTS(g_aVMMImports); i++)
@@ -2097 +2097 @@
     if (g_ModVMM == NIL_RTLDRMOD)
     {
-        rc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &g_ModVMM, 0 /*fFlags*/, NULL);
+        rc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &g_ModVMM, RTLDRLOAD_FLAGS_LOCAL, NULL);
         AssertRCReturn(rc, false);
     }
@@ -2133 +2133 @@
      */
     const char *pszModule = remIs64bitEnabled(pVM) ? "VBoxREM64" : "VBoxREM32";
-    int rc = SUPR3HardenedLdrLoadAppPriv(pszModule, &g_ModREM2, 0 /*fFlags*/, NULL);
+    int rc = SUPR3HardenedLdrLoadAppPriv(pszModule, &g_ModREM2, RTLDRLOAD_FLAGS_LOCAL, NULL);
     if (RT_SUCCESS(rc))
     {