[ros-diffs] [cgutman] 55025: [USB-BRINGUP-TRUNK] - Fix build errors in kbdhid and mouhid

[cgutman at svn.reactos.org]

Author: cgutman
Date: Fri Jan 20 22:17:32 2012
New Revision: 55025

URL: http://svn.reactos.org/svn/reactos?rev=55025&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Fix build errors in kbdhid and mouhid

Modified:
    branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h

Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c?rev=55025&r1=55024&r2=55025&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Jan 20 22:17:32 2012
@@ -42,7 +42,7 @@
     IN PCHAR  NewScanCodes,
     IN ULONG  Length)
 {
-    KEYBOARD_INPUT_DATA InputData;
+    //KEYBOARD_INPUT_DATA InputData;
     ULONG Index;
 
     for(Index = 0; Index < Length; Index++)
@@ -563,7 +563,7 @@
     /* init input report*/
     DeviceExtension->ReportLength = Capabilities.InputReportByteLength;
     ASSERT(DeviceExtension->ReportLength);
-    DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength);
+    DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength);
     ASSERT(DeviceExtension->Report);
     RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength);
 

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c?rev=55025&r1=55024&r2=55025&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Fri Jan 20 22:17:32 2012
@@ -648,7 +648,7 @@
     DPRINT1("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength);
 
     /* verify capabilities */
-    if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC)
+    if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC)
     {
         /* not supported */
         ExFreePool(PreparsedData);
@@ -658,7 +658,7 @@
     /* init input report*/
     DeviceExtension->ReportLength = Capabilities.InputReportByteLength;
     ASSERT(DeviceExtension->ReportLength);
-    DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength);
+    DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength);
     ASSERT(DeviceExtension->Report);
     RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength);
 

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h?rev=55025&r1=55024&r2=55025&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] Fri Jan 20 22:17:32 2012
@@ -86,7 +86,7 @@
     //
     // input report buffer
     //
-    PUCHAR Report;
+    PCHAR Report;
 
     //
     // input report length