From 2450729ff7a4e57d73497f906c077660c7e14917 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Thu, 8 Dec 2005 11:54:01 +0000 Subject: [PATCH] Respect the fact, that the driver can return NULL-pointer, instead of a string having 0 characters! (makes third-party drivers compatibility better). This piece left from previous commit. svn path=/trunk/; revision=19964 --- reactos/ntoskrnl/io/pnpmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/ntoskrnl/io/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr.c index d6d1f2ab543..4a1ecf86289 100644 --- a/reactos/ntoskrnl/io/pnpmgr.c +++ b/reactos/ntoskrnl/io/pnpmgr.c @@ -1857,7 +1857,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode, } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); DeviceNode->BootResources = NULL; } @@ -1868,14 +1868,14 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode, &IoStatusBlock, IRP_MN_QUERY_RESOURCE_REQUIREMENTS, NULL); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && IoStatusBlock.Information) { DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; } else { - DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); DeviceNode->ResourceRequirements = NULL; } -- 2.17.1