Changeset 45983 in vbox

Timestamp:

May 10, 2013 2:19:01 PM (12 years ago)

Author:

vboxsync

Message:

DbgPlugInWinNt.cpp: Made it work with NT4.

File:

• trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp (modified) (5 diffs)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -308 +308 @@
     typedef union NTHDRSU
     {
-        IMAGE_NT_HEADERS64  vX_32;
+        IMAGE_NT_HEADERS32  vX_32;
         IMAGE_NT_HEADERS64  vX_64;
     } NTHDRS;
@@ -361 +361 @@
         return;
     }
-    if (WINNT_UNION(pThis, pHdrs, OptionalHeader.SizeOfImage) != cbImage)
+    if (RT_ALIGN(WINNT_UNION(pThis, pHdrs, OptionalHeader.SizeOfImage), _4K) != RT_ALIGN(cbImage, _4K))
     {
         Log(("DigWinNt: %s: Invalid OH.SizeOfImage: %#x, expected %#x\n", pszName, WINNT_UNION(pThis, pHdrs, OptionalHeader.SizeOfImage), cbImage));
@@ -368 +368 @@
     if (WINNT_UNION(pThis, pHdrs, OptionalHeader.NumberOfRvaAndSizes) != IMAGE_NUMBEROF_DIRECTORY_ENTRIES)
     {
-        Log(("DigWinNt: %s: Invalid OH.SizeOfImage: %#x\n", pszName, WINNT_UNION(pThis, pHdrs, OptionalHeader.NumberOfRvaAndSizes)));
+        Log(("DigWinNt: %s: Invalid OH.NumberOfRvaAndSizes: %#x\n", pszName, WINNT_UNION(pThis, pHdrs, OptionalHeader.NumberOfRvaAndSizes)));
         return;
     }
@@ -658 +658 @@
 
     /*
-     * Look for the MISYSPTE section name that seems to be a part of all kernels.
+     * Look for the PAGELK section name that seems to be a part of all kernels.
      * Then try find the module table entry for it.  Since it's the first entry
      * in the PsLoadedModuleList we can easily validate the list head and report
@@ -676 +676 @@
         {
             int rc = DBGFR3MemScan(pUVM, 0 /*idCpu*/, &KernelAddr, UINT32_C(0xffff0000) - KernelAddr.FlatPtr,
-                                   1, "MISYSPTE", sizeof("MISYSPTE") - 1, &KernelAddr);
+                                   1, "PAGELK\0", sizeof("PAGELK\0"), &KernelAddr);
             if (RT_FAILURE(rc))
                 break;