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

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.

Location:

trunk/src/VBox/Runtime

Files:

• common/ldr/ldrNative.cpp (modified) (3 diffs)
• include/internal/ldr.h (modified) (1 diff)
• r3/posix/ldrNative-posix.cpp (modified) (3 diffs)
• r3/win/ldrNative-win.cpp (modified) (2 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);
 
 

trunk/src/VBox/Runtime/include/internal/ldr.h

@@ -365 +365 @@
  * @param   pszFilename     The image filename.
  * @param   phHandle        Where to store the module handle on success.
- */
-int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle);
+ * @param   pszError        Where to store the error message. Optional.
+ * @param   cbError         The size of the error message buffer.
+ */
+int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, char *pszError, size_t cbError);
 
 int rtldrPEOpen(PRTLDRREADER pReader, uint32_t fFlags, RTLDRARCH enmArch, RTFOFF offNtHdrs, PRTLDRMOD phLdrMod);

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

@@ -41 +41 @@
 
 
-int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle)
+int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, char *pszError, size_t cbError)
 {
     /*
@@ -69 +69 @@
      * Attempt load.
      */
-
     void *pvMod = dlopen(pszFilename, RTLD_NOW | RTLD_LOCAL);
     if (pvMod)
@@ -76 +75 @@
         return VINF_SUCCESS;
     }
-    LogRel(("rtldrNativeLoad: dlopen('%s', RTLD_NOW | RTLD_LOCAL) failed: %s\n", pszFilename, dlerror()));
+
+    const char *pszDlError = dlerror();
+    if (pszError)
+        RTStrCopy(pszError, cbError, pszDlError);
+    LogRel(("rtldrNativeLoad: dlopen('%s', RTLD_NOW | RTLD_LOCAL) failed: %s\n", pszFilename, pszDlError));
     return VERR_FILE_NOT_FOUND;
 }

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

@@ -39 +39 @@
 
 
-int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle)
+int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, char *pszError, size_t cbError)
 {
     Assert(sizeof(*phHandle) >= sizeof(HMODULE));
@@ -67 +67 @@
     }
 
-    return RTErrConvertFromWin32(GetLastError());
+    /*
+     * Try figure why it failed to load.
+     */
+    DWORD dwErr = GetLastError(dwErr);
+    int   rc    = RTErrConvertFromWin32(dwErr);
+    if (cbError)
+        RTStrPrintf(pszError, cbError, "GetLastError=%u", dwErr);
+    return rc;
 }