diff --git a/reactos/drivers/hid/hidusb/hidusb.c b/reactos/drivers/hid/hidusb/hidusb.c index 99bdf60acec..d750fcc5be0 100644 --- a/reactos/drivers/hid/hidusb/hidusb.c +++ b/reactos/drivers/hid/hidusb/hidusb.c @@ -421,8 +421,6 @@ HidUsb_ReadReportCompletion( IN PIRP Irp, IN PVOID Context) { - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; - PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; PHID_USB_RESET_CONTEXT ResetContext; @@ -468,12 +466,6 @@ HidUsb_ReadReportCompletion( return STATUS_CONTINUE_COMPLETION; } - // - // get device extension - // - DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; - // // allocate reset context // @@ -971,7 +963,6 @@ Hid_DispatchUrb( { PIRP Irp; KEVENT Event; - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; IO_STATUS_BLOCK IoStatus; PIO_STACK_LOCATION IoStack; @@ -986,7 +977,6 @@ Hid_DispatchUrb( // get device extension // DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // build irp @@ -1374,17 +1364,9 @@ NTSTATUS Hid_SetIdle( IN PDEVICE_OBJECT DeviceObject) { - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; - PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; NTSTATUS Status; - // - // get device extension - // - DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; - // // allocate urb // @@ -1443,7 +1425,6 @@ Hid_GetProtocol( PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; - NTSTATUS Status; UCHAR Protocol[1]; // @@ -1494,10 +1475,11 @@ Hid_GetProtocol( 1, NULL); Protocol[0] = 0xFF; + // // dispatch urb // - Status = Hid_DispatchUrb(DeviceObject, Urb); + Hid_DispatchUrb(DeviceObject, Urb); // // free urb @@ -1706,7 +1688,6 @@ HidPnp( { NTSTATUS Status; PIO_STACK_LOCATION IoStack; - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; KEVENT Event; @@ -1714,7 +1695,6 @@ HidPnp( // get device extension // DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get current stack location diff --git a/reactos/drivers/hid/mouhid/mouhid.c b/reactos/drivers/hid/mouhid/mouhid.c index a2115b2de7c..9cb6fdc6779 100644 --- a/reactos/drivers/hid/mouhid/mouhid.c +++ b/reactos/drivers/hid/mouhid/mouhid.c @@ -775,7 +775,7 @@ MouHid_StartDevice( HID_COLLECTION_INFORMATION Information; PVOID PreparsedData; HIDP_CAPS Capabilities; - ULONG ValueCapsLength; + USHORT ValueCapsLength; HIDP_VALUE_CAPS ValueCaps; PMOUHID_DEVICE_EXTENSION DeviceExtension; PUSAGE Buffer;