fdo.c: don't allocate a buffer with a SERENUM_TAG, because it is freed
in ntoskrnl.
misc.c: correct comment
serenum.h: remove ExFreePoolWithTag macro and use function exported by
ntoskrnl
Modified: trunk/reactos/drivers/bus/serenum/fdo.c
Modified: trunk/reactos/drivers/bus/serenum/misc.c
Modified: trunk/reactos/drivers/bus/serenum/serenum.h
_____
Modified: trunk/reactos/drivers/bus/serenum/fdo.c
--- trunk/reactos/drivers/bus/serenum/fdo.c 2005-05-12 21:10:10 UTC
(rev 15249)
+++ trunk/reactos/drivers/bus/serenum/fdo.c 2005-05-12 21:41:21 UTC
(rev 15250)
@@ -125,10 +125,9 @@
}
NumPDO = (DeviceExtension->AttachedPdo != NULL ? 1 : 0);
- DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(
+ DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(
PagedPool,
- sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) *
(NumPDO - 1),
- SERENUM_TAG);
+ sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) *
(NumPDO - 1));
if (!DeviceRelations)
return STATUS_INSUFFICIENT_RESOURCES;
_____
Modified: trunk/reactos/drivers/bus/serenum/misc.c
--- trunk/reactos/drivers/bus/serenum/misc.c 2005-05-12 21:10:10 UTC
(rev 15249)
+++ trunk/reactos/drivers/bus/serenum/misc.c 2005-05-12 21:41:21 UTC
(rev 15250)
@@ -39,7 +39,7 @@
return STATUS_SUCCESS;
}
-/* I really want ANSI strings as last arguments because
+/* I really want PCSZ strings as last arguments because
* PnP ids are ANSI-encoded in PnP device string
* identification */
NTSTATUS
@@ -122,7 +122,7 @@
{
if (Irp->PendingReturned)
KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE);
- return STATUS_MORE_PROCESSING_REQUIRED;
+ return STATUS_MORE_PROCESSING_REQUIRED;
}
NTSTATUS
_____
Modified: trunk/reactos/drivers/bus/serenum/serenum.h
--- trunk/reactos/drivers/bus/serenum/serenum.h 2005-05-12 21:10:10 UTC
(rev 15249)
+++ trunk/reactos/drivers/bus/serenum/serenum.h 2005-05-12 21:41:21 UTC
(rev 15250)
@@ -7,7 +7,6 @@
#include <debug.h>
#define SR_MSR_DSR 0x20
- #define ExFreePoolWithTag(p, tag) ExFreePool(p)
/* FIXME: these prototypes MUST NOT be here! */
NTSTATUS STDCALL
@@ -117,9 +116,9 @@
NTSTATUS
SerenumDuplicateUnicodeString(
- OUT PUNICODE_STRING Destination,
- IN PUNICODE_STRING Source,
- IN POOL_TYPE PoolType);
+ OUT PUNICODE_STRING Destination,
+ IN PUNICODE_STRING Source,
+ IN POOL_TYPE PoolType);
NTSTATUS
SerenumInitMultiSzString(
Show replies by date