Changeset 70100 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Dec 13, 2017 9:24:42 AM (7 years ago)

Author:

vboxsync

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

119648

Message:

VBoxGuest-win*: drop the PAGE alloc stuff (leave INIT as that section is unavoidable).

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-win-pnp.cpp (modified) (1 diff)
• VBoxGuest-win.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp

@@ -47 +47 @@
 RT_C_DECLS_END
 
-#ifdef ALLOC_PRAGMA
-# pragma alloc_text(PAGE, vgdrvNtPnP)
-# pragma alloc_text(PAGE, vgdrvNtPower)
-# pragma alloc_text(PAGE, vgdrvNtSendIrpSynchronously)
-# pragma alloc_text(PAGE, vgdrvNtShowDeviceResources)
-#endif
 
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -40 +40 @@
 #include <iprt/string.h>
 
-/*
- * XP DDK #defines ExFreePool to ExFreePoolWithTag. The latter does not exist
- * on NT4, so... The same for ExAllocatePool.
- */
-#ifdef TARGET_NT4
-# undef ExAllocatePool
-# undef ExFreePool
-#endif
-
 
 /*********************************************************************************************************************************
@@ -54 +45 @@
 *********************************************************************************************************************************/
 RT_C_DECLS_BEGIN
+#ifndef TARGET_NT4
 static NTSTATUS vgdrvNtAddDevice(PDRIVER_OBJECT pDrvObj, PDEVICE_OBJECT pDevObj);
+#endif
 static void     vgdrvNtUnload(PDRIVER_OBJECT pDrvObj);
 static NTSTATUS vgdrvNtCreate(PDEVICE_OBJECT pDevObj, PIRP pIrp);
@@ -62 +55 @@
 static NTSTATUS vgdrvNtInternalIOCtl(PDEVICE_OBJECT pDevObj, PIRP pIrp);
 static void     vgdrvNtReadConfiguration(PVBOXGUESTDEVEXTWIN pDevExt);
+#ifndef TARGET_NT4
 static NTSTATUS vgdrvNtSystemControl(PDEVICE_OBJECT pDevObj, PIRP pIrp);
+#endif
 static NTSTATUS vgdrvNtShutdown(PDEVICE_OBJECT pDevObj, PIRP pIrp);
 static NTSTATUS vgdrvNtNotSupportedStub(PDEVICE_OBJECT pDevObj, PIRP pIrp);
@@ -85 +80 @@
 #ifdef ALLOC_PRAGMA
 # pragma alloc_text(INIT, DriverEntry)
-# pragma alloc_text(PAGE, vgdrvNtAddDevice)
-# pragma alloc_text(PAGE, vgdrvNtUnload)
-# pragma alloc_text(PAGE, vgdrvNtCreate)
-# pragma alloc_text(PAGE, vgdrvNtClose)
-# pragma alloc_text(PAGE, vgdrvNtShutdown)
-# pragma alloc_text(PAGE, vgdrvNtNotSupportedStub)
-# pragma alloc_text(PAGE, vgdrvNtScanPCIResourceList)
 #endif
 
@@ -910 +898 @@
 
 
+#ifndef TARGET_NT4
 /**
  * IRP_MJ_SYSTEM_CONTROL handler.
@@ -928 +917 @@
     return IoCallDriver(pDevExt->pNextLowerDriver, pIrp);
 }
+#endif /* TARGET_NT4 */
 
 
@@ -1709 +1699 @@
      * Allocate a block of non paged memory for samples and related data.
      */
-    DPCDATA *pData = (DPCDATA *)ExAllocatePoolWithTag(NonPagedPool, sizeof(DPCDATA), VBOXGUEST_DPC_TAG);
+    DPCDATA *pData = (DPCDATA *)RTMemAlloc(sizeof(DPCDATA));
     if (!pData)
     {
@@ -1760 +1750 @@
     }
 
-    ExFreePoolWithTag(pData, VBOXGUEST_DPC_TAG);
+    RTMemFree(pData);
     return VINF_SUCCESS;
 }