Author: janderwald
Date: Sat Jun 15 06:34:38 2013
New Revision: 59219
URL:
http://svn.reactos.org/svn/reactos?rev=59219&view=rev
Log:
[MOUHID]
- Fix build
[HIDUSB]
- Fix warnings
Modified:
trunk/reactos/drivers/hid/hidusb/hidusb.c
trunk/reactos/drivers/hid/mouhid/mouhid.c
Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.…
==============================================================================
--- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sat Jun 15 06:34:38 2013
@@ -421,8 +421,6 @@
IN PIRP Irp,
IN PVOID Context)
{
- PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
- PHID_DEVICE_EXTENSION DeviceExtension;
PURB Urb;
PHID_USB_RESET_CONTEXT ResetContext;
@@ -467,12 +465,6 @@
//
return STATUS_CONTINUE_COMPLETION;
}
-
- //
- // get device extension
- //
- DeviceExtension = DeviceObject->DeviceExtension;
- HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
//
// allocate reset context
@@ -971,7 +963,6 @@
{
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 @@
// get device extension
//
DeviceExtension = DeviceObject->DeviceExtension;
- HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
//
// build irp
@@ -1374,16 +1364,8 @@
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 @@
PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension;
PURB Urb;
- NTSTATUS Status;
UCHAR Protocol[1];
//
@@ -1494,10 +1475,11 @@
1,
NULL);
Protocol[0] = 0xFF;
+
//
// dispatch urb
//
- Status = Hid_DispatchUrb(DeviceObject, Urb);
+ Hid_DispatchUrb(DeviceObject, Urb);
//
// free urb
@@ -1706,7 +1688,6 @@
{
NTSTATUS Status;
PIO_STACK_LOCATION IoStack;
- PHID_USB_DEVICE_EXTENSION HidDeviceExtension;
PHID_DEVICE_EXTENSION DeviceExtension;
KEVENT Event;
@@ -1714,7 +1695,6 @@
// get device extension
//
DeviceExtension = DeviceObject->DeviceExtension;
- HidDeviceExtension = DeviceExtension->MiniDeviceExtension;
//
// get current stack location
Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.…
==============================================================================
--- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat Jun 15 06:34:38 2013
@@ -775,7 +775,7 @@
HID_COLLECTION_INFORMATION Information;
PVOID PreparsedData;
HIDP_CAPS Capabilities;
- ULONG ValueCapsLength;
+ USHORT ValueCapsLength;
HIDP_VALUE_CAPS ValueCaps;
PMOUHID_DEVICE_EXTENSION DeviceExtension;
PUSAGE Buffer;