Replace ExAllocatePool by ExAllocatePoolWithTag

Fix CHECKPOINT1 definition for MSVC compiler

svn path=/trunk/; revision=17513
This commit is contained in:
Hervé Poussineau 2005-08-24 15:33:58 +00:00
parent 820afe2e92
commit 66c8fe47e0
5 changed files with 8 additions and 6 deletions

View file

@ -193,6 +193,7 @@ ReportDetectedDevice(
ByeBye: ByeBye:
if (Pdo) if (Pdo)
{ {
ASSERT(PdoDeviceExtension);
if (PdoDeviceExtension->DeviceDescription.Buffer) if (PdoDeviceExtension->DeviceDescription.Buffer)
RtlFreeUnicodeString(&PdoDeviceExtension->DeviceDescription); RtlFreeUnicodeString(&PdoDeviceExtension->DeviceDescription);
if (PdoDeviceExtension->DeviceId.Buffer) if (PdoDeviceExtension->DeviceId.Buffer)

View file

@ -124,9 +124,10 @@ SerenumFdoQueryBusRelations(
} }
NumPDO = (DeviceExtension->AttachedPdo != NULL ? 1 : 0); NumPDO = (DeviceExtension->AttachedPdo != NULL ? 1 : 0);
DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool( DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(
PagedPool, PagedPool,
sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * (NumPDO - 1)); sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * (NumPDO - 1),
SERENUM_TAG);
if (!DeviceRelations) if (!DeviceRelations)
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;

View file

@ -25,7 +25,7 @@ SerenumDuplicateUnicodeString(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
Destination->Buffer = ExAllocatePool(PoolType, Source->MaximumLength); Destination->Buffer = ExAllocatePoolWithTag(PoolType, Source->MaximumLength, SERENUM_TAG);
if (Destination->Buffer == NULL) if (Destination->Buffer == NULL)
{ {
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;

View file

@ -233,7 +233,7 @@ SerenumPdoPnp(
DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n");
Source = &((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->DeviceDescription; Source = &((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->DeviceDescription;
Description = ExAllocatePool(PagedPool, Source->Length + sizeof(WCHAR)); Description = ExAllocatePoolWithTag(PagedPool, Source->Length + sizeof(WCHAR), SERENUM_TAG);
if (!Description) if (!Description)
Status = STATUS_INSUFFICIENT_RESOURCES; Status = STATUS_INSUFFICIENT_RESOURCES;
else else
@ -277,7 +277,7 @@ SerenumPdoPnp(
PPNP_BUS_INFORMATION BusInfo; PPNP_BUS_INFORMATION BusInfo;
DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n");
BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), SERENUM_TAG);
if (!BusInfo) if (!BusInfo)
Status = STATUS_INSUFFICIENT_RESOURCES; Status = STATUS_INSUFFICIENT_RESOURCES;
else else

View file

@ -17,7 +17,7 @@
#define STDCALL #define STDCALL
#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
#define CHECKPOINT1 DbgPrint("(%s:%d)\n") #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__)
#define DPRINT DPRINT1 #define DPRINT DPRINT1
#define CHECKPOINT CHECKPOINT1 #define CHECKPOINT CHECKPOINT1
#else #else