--- trunk/reactos/media/inf/mouse.inf 2005-09-26 11:43:14 UTC (rev 18090)
+++ trunk/reactos/media/inf/mouse.inf 2005-09-26 12:05:27 UTC (rev 18091)
@@ -25,13 +25,18 @@
[Manufacturer]
%StdMfg% = StdMfg
+%IbmMfg% = IbmMfg
%LogMfg% = LogMfg
%MSMfg% = MSMfg
[StdMfg]
%SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOUSE
%PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE
+%HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE
+[IbmMfg]
+*IBM3780.DeviceDesc = PS2_Inst,*IBM3780
+
[LogMfg]
%*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08
%*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12
@@ -97,31 +102,44 @@
HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseResolution",0x00010001,0x00000003
+;---------------------------- HID MOUSE DRIVER --------------------------
+
+[HID_Inst.NT]
+CopyFiles = HID_CopyFiles, Mouclass_CopyFiles
+
+[HID_CopyFiles]
+mouhid.sys
+
+[HID_Inst.NT.Services]
+AddService = mouhid, 0x00000002, mouhid_Service_Inst
+AddService = mouclass, , mouclass_Service_Inst
+
+[mouhid_Service_Inst]
+ServiceType = 1
+StartType = 3
+ErrorControl = 0
+ServiceBinary = %12%\mouhid.sys
+LoadOrderGroup = Pointer Port
+
;-------------------------------- STRINGS -------------------------------
[Strings]
ReactOS = "ReactOS Team"
MouseClassName = "Mice and other pointing devices"
+
StdMfg = "(Standard mice)"
+SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"
+PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"
+HID_MOUSE.DeviceDesc = "HID Mouse"
+
+IbmMfg = "IBM"
+*IBM3780.DeviceDesc = "IBM PS/2 Trackpoint"
+
LogMfg = "Logitech"
-MSMfg = "Microsoft"
+*PNP0F08.DeviceDesc = "Logitech Serial Mouse"
+*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"
+MSMfg = "Microsoft"
*PNP0F01.DeviceDesc = "Microsoft Serial Mouse"
*PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse"
-*PNP0F08.DeviceDesc = "Logitech Serial Mouse"
-*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"
*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice"
-SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"
-PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"
-
-[String.040c]
-MouseClassName = "Souris et autres dispositifs de pointage"
-StdMfg = "(Souris standard)"
-
-*PNP0F01.DeviceDesc = "Souris Microsoft sur port sÚrie"
-*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2"
-*PNP0F08.DeviceDesc = "Souris Logitech sur port sÚrie"
-*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2"
-*PNP0F13.DeviceDesc = "Souris compatible PS/2"
-SERIAL_MOUSE.DeviceDesc = "Souris standard sur port sÚrie"
-PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2"
\ No newline at end of file
--- trunk/reactos/media/inf/ports.inf 2005-09-26 11:43:14 UTC (rev 18090)
+++ trunk/reactos/media/inf/ports.inf 2005-09-26 12:05:27 UTC (rev 18091)
@@ -61,14 +61,7 @@
[Strings]
ReactOS = "ReactOS Team"
PortsClassName = "Serial and parallel ports"
-StdMfg = "(Standard ports)"
+StdMfg = "(Standard ports)"
*PNP0500.DeviceDesc = "Serial communication port"
*PNP0501.DeviceDesc = "Serial communication port"
-
-[String.040c]
-PortsClassName = "Ports (SÚrie et parallÞle)"
-StdMfg = "(Ports standard)"
-
-*PNP0500.DeviceDesc = "Port de communication sÚrie"
-*PNP0501.DeviceDesc = "Port de communication sÚrie"
\ No newline at end of file
--- trunk/reactos/media/inf/usbport.inf 2005-09-26 11:43:14 UTC (rev 18090)
+++ trunk/reactos/media/inf/usbport.inf 2005-09-26 12:05:27 UTC (rev 18091)
@@ -39,7 +39,7 @@
;------------------------------ UHCI DRIVER -----------------------------
[UHCI_Inst.NT]
-CopyFiles = UHCI_CopyFiles
+CopyFiles = UHCI_CopyFiles.NT
[UHCI_CopyFiles.NT]
usbport.sys
@@ -58,7 +58,7 @@
;------------------------------ OHCI DRIVER -----------------------------
[OHCI_Inst.NT]
-CopyFiles = OHCI_CopyFiles
+CopyFiles = OHCI_CopyFiles.NT
[OHCI_CopyFiles.NT]
usbport.sys
@@ -77,7 +77,7 @@
;------------------------------ EHCI DRIVER -----------------------------
[EHCI_Inst.NT]
-CopyFiles = EHCI_CopyFiles
+CopyFiles = EHCI_CopyFiles.NT
[EHCI_CopyFiles.NT]
usbport.sys
@@ -96,7 +96,7 @@
;---------------------------- ROOT HUB DRIVER ---------------------------
[RootHub_Inst.NT]
-CopyFiles = RootHub_CopyFiles
+CopyFiles = RootHub_CopyFiles.NT
[RootHub_CopyFiles.NT]
usbport.sys