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

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/r3

Files:

• posix/ldrNative-posix.cpp (modified) (3 diffs)
• win/ldrNative-win.cpp (modified) (2 diffs)

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;
 }