Changeset 70387 in vbox

Timestamp:

Dec 29, 2017 2:13:36 PM (7 years ago)

Author:

vboxsync

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

119992

Message:

iprt/nt3fakes-r0drv-nt.cpp: fix for xp

File:

• trunk/src/VBox/Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp

@@ -359 +359 @@
 
         /* Check out the resource section, looking for VS_FIXEDFILEINFO. */
-        __try
+        __try /* (pointless) */
         {
             PIMAGE_SECTION_HEADER paShdrs = (PIMAGE_SECTION_HEADER)(pNtHdrs + 1);
@@ -453 +453 @@
 static bool rtR0Nt3InitModuleInfoOne(const char *pszImage, uint8_t const *pbCode, uint8_t **ppbModule, uint32_t *pcbModule)
 {
-    uintptr_t const uImageAlign = _64K;
+    uintptr_t const uImageAlign = _4K; /* XP may put the kernel at */
 
     /* Align pbCode. */
@@ -461 +461 @@
     for (uint32_t cbChecked = 0; cbChecked < _64M; cbChecked += uImageAlign, pbCode -= uImageAlign)
     {
+        if (!MmIsAddressValid((void *)pbCode))
+            continue;
+
         uint32_t uZero     = 0;
         uint32_t offNewHdr = 0;
-        __try
+        __try /* pointless */
         {
             uZero     = *(uint32_t const *)pbCode;
@@ -478 +481 @@
         {
             RT_CONCAT(IMAGE_NT_HEADERS,ARCH_BITS) NtHdrs;
-            __try
+            __try /* pointless */
             {
                 NtHdrs = *(decltype(NtHdrs) const *)&pbCode[offNewHdr];