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

Timestamp:

Dec 16, 2010 1:59:44 PM (14 years ago)

Author:

vboxsync

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

69022

Message:

RTLdrLoadEx use RTERRINFO.

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) (3 diffs)

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, 0);
+    return RTLdrLoadEx(pszFilename, phLdrMod, 0 /*fFlags*/, NULL);
 }
 RT_EXPORT_SYMBOL(RTLdrLoad);
 
 
-RTDECL(int) RTLdrLoadEx(const char *pszFilename, PRTLDRMOD phLdrMod, uint32_t fFlags, char *pszError, size_t cbError)
-{
-    LogFlow(("RTLdrLoadEx: pszFilename=%p:{%s} phLdrMod=%p fFlags=%08x pszError=%p cbError=%zu\n", pszFilename, pszFilename, phLdrMod, fFlags, pszError, cbError));
+RTDECL(int) RTLdrLoadEx(const char *pszFilename, PRTLDRMOD phLdrMod, uint32_t fFlags, PRTERRINFO pErrInfo)
+{
+    LogFlow(("RTLdrLoadEx: pszFilename=%p:{%s} phLdrMod=%p fFlags=%#x pErrInfo=%p\n", pszFilename, pszFilename, phLdrMod, fFlags, pErrInfo));
 
     /*
      * 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;
-    }
+    RTErrInfoClear(pErrInfo);
     AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
     AssertPtrReturn(phLdrMod, VERR_INVALID_POINTER);
@@ -136 +127 @@
          * Attempt to open the module.
          */
-        rc = rtldrNativeLoad(pszFilename, &pMod->hNative, fFlags, pszError, cbError);
+        rc = rtldrNativeLoad(pszFilename, &pMod->hNative, fFlags, pErrInfo);
         if (RT_SUCCESS(rc))
         {
@@ -146 +137 @@
         RTMemFree(pMod);
     }
-    else if (cbError)
-        RTStrPrintf(pszError, cbError, "Failed to allocate %zu bytes for the module handle", sizeof(*pMod));
+    else
+        RTErrInfoSetF(pErrInfo, rc, "Failed to allocate %zu bytes for the module handle", sizeof(*pMod));
     *phLdrMod = NIL_RTLDRMOD;
     LogFlow(("RTLdrLoad: returns %Rrc\n", rc));

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

@@ -366 +366 @@
  * @param   phHandle        Where to store the module handle on success.
  * @param   fFlags          See RTLDRFLAGS_.
- * @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, uint32_t fFlags, char *pszError, size_t cbError);
+ * @param   pErrInfo        Where to return extended error information. Optional.
+ */
+int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, PRTERRINFO pErrInfo);
 
 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, uint32_t fFlags, char *pszError, size_t cbError)
+int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, PRTERRINFO pErrInfo)
 {
     /*
@@ -60 +60 @@
         char *psz = (char *)alloca(cch + sizeof(s_szSuff));
         if (!psz)
-            return VERR_NO_MEMORY;
+            return RTErrInfoSet(pErrInfo, VERR_NO_MEMORY, "alloca failed");
         memcpy(psz, pszFilename, cch);
         memcpy(psz + cch, s_szSuff, sizeof(s_szSuff));
@@ -82 +82 @@
 
     const char *pszDlError = dlerror();
-    if (pszError)
-        RTStrCopy(pszError, cbError, pszDlError);
+    RTErrInfoSet(pErrInfo, VERR_FILE_NOT_FOUND, 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

@@ -40 +40 @@
 
 
-int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, char *pszError, size_t cbError)
+int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, PRTERRINFO pErrInfo)
 {
     Assert(sizeof(*phHandle) >= sizeof(HMODULE));
@@ -53 +53 @@
         char *psz = (char *)alloca(cch + sizeof(".DLL"));
         if (!psz)
-            return VERR_NO_MEMORY;
+            return RTErrInfoSet(pErrInfo, VERR_NO_MEMORY, "alloca failed");
         memcpy(psz, pszFilename, cch);
         memcpy(psz + cch, ".DLL", sizeof(".DLL"));
@@ -74 +74 @@
     DWORD dwErr = GetLastError();
     int   rc    = RTErrConvertFromWin32(dwErr);
-    if (cbError)
-        RTStrPrintf(pszError, cbError, "GetLastError=%u", dwErr);
-    return rc;
+    return RTErrInfoSetF(pErrInfo, rc, "GetLastError=%u", dwErr);
 }