From 290837445f5ba6be447d832b4a154df60b47d322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 18 Dec 2005 20:50:26 +0000 Subject: [PATCH] Fix little bug which prevented IRP_MJ_PNP to be forwarded to lower driver Set eol-style to native for usbstor driver files svn path=/trunk/; revision=20256 --- reactos/drivers/bus/serenum/serenum.c | 2 +- reactos/drivers/dd/serial/serial.c | 2 +- reactos/drivers/input/kbdclass/kbdclass.c | 2 +- reactos/drivers/input/mouclass/mouclass.c | 3 ++- reactos/drivers/input/sermouse/sermouse.c | 2 +- reactos/drivers/storage/pciidex/miniport.c | 2 +- reactos/drivers/usb/miniport/common/main.c | 2 +- reactos/drivers/usb/usbhub/usbhub.c | 2 +- reactos/drivers/usb/usbstor/usbstor.c | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/reactos/drivers/bus/serenum/serenum.c b/reactos/drivers/bus/serenum/serenum.c index 54f47716b49..b6ee195a35c 100644 --- a/reactos/drivers/bus/serenum/serenum.c +++ b/reactos/drivers/bus/serenum/serenum.c @@ -100,7 +100,7 @@ DriverEntry( DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SerenumAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; //DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = SerialQueryInformation; diff --git a/reactos/drivers/dd/serial/serial.c b/reactos/drivers/dd/serial/serial.c index 90573e380a1..c8d2d5a6e3c 100644 --- a/reactos/drivers/dd/serial/serial.c +++ b/reactos/drivers/dd/serial/serial.c @@ -29,7 +29,7 @@ DriverEntry( DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SerialAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = ForwardIrpAndForget; DriverObject->MajorFunction[IRP_MJ_CREATE] = SerialCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = SerialClose; diff --git a/reactos/drivers/input/kbdclass/kbdclass.c b/reactos/drivers/input/kbdclass/kbdclass.c index 371b8ca33ac..cbdb404841a 100644 --- a/reactos/drivers/input/kbdclass/kbdclass.c +++ b/reactos/drivers/input/kbdclass/kbdclass.c @@ -798,7 +798,7 @@ DriverEntry( DriverObject->DriverExtension->AddDevice = ClassAddDevice; DriverObject->DriverUnload = DriverUnload; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = ClassCreate; diff --git a/reactos/drivers/input/mouclass/mouclass.c b/reactos/drivers/input/mouclass/mouclass.c index 48f91d50642..5d6e9cbecc6 100644 --- a/reactos/drivers/input/mouclass/mouclass.c +++ b/reactos/drivers/input/mouclass/mouclass.c @@ -136,6 +136,7 @@ IrpStub( /* Forward some IRPs to lower device */ switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) { + case IRP_MJ_PNP: case IRP_MJ_INTERNAL_DEVICE_CONTROL: return ForwardIrpAndForget(DeviceObject, Irp); default: @@ -788,7 +789,7 @@ DriverEntry( DriverObject->DriverExtension->AddDevice = ClassAddDevice; DriverObject->DriverUnload = DriverUnload; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = ClassCreate; diff --git a/reactos/drivers/input/sermouse/sermouse.c b/reactos/drivers/input/sermouse/sermouse.c index 13238c4b859..9bd461cf6a3 100644 --- a/reactos/drivers/input/sermouse/sermouse.c +++ b/reactos/drivers/input/sermouse/sermouse.c @@ -150,7 +150,7 @@ DriverEntry( DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SermouseAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = SermouseCreate; diff --git a/reactos/drivers/storage/pciidex/miniport.c b/reactos/drivers/storage/pciidex/miniport.c index bf6f2e9a209..e43ffc210d7 100644 --- a/reactos/drivers/storage/pciidex/miniport.c +++ b/reactos/drivers/storage/pciidex/miniport.c @@ -50,7 +50,7 @@ PciIdeXInitialize( DriverObject->DriverExtension->AddDevice = PciIdeXAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = ForwardIrpAndForget; DriverObject->MajorFunction[IRP_MJ_PNP] = PciIdeXPnpDispatch; diff --git a/reactos/drivers/usb/miniport/common/main.c b/reactos/drivers/usb/miniport/common/main.c index 6e30dfd0b7c..5f7cc83126d 100644 --- a/reactos/drivers/usb/miniport/common/main.c +++ b/reactos/drivers/usb/miniport/common/main.c @@ -401,7 +401,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = AddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchCreate; diff --git a/reactos/drivers/usb/usbhub/usbhub.c b/reactos/drivers/usb/usbhub/usbhub.c index e7aacf0deae..826162d7fee 100644 --- a/reactos/drivers/usb/usbhub/usbhub.c +++ b/reactos/drivers/usb/usbhub/usbhub.c @@ -179,7 +179,7 @@ DriverEntry( DriverObject->DriverExtension->AddDevice = UsbhubAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = UsbhubCreate; diff --git a/reactos/drivers/usb/usbstor/usbstor.c b/reactos/drivers/usb/usbstor/usbstor.c index 75ca46f9384..a49509f351b 100644 --- a/reactos/drivers/usb/usbstor/usbstor.c +++ b/reactos/drivers/usb/usbstor/usbstor.c @@ -130,7 +130,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = AddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->DriverStartIo = (PVOID)StartIo;