From 35374853610018bcccd472e07c14009a8030f71b Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 21 Jan 2012 01:29:33 +0000
Subject: [PATCH] [USB-BRINGUP-TRUNK] - Fix input.inf and include it in
 reactos.cab

svn path=/branches/usb-bringup-trunk/; revision=55037
---
 boot/bootdata/packages/reactos.dff |  1 +
 media/inf/input.inf                | 58 ++++++++++++++----------------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/boot/bootdata/packages/reactos.dff b/boot/bootdata/packages/reactos.dff
index f3f8000d164..80a8dd021fe 100644
--- a/boot/bootdata/packages/reactos.dff
+++ b/boot/bootdata/packages/reactos.dff
@@ -666,6 +666,7 @@ media\inf\font.inf                                  6
 media\inf\fdc.inf                                   6
 media\inf\hal.inf                                   6
 media\inf\hdc.inf                                   6
+media\inf\input.inf                                 6
 media\inf\intl.inf                                  6
 media\inf\layout.inf                                6
 media\inf\machine.inf                               6
diff --git a/media/inf/input.inf b/media/inf/input.inf
index 810eafc1655..95d84217e96 100644
--- a/media/inf/input.inf
+++ b/media/inf/input.inf
@@ -2,43 +2,41 @@
 Signature="$WINDOWS NT$"
 Class=HIDClass
 ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da}
-Provider=%MSFT%
+Provider=%ReactOS%
 LayoutFile=layout.inf
-DriverVer=07/01/2001,5.1.2600.5512
+DriverVer=01/20/2012,1.00
 
 [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]
+[ClassInstall32.NT]
 Addreg=HIDClassReg
 
+[Manufacturer]
+%StdMfg% = StdMfg
+%MSMice% = MSMice
+
 [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
+%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
 
+[StdMfg]
+%HID.DeviceDesc% = HID_Inst,GENERIC_HID_DEVICE
+%HID.DeviceDesc% = HID_Inst,USB\Class_03&SubClass_01
+%HID.DeviceDesc% = HID_Inst,USB\Class_03
 
 [HID_Inst.NT]
 Copyfiles = HID_Inst.CopyFiles.NT, HID_Inst.CopyFilesDLL.NT
@@ -59,15 +57,13 @@ ServiceType   = 1
 StartType     = 3
 ErrorControl  = 1
 ServiceBinary = %12%\hidusb.sys
-LoadOrderGroup = extended base
-
-[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"
-
+LoadOrderGroup = Extended Base
 
+[Strings]
+ReactOS               = "ReactOS Team"
+HID.ClassName         = "Human Interface Devices"
+HID.DeviceDesc        = "USB Human Interface Device"
 
+StdMfg                = "(Standard Human Interface Devices)"
+MSMice                = "Microsoft"