Changeset 70157 in vbox for trunk/src/VBox

Timestamp:

Dec 15, 2017 4:18:28 PM (7 years ago)

Author:

vboxsync

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

119719

Message:

iprt/r0drv/nt: Fixing NT4, broke it just now.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• alloc-r0drv-nt.cpp (modified) (1 diff)
• initterm-r0drv-nt.cpp (modified) (2 diffs)
• internal-r0drv-nt.h (modified) (1 diff)
• memobj-r0drv-nt.cpp (modified) (2 diffs)
• the-nt-kernel.h (modified) (1 diff)

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

@@ -77 +77 @@
 {
     pHdr->u32Magic += 1;
-    ExFreePool(pHdr);
+    if (g_pfnrtExFreePoolWithTag)
+        g_pfnrtExFreePoolWithTag(pHdr, IPRT_NT_POOL_TAG);
+    else
+        ExFreePool(pHdr);
 }
 

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

@@ -45 +45 @@
 /** ExAllocatePoolWithTag, introduced in W2K. */
 decltype(ExAllocatePoolWithTag)        *g_pfnrtExAllocatePoolWithTag;
+/** ExFreePoolWithTag, introduced in W2K. */
+decltype(ExFreePoolWithTag)            *g_pfnrtExFreePoolWithTag;
 /** ExSetTimerResolution, introduced in W2K. */
 PFNMYEXSETTIMERRESOLUTION               g_pfnrtNtExSetTimerResolution;
@@ -274 +276 @@
 
     GET_SYSTEM_ROUTINE(ExAllocatePoolWithTag);
+    GET_SYSTEM_ROUTINE(ExFreePoolWithTag);
     GET_SYSTEM_ROUTINE_PRF(Nt,ExSetTimerResolution);
     GET_SYSTEM_ROUTINE_PRF(Nt,KeFlushQueuedDpcs);

trunk/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h

@@ -59 +59 @@
 
 extern decltype(ExAllocatePoolWithTag)        *g_pfnrtExAllocatePoolWithTag;
+extern decltype(ExFreePoolWithTag)            *g_pfnrtExFreePoolWithTag;
 extern PFNMYEXSETTIMERRESOLUTION               g_pfnrtNtExSetTimerResolution;
 extern PFNMYKEFLUSHQUEUEDDPCS                  g_pfnrtNtKeFlushQueuedDpcs;

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

@@ -111 +111 @@
         case RTR0MEMOBJTYPE_PAGE:
             Assert(pMemNt->Core.pv);
-            ExFreePool(pMemNt->Core.pv);
+            if (g_pfnrtExFreePoolWithTag)
+                g_pfnrtExFreePoolWithTag(pMemNt->Core.pv, IPRT_NT_POOL_TAG);
+            else
+                ExFreePool(pMemNt->Core.pv);
             pMemNt->Core.pv = NULL;
 
@@ -368 +371 @@
         PhysAddrLowest.QuadPart   = 0;
         PhysAddrBoundary.QuadPart = (uAlignment == PAGE_SIZE) ? 0 : uAlignment;
-        pv = MmAllocateContiguousMemorySpecifyCache(cb, PhysAddrLowest, PhysAddrHighest, PhysAddrBoundary, MmCached);
+        pv = g_pfnrtMmAllocateContiguousMemorySpecifyCache(cb, PhysAddrLowest, PhysAddrHighest, PhysAddrBoundary, MmCached);
     }
     else if (uAlignment == PAGE_SIZE)

trunk/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h

@@ -74 +74 @@
  */
 #undef ExAllocatePool
+#undef ExFreePool
 
 /** @def IPRT_NT_POOL_TAG