Changeset 59289 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Jan 8, 2016 3:06:00 PM (9 years ago)

Author:

vboxsync

Message:

IPRT: Init order check.

File:

• trunk/src/VBox/Runtime/r3/win/ldrNative-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/win/ldrNative-win.cpp

@@ -46 +46 @@
 #include <iprt/string.h>
 #include "internal/ldr.h"
+#include "internal-r3-win.h"
 
 #ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
@@ -61 +62 @@
                           ("pszFilename='%s'\n", pszFilename),
                           VERR_INTERNAL_ERROR_2);
+    AssertReleaseMsg(g_hModKernel32,
+                     ("rtldrNativeLoad(%s,,) is called before IPRT has configured the windows loader!\n", pszFilename));
 
     /*
@@ -163 +166 @@
 int rtldrNativeLoadSystem(const char *pszFilename, const char *pszExt, uint32_t fFlags, PRTLDRMOD phLdrMod)
 {
+    AssertReleaseMsg(g_hModKernel32,
+                     ("rtldrNativeLoadSystem(%s,,) is called before IPRT has configured the windows loader!\n", pszFilename));
+
     /*
      * We only try the System32 directory.