Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 48 insertions, 6 deletions

diff --git a/src/VBox/Runtime/r3/win/ldrNative-win.cpp b/src/VBox/Runtime/r3/win/ldrNative-win.cpp
index 54016958..8b26ab2c 100644
--- a/src/VBox/Runtime/r3/win/ldrNative-win.cpp
+++ b/src/VBox/Runtime/r3/win/ldrNative-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -31,10 +31,17 @@
 #include <Windows.h>
 
 #include <iprt/ldr.h>
+#include "internal/iprt.h"
+
+#include <iprt/alloca.h>
 #include <iprt/assert.h>
-#include <iprt/path.h>
 #include <iprt/err.h>
-#include <iprt/alloca.h>
+#include <iprt/file.h>
+#include <iprt/log.h>
+#include <iprt/path.h>
+#include <iprt/string.h>
+
+#include <iprt/once.h>
 #include <iprt/string.h>
 #include "internal/ldr.h"
 
@@ -42,7 +49,10 @@
 int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, PRTERRINFO pErrInfo)
 {
     Assert(sizeof(*phHandle) >= sizeof(HMODULE));
-    AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER);
+    AssertReturn(fFlags == 0 || fFlags == RTLDRLOAD_FLAGS_NO_UNLOAD, VERR_INVALID_PARAMETER);
+    AssertLogRelMsgReturn(RTPathStartsWithRoot(pszFilename),  /* Relative names will still be applied to the search path. */
+                          ("pszFilename='%s'\n", pszFilename),
+                          VERR_INTERNAL_ERROR_2);
 
     /*
      * Do we need to add an extension?
@@ -72,7 +82,7 @@ int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlag
      * Try figure why it failed to load.
      */
     DWORD dwErr = GetLastError();
-    int   rc    = RTErrConvertFromWin32(dwErr);
+    int rc = RTErrConvertFromWin32(dwErr);
     return RTErrInfoSetF(pErrInfo, rc, "GetLastError=%u", dwErr);
 }
 
@@ -94,7 +104,8 @@ DECLCALLBACK(int) rtldrNativeGetSymbol(PRTLDRMODINTERNAL pMod, const char *pszSy
 DECLCALLBACK(int) rtldrNativeClose(PRTLDRMODINTERNAL pMod)
 {
     PRTLDRMODNATIVE pModNative = (PRTLDRMODNATIVE)pMod;
-    if (FreeLibrary((HMODULE)pModNative->hNative))
+    if (   (pModNative->fFlags & RTLDRLOAD_FLAGS_NO_UNLOAD)
+        || FreeLibrary((HMODULE)pModNative->hNative))
     {
         pModNative->hNative = (uintptr_t)INVALID_HANDLE_VALUE;
         return VINF_SUCCESS;
@@ -102,3 +113,34 @@ DECLCALLBACK(int) rtldrNativeClose(PRTLDRMODINTERNAL pMod)
     return RTErrConvertFromWin32(GetLastError());
 }
 
+
+int rtldrNativeLoadSystem(const char *pszFilename, const char *pszExt, uint32_t fFlags, PRTLDRMOD phLdrMod)
+{
+    /*
+     * We only try the System32 directory.
+     */
+    WCHAR wszSysDir[MAX_PATH];
+    UINT cwcSysDir = GetSystemDirectoryW(wszSysDir, MAX_PATH);
+    if (cwcSysDir >= MAX_PATH)
+        return VERR_FILENAME_TOO_LONG;
+
+    char szPath[RTPATH_MAX];
+    char *pszPath = szPath;
+    int rc = RTUtf16ToUtf8Ex(wszSysDir, RTSTR_MAX, &pszPath, sizeof(szPath), NULL);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTPathAppend(szPath, sizeof(szPath), pszFilename);
+        if (pszExt && RT_SUCCESS(rc))
+            rc = RTStrCat(szPath, sizeof(szPath), pszExt);
+        if (RT_SUCCESS(rc))
+        {
+            if (RTFileExists(szPath))
+                rc = RTLdrLoadEx(szPath, phLdrMod, fFlags, NULL);
+            else
+                rc = VERR_MODULE_NOT_FOUND;
+        }
+    }
+
+    return rc;
+}
+