Add kbdclass and mouclass as upper filter for keyboard and mouse devices.

Install i8042prt driver, even if it is not plug&play compliant at the moment

svn path=/trunk/; revision=21759

diff --git a/reactos/media/inf/keyboard.inf b/reactos/media/inf/keyboard.inf
index 55f2c65..ce57bf0 100644 (file)
--- a/reactos/media/inf/keyboard.inf
+++ b/reactos/media/inf/keyboard.inf
@@ -9,7 +9,7 @@ LayoutFile = layout.inf
 Class      = Keyboard\r
 ClassGUID  = {4D36E96B-E325-11CE-BFC1-08002BE10318}\r
 Provider   = %ReactOS%\r
-DriverVer  = 10/08/2005,1.01.0.0\r
+DriverVer  = 04/30/2005,1.02\r
 \r
 [ClassInstall32.NT]\r
 AddReg = KeyboardClass.NT.AddReg\r
@@ -17,8 +17,9 @@ AddReg = KeyboardClass.NT.AddReg
 [KeyboardClass.NT.AddReg]\r
 HKR, , ,               0, %KeyboardClassName%\r
 HKR, , Icon,           0, "-2"\r
-;HKR, , Installer32,    0, "syssetup.dll,KeyboardClassInstaller"\r
+HKR, , Installer32,    0, "syssetup.dll,KeyboardClassInstaller"\r
 HKR, , NoInstallClass, 0, 1\r
+HKR, , UpperFilters,   0x00010000, "kbdclass"\r
 \r
 [Manufacturer]\r
 %StdMfg% = StdMfg\r
@@ -36,9 +37,7 @@ AddReg = PS2_AddReg
 i8042prt.sys\r
 \r
 [PS2_Inst.NT.Services]\r
-;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible\r
-;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst\r
-AddService = , 0x00000002\r
+AddService = i8042prt, 0x00000002, i8042prt_Service_Inst\r
 AddService = kbdclass, , kbdclass_Service_Inst\r
 \r
 [i8042prt_Service_Inst]\r
@@ -51,7 +50,7 @@ LoadOrderGroup = Keyboard Port
 ;---------------------------- KBDCLASS DRIVER ---------------------------\r
 \r
 [kbdclass_CopyFiles.NT]\r
-mouclass.sys\r
+kbdclass.sys\r
 \r
 [kbdclass_Service_Inst]\r
 ServiceType   = 1\r

diff --git a/reactos/media/inf/msmouse.inf b/reactos/media/inf/msmouse.inf
index 5da5f9f..7a82fcd 100644 (file)
--- a/reactos/media/inf/msmouse.inf
+++ b/reactos/media/inf/msmouse.inf
@@ -9,7 +9,7 @@ LayoutFile = layout.inf
 Class      = Mouse\r
 ClassGUID  = {4D36E96F-E325-11CE-BFC1-08002BE10318}\r
 Provider   = %ReactOS%\r
-DriverVer  = 10/08/2005,1.01.0.0\r
+DriverVer  = 04/30/2005,1.02\r
 \r
 [DestinationDirs]\r
 DefaultDestDir = 12\r
@@ -20,8 +20,9 @@ AddReg = MouseClass.NT.AddReg
 [MouseClass.NT.AddReg]\r
 HKR, , ,               0, %MouseClassName%\r
 HKR, , Icon,           0, "-2"\r
-;HKR, , Installer32,    0, "syssetup.dll,MouseClassInstaller"\r
+HKR, , Installer32,    0, "syssetup.dll,MouseClassInstaller"\r
 HKR, , NoInstallClass, 0, 1\r
+HKR, , UpperFilters,   0x00010000, "mouclass"\r
 \r
 [Manufacturer]\r
 %StdMfg% = StdMfg\r
@@ -36,7 +37,7 @@ HKR, , NoInstallClass, 0, 1
 %*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13\r
 \r
 [IbmMfg]\r
-*IBM3780.DeviceDesc = PS2_Inst,*IBM3780\r
+%*IBM3780.DeviceDesc% = PS2_Inst,*IBM3780\r
 \r
 [LogMfg]\r
 %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08\r
@@ -87,9 +88,7 @@ AddReg = PS2_AddReg
 i8042prt.sys\r
 \r
 [PS2_Inst.Services]\r
-;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible\r
-;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst\r
-AddService = , 0x00000002\r
+AddService = i8042prt, 0x00000002, i8042prt_Service_Inst\r
 AddService = mouclass, , mouclass_Service_Inst\r
 \r
 [i8042prt_Service_Inst]\r