[ros-diffs] [janderwald] 54838: [USB-BRINGUP] - Add a ReactOS hack to let the hid stack initialize - Add input.inf - HID Mouse initializes and starts, now win32k needs some work to open the mice

Author: janderwald
Date: Thu Jan  5 04:05:10 2012
New Revision: 54838

URL: http://svn.reactos.org/svn/reactos?rev=54838&view=rev
Log:
[USB-BRINGUP]
- Add a ReactOS hack to let the hid stack initialize
- Add input.inf
- HID Mouse initializes and starts, now win32k needs some work to open the mice

Added:
    branches/usb-bringup/media/inf/input.inf   (with props)
Modified:
    branches/usb-bringup/drivers/hid/hidclass/hidclass.c
    branches/usb-bringup/drivers/usb/usbhub_new/fdo.c
    branches/usb-bringup/media/inf/CMakeLists.txt
    branches/usb-bringup/media/inf/syssetup.inf.tpl

Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas…
==============================================================================
--- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Thu Jan  5 04:05:10
2012
@@ -137,12 +137,23 @@
     CommonDeviceExtension =
(PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
     if (CommonDeviceExtension->IsFDO)
     {
+#ifndef __REACTOS__
+
          //
          // only supported for PDO
          //
          Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
          IoCompleteRequest(Irp, IO_NO_INCREMENT);
          return STATUS_UNSUCCESSFUL;
+#else
+         //
+         // ReactOS PnP manager [...]
+         //
+         DPRINT1("[HIDCLASS] PnP HACK\n");
+         Irp->IoStatus.Status = STATUS_SUCCESS;
+         IoCompleteRequest(Irp, IO_NO_INCREMENT);
+         return STATUS_SUCCESS;
+#endif
     }
 
     //

Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu Jan  5 04:05:10
2012
@@ -971,7 +971,7 @@
        //
        // copy instance id
        //
-       RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, wcslen(Buffer) *
sizeof(WCHAR));
+       RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index *
sizeof(WCHAR));
        UsbChildExtension->usInstanceId.Length =
UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR);
 
        DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId);

Modified: branches/usb-bringup/media/inf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/CMakeList…
==============================================================================
--- branches/usb-bringup/media/inf/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup/media/inf/CMakeLists.txt [iso-8859-1] Thu Jan  5 04:05:10 2012
@@ -9,6 +9,7 @@
     fdc.inf
     font.inf
     hdc.inf
+    input.inf
     intl.inf
     keyboard.inf
     ks.inf

Added: branches/usb-bringup/media/inf/input.inf
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/input.inf…
==============================================================================
--- branches/usb-bringup/media/inf/input.inf (added)
+++ branches/usb-bringup/media/inf/input.inf [iso-8859-1] Thu Jan  5 04:05:10 2012
@@ -1,0 +1,73 @@
+[Version]
+Signature="$WINDOWS NT$"
+Class=HIDClass
+ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da}
+Provider=%MSFT%
+LayoutFile=layout.inf
+DriverVer=07/01/2001,5.1.2600.5512
+
+[DestinationDirs]
+DefaultDestDir = 12
+HID_Inst.CopyFilesDLL.NT = 11
+SPI_Files_DLL = 11
+
+[ClassInstall]
+Addreg=HIDClassReg
+
+[HIDClassReg]
+HKR,,,,%HID.ClassName%
+HKR,,Icon,,-24
+HKR,,NoInstallClass,,1
+
+[ClassInstall32]
+Addreg=HIDClassReg
+
+[MSMice]
+%USB\VID_045E&PID_0009.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0009
+%USB\VID_045E&PID_001E.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_001E
+%USB\VID_045E&PID_0023.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0023
+%USB\VID_045E&PID_0024.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0024
+%USB\VID_045E&PID_0025.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0025
+%USB\VID_045E&PID_0029.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0029
+%USB\VID_045E&PID_0039.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0039
+%USB\VID_045E&PID_0040.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0040
+%USB\VID_045E&PID_0047.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0047
+
+
+[Standard]
+%HID_DEVICE_SYSTEM_GAME%=HID_Raw_Inst,, HID_DEVICE_SYSTEM_GAME
+%HID_DEVICE%=HID_Raw_Inst,, HID_DEVICE
+%HID.DeviceDesc% =
HID_Inst,,GENERIC_HID_DEVICE,USB\Class_03&SubClass_01,USB\Class_03
+
+
+[HID_Inst.NT]
+Copyfiles = HID_Inst.CopyFiles.NT, HID_Inst.CopyFilesDLL.NT
+
+[HID_Inst.CopyFiles.NT]
+hidusb.sys
+hidclass.sys
+hidparse.sys
+
+[HID_INST.CopyFilesDLL.NT]
+hid.dll
+
+[HID_Inst.NT.Services]
+AddService = hidusb, 0x00000002, HID_Service_Inst
+
+[HID_Service_Inst]
+ServiceType   = 1
+StartType     = 3
+ErrorControl  = 1
+ServiceBinary = %12%\hidusb.sys
+LoadOrderGroup = Pointer Port
+
+[strings]
+MSFT                  = "ReactOS"
+HID.DeviceDesc        = "USB-HID (Human Interface Device)"
+HID.DefaultDevice     = "HID-Standardgerät"
+HID.ClassName         = "Eingabegeräte (Human Interface Devices)"
+HID.SvcDesc           = "ReactOS HID Class-Treiber"
+
+
+
+

Propchange: branches/usb-bringup/media/inf/input.inf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/usb-bringup/media/inf/syssetup.inf.tpl
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/syssetup.…
==============================================================================
Binary files - no diff available.