Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf	(revision 39621)
+++ /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf	(revision 39622)
@@ -18,19 +18,16 @@
 ClassGuid={4D36E96F-E325-11CE-BFC1-08002BE10318}
 Class=Mouse
+DriverPackageType=ClassFilter
 ;edit-DriverVer=08/26/2008,2.00.0000
 ;cat CatalogFile=VBoxMouse.cat
 
 [SourceDisksNames]
-1 = %VBoxMouse.MediaDesc%,,,
+1 = %VBoxMouse.MediaDesc%
 
 [SourceDisksFiles]
-VBoxMouse.sys = 1,,
+VBoxMouse.sys = 1
 
 [DestinationDirs]
-DefaultDestDir = 12 ; DIRID_DRIVERS
-
-[DefaultInstall]
-CopyFiles = @VBoxMouse.sys
-AddReg = VBoxMouse_AddReg
+DefaultDestDir = 12	; DIRID_DRIVERS
 
 [Manufacturer]
@@ -38,9 +35,8 @@
 ;amd64 %ORACLE%=VBoxMouse, NTamd64
 
-;x86   [VBoxMouse]
-;amd64 [VBoxMouse.NTamd64]
-%VBoxMouse.Desc% = VBoxMouse_Install, *PNP0F03
-
-[VBoxMouse_Install]
+[DefaultInstall]
+;
+; DefaultInstall section is used to install the class filter driver.
+;
 CopyFiles = @VBoxMouse.sys
 AddReg = VBoxMouse_AddReg
@@ -49,6 +45,7 @@
 HKLM, System\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}, UpperFilters, 0x00010000, "VBoxMouse", "mouclass"
 
-[VBoxMouse.Services]
+[DefaultInstall.Services]
 AddService = VBoxMouse, , VBoxMouse_Service_Inst
+
 
 [VBoxMouse_Service_Inst]
@@ -59,12 +56,9 @@
 ServiceBinary  = %12%\VBoxMouse.sys
 
-[ClassInstall32]
-; This should fix the error 0xe0000101 (The required section was not found in the INF).
 
 [Strings]
-VBoxMouse.Desc        = "VirtualBox Guest Mouse Filter"
-VBoxMouse.SvcDesc     = "VirtualBox Guest Mouse Service"
-VBoxMouse.MediaDesc   = "VirtualBox Guest Mouse Driver Installation Media"
-ORACLE                = "Oracle Corporation"
+VBoxMouse.SvcDesc       = "VirtualBox Guest Mouse Service"
+VBoxMouse.MediaDesc     = "VirtualBox Guest Mouse Driver Installation Media"
+ORACLE                  = "Oracle Corporation"
 
 ; Useful constants