Changeset 34959 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Dec 10, 2010 3:17:31 PM (14 years ago)

Author:

vboxsync

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

68779

Message:

Added RTLdrLoadEx for exposing dlerror info.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp (modified) (3 diffs)

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

@@ -96 +96 @@
 RTDECL(int) RTLdrLoad(const char *pszFilename, PRTLDRMOD phLdrMod)
 {
-    LogFlow(("RTLdrLoad: pszFilename=%p:{%s} phLdrMod=%p\n", pszFilename, pszFilename, phLdrMod));
-
-    /*
-     * validate input.
-     */
-    AssertMsgReturn(VALID_PTR(pszFilename), ("pszFilename=%p\n", pszFilename), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(phLdrMod), ("phLdrMod=%p\n", phLdrMod), VERR_INVALID_PARAMETER);
+    return RTLdrLoadEx(pszFilename, phLdrMod, NULL, 0);
+}
+RT_EXPORT_SYMBOL(RTLdrLoad);
+
+
+RTDECL(int) RTLdrLoadEx(const char *pszFilename, PRTLDRMOD phLdrMod, char *pszError, size_t cbError)
+{
+    LogFlow(("RTLdrLoadEx: pszFilename=%p:{%s} phLdrMod=%p pszError=%p cbError=%zu\n", pszFilename, pszFilename, phLdrMod, pszError, cbError));
+
+    /*
+     * Validate and massage the input.
+     */
+    if (!pszError)
+        AssertReturn(!cbError, VERR_INVALID_PARAMETER);
+    else
+    {
+        AssertPtrReturn(pszError, VERR_INVALID_POINTER);
+        if (cbError)
+            *pszError = '\0';
+        else
+            pszError = NULL;
+    }
+    AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
+    AssertPtrReturn(phLdrMod, VERR_INVALID_POINTER);
 
     /*
@@ -119 +136 @@
          * Attempt to open the module.
          */
-        rc = rtldrNativeLoad(pszFilename, &pMod->hNative);
+        rc = rtldrNativeLoad(pszFilename, &pMod->hNative, pszError, cbError);
         if (RT_SUCCESS(rc))
         {
@@ -126 +143 @@
             return rc;
         }
+
         RTMemFree(pMod);
     }
+    else if (cbError)
+        RTStrPrintf(pszError, cbError, "Failed to allocate %zu bytes for the module handle", sizeof(*pMod));
     *phLdrMod = NIL_RTLDRMOD;
     LogFlow(("RTLdrLoad: returns %Rrc\n", rc));
     return rc;
 }
-RT_EXPORT_SYMBOL(RTLdrLoad);
+RT_EXPORT_SYMBOL(RTLdrLoadEx);