[ros-diffs] [hpoussin] 15202: Allow a NULL PeripheralType in IoQueryDeviceDescription

Allow a NULL PeripheralType in IoQueryDeviceDescription
Modified: trunk/reactos/ntoskrnl/io/resource.c
  _____  

Modified: trunk/reactos/ntoskrnl/io/resource.c
--- trunk/reactos/ntoskrnl/io/resource.c	2005-05-10 09:34:20 UTC
(rev 15201)
+++ trunk/reactos/ntoskrnl/io/resource.c	2005-05-10 09:38:20 UTC
(rev 15202)
@@ -255,7 +255,7 @@

          goto EndLoop;
 
       /* We now have Bus *AND* Controller Information.. is it enough?
*/
-      if (!(*Query->PeripheralType))
+      if (!Query->PeripheralType || !(*Query->PeripheralType))
       {
          Status = Query->CalloutRoutine(
             Query->Context,
@@ -740,12 +740,12 @@
  */
 
 NTSTATUS NTAPI
-IoQueryDeviceDescription(PINTERFACE_TYPE BusType,
-			 PULONG BusNumber,
-			 PCONFIGURATION_TYPE ControllerType,
-			 PULONG ControllerNumber,
-			 PCONFIGURATION_TYPE PeripheralType,
-			 PULONG PeripheralNumber,
+IoQueryDeviceDescription(PINTERFACE_TYPE BusType OPTIONAL,
+			 PULONG BusNumber OPTIONAL,
+			 PCONFIGURATION_TYPE ControllerType OPTIONAL,
+			 PULONG ControllerNumber OPTIONAL,
+			 PCONFIGURATION_TYPE PeripheralType OPTIONAL,
+			 PULONG PeripheralNumber OPTIONAL,
 			 PIO_QUERY_DEVICE_ROUTINE CalloutRoutine,
 			 PVOID Context)
 {