Respect the fact, that the driver can return NULL-pointer, instead of a string having...
authorAleksey Bragin <aleksey@reactos.org>
Thu, 8 Dec 2005 11:54:01 +0000 (11:54 +0000)
committerAleksey Bragin <aleksey@reactos.org>
Thu, 8 Dec 2005 11:54:01 +0000 (11:54 +0000)
(makes third-party drivers compatibility better).
This piece left from previous commit.

svn path=/trunk/; revision=19964

reactos/ntoskrnl/io/pnpmgr.c

index d6d1f2a..4a1ecf8 100644 (file)
@@ -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;
    }