Changeset 70153 in vbox for trunk/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp

Timestamp:

Dec 15, 2017 3:07:27 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: Don't call ExAllocatePool[WithTag] directly unless you must, use RTMemAlloc et al instead. Simplified the NT4 ExAllocatePool/ExAllocatePoolWithTag unwrapping.

File:

• trunk/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp (modified) (1 diff)

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

@@ -46 +46 @@
     if (!(fFlags & RTMEMHDR_FLAG_ANY_CTX))
     {
-#if 1 /* This allegedly makes the driver verifier happier... */
-        POOL_TYPE enmPoolType = NonPagedPool;
-        if (!(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0))
-            enmPoolType = NonPagedPoolNx;
-        PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(enmPoolType, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
-#else
-        PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
-#endif
+        PRTMEMHDR pHdr;
+        if (g_pfnrtExAllocatePoolWithTag)
+        {
+            if (!(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0))
+                pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPoolNx, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
+            else
+                pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
+        }
+        else
+            pHdr = (PRTMEMHDR)ExAllocatePool(NonPagedPool, cb + sizeof(*pHdr));
         if (pHdr)
         {