Changeset 56746 in vbox for trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp

Timestamp:

Jul 2, 2015 11:01:09 AM (9 years ago)

Author:

vboxsync

Message:

SUPHardNt: Need another hack to make VBoxRT.dll load when executing testcases, at least on server 2012.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp

@@ -452 +452 @@
  *                              directory.  If set to false, the application
  *                              directory is also searched.
- */
-DECLHIDDEN(void *) supR3HardenedWinLoadLibrary(const char *pszName, bool fSystem32Only)
+ * @param   fMainFlags          The main flags (giving the location), if the DLL
+ *                              being loaded is loaded from the app bin
+ *                              directory and import other DLLs from there. Pass
+ *                              0 (= SUPSECMAIN_FLAGS_LOC_APP_BIN) if not
+ *                              applicable.  Ignored if @a fSystem32Only is set.
+ *
+ *                              This is only needed to load VBoxRT.dll when
+ *                              executing a testcase from the testcase/ subdir.
+ */
+DECLHIDDEN(void *) supR3HardenedWinLoadLibrary(const char *pszName, bool fSystem32Only, uint32_t fMainFlags)
 {
     WCHAR wszPath[RTPATH_MAX];
@@ -476 +484 @@
                 if (g_fSupLibHardenedDllSearchUserDirs)
                     fFlags |= LOAD_LIBRARY_SEARCH_USER_DIRS;
+                if ((fMainFlags & SUPSECMAIN_FLAGS_LOC_MASK) != SUPSECMAIN_FLAGS_LOC_APP_BIN)
+                    fFlags |= LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR;
             }
         }