Fix Start value for mouclass driver, which was leading to not detect legacy mouse...

[reactos.git] / reactos / media / inf / mouse.inf

diff --git a/reactos/media/inf/mouse.inf b/reactos/media/inf/mouse.inf
index 6588fb9..5b67101 100644 (file)
--- a/reactos/media/inf/mouse.inf
+++ b/reactos/media/inf/mouse.inf
@@ -9,7 +9,7 @@ LayoutFile = layout.inf
 Class      = Mouse\r
 ClassGUID  = {4D36E96F-E325-11CE-BFC1-08002BE10318}\r
 Provider   = %ReactOS%\r
-DriverVer  = 10/19/1999,5.00.2157.1\r
+DriverVer  = 10/08/2005,1.01.0.0\r
 \r
 [DestinationDirs]\r
 DefaultDestDir = 12\r
@@ -20,17 +20,22 @@ 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
 \r
 [Manufacturer]\r
 %StdMfg% = StdMfg\r
-%LogMfg% = LogMsf\r
+%IbmMfg% = IbmMfg\r
+%LogMfg% = LogMfg\r
 %MSMfg%  = MSMfg\r
 \r
 [StdMfg]\r
 %SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOUSE\r
 %PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE\r
+%HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE\r
+\r
+[IbmMfg]\r
+*IBM3780.DeviceDesc = PS2_Inst,*IBM3780\r
 \r
 [LogMfg]\r
 %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08\r
@@ -48,7 +53,7 @@ mouclass.sys
 \r
 [mouclass_Service_Inst]\r
 ServiceType   = 1\r
-StartType     = 3\r
+StartType     = 1\r
 ErrorControl  = 1\r
 ServiceBinary = %12%\mouclass.sys\r
 LoadOrderGroup = Pointer Class\r
@@ -56,7 +61,7 @@ LoadOrderGroup = Pointer Class
 ;----------------------------- SERIAL DRIVER ----------------------------\r
 \r
 [Serial_Inst.NT]\r
-CopyFiles = Serial_CopyFiles, Mouclass_CopyFiles\r
+CopyFiles = Serial_CopyFiles.NT, Mouclass_CopyFiles.NT\r
 \r
 [Serial_CopyFiles.NT]\r
 sermouse.sys\r
@@ -75,19 +80,21 @@ LoadOrderGroup = Pointer Port
 ;------------------------------ PS/2 DRIVER -----------------------------\r
 \r
 [PS2_Inst.NT]\r
-CopyFiles = PS2_CopyFiles, Mouclass_CopyFiles\r
+CopyFiles = PS2_CopyFiles.NT, Mouclass_CopyFiles.NT\r
 AddReg = PS2_AddReg\r
 \r
 [PS2_CopyFiles.NT]\r
 i8042prt.sys\r
 \r
 [PS2_Inst.NT.Services]\r
-AddService = i8042prt, 0x00000002, i8042prt_Service_Inst\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 = mouclass, , mouclass_Service_Inst\r
 \r
 [i8042prt_Service_Inst]\r
 ServiceType   = 1\r
-StartType     = 1\r
+StartType     = 3\r
 ErrorControl  = 1\r
 ServiceBinary = %12%\i8042prt.sys\r
 LoadOrderGroup = Keyboard Port\r
@@ -97,31 +104,44 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","SampleRate",0x0001
 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001\r
 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseResolution",0x00010001,0x00000003\r
 \r
+;---------------------------- HID MOUSE DRIVER --------------------------\r
+\r
+[HID_Inst.NT]\r
+CopyFiles = HID_CopyFiles.NT, Mouclass_CopyFiles.NT\r
+\r
+[HID_CopyFiles]\r
+mouhid.sys\r
+\r
+[HID_Inst.NT.Services]\r
+AddService = mouhid, 0x00000002, mouhid_Service_Inst\r
+AddService = mouclass, , mouclass_Service_Inst\r
+\r
+[mouhid_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 0\r
+ServiceBinary = %12%\mouhid.sys\r
+LoadOrderGroup = Pointer Port\r
+\r
 ;-------------------------------- STRINGS -------------------------------\r
 \r
 [Strings]\r
 ReactOS = "ReactOS Team"\r
 MouseClassName = "Mice and other pointing devices"\r
+\r
 StdMfg = "(Standard mice)"\r
+SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"\r
+PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"\r
+HID_MOUSE.DeviceDesc = "HID Mouse"\r
+\r
+IbmMfg = "IBM"\r
+*IBM3780.DeviceDesc = "IBM PS/2 Trackpoint"\r
+\r
 LogMfg = "Logitech"\r
-MSMfg  = "Microsoft"\r
+*PNP0F08.DeviceDesc = "Logitech Serial Mouse"\r
+*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"\r
 \r
+MSMfg = "Microsoft"\r
 *PNP0F01.DeviceDesc = "Microsoft Serial Mouse"\r
 *PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse"\r
-*PNP0F08.DeviceDesc = "Logitech Serial Mouse"\r
-*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"\r
 *PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice"\r
-SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"\r
-PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"\r
-\r
-[String.040c]\r
-MouseClassName = "Souris et autres dispositifs de pointage"\r
-StdMfg = "(Souris standard)"\r
-\r
-*PNP0F01.DeviceDesc = "Souris Microsoft sur port série"\r
-*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2"\r
-*PNP0F08.DeviceDesc = "Souris Logitech sur port série"\r
-*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2"\r
-*PNP0F13.DeviceDesc = "Souris compatible PS/2"\r
-SERIAL_MOUSE.DeviceDesc = "Souris standard sur port série"\r
-PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2"
\ No newline at end of file