vbox的更動 35183 路徑 trunk/src/VBox/Runtime/r3

時間撮記:

2010-12-16 下午01:59:44 (14 年 以前)

作者:

vboxsync

訊息:

RTLdrLoadEx use RTERRINFO.

位置:

trunk/src/VBox/Runtime/r3

檔案:

• posix/ldrNative-posix.cpp (修改) (3 筆差異)
• win/ldrNative-win.cpp (修改) (3 筆差異)

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