Changeset 23846 in vbox

Timestamp:

Oct 19, 2009 8:51:33 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53608

Message:

Guest Additions Installer/VBoxDrvInst/VBoxMouse: Accidental commit, not needed right now.

Location:

trunk/src/VBox/Additions/WINNT/MouseFilter

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxMouse.cpp (modified) (1 diff)
• VBoxMouse.inf (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/MouseFilter/Makefile.kmk

@@ -45 +45 @@
 VBoxMouse-inf_INST = $(INST_ADDITIONS)
 VBoxMouse-inf_MODE = a+r,u+w
-VBoxMouse-inf_BLDDIRS = $(PATH_TARGET)/VBoxMouseCat.dir
+ifndef VBOX_SIGNING_MODE
+VBoxMouse-inf_SOURCES = VBoxMouse.inf
+else
+VBoxMouse-inf_SOURCES = \
+        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf \
+        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat
 VBoxMouse-inf_CLEAN += \
         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf
+VBoxMouse-inf_BLDDIRS = $(PATH_TARGET)/VBoxMouseCat.dir
 
-ifndef VBOX_SIGNING_MODE
- VBoxMouse-inf_SOURCES = $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf
-else
- VBoxMouse-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf \
-        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat
+$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf: $(PATH_SUB_CURRENT)/VBoxMouse.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
+        $(call MSG_GENERATE,VBoxMouse-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
 
- $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf $$(TARGET_VBoxMouse)
+$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf $$(TARGET_VBoxMouse)
         $(call MSG_TOOL,Inf2Cat,VBoxMouse-inf,$@,$<)
         $(INSTALL) -m 644 $(TARGET_VBoxMouse) $(@D)
@@ -64 +67 @@
 endif # signing
 
-$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf: $(PATH_SUB_CURRENT)/VBoxMouse.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
-        $(call MSG_GENERATE,VBoxMouse-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@)
-
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp

@@ -83 +83 @@
     DriverObject->DriverExtension->AddDevice = VBoxMouse_AddDevice;
 
-    dprintf(("VBoxMouse::DriverEntry: Leaving DriverEntry with success\n"));
+    dprintf(("leaving DriverEntry with success\n"));
     return STATUS_SUCCESS;
 }

trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.inf

@@ -22 +22 @@
 Class=Mouse
 ClassGuid={4D36E96F-E325-11CE-BFC1-08002BE10318}
-Provider=%SUN%
-LayoutFile=layout.inf
 ;edit-DriverVer=08/26/2008,2.00.0000
 ;cat CatalogFile=VBoxMouse.cat
 
-;x86   [SourceDisksNames]
-;amd64 [SourceDisksNames.amd64]
+[SourceDisksNames]
 1 = %VBoxMouse.MediaDesc%
 
@@ -41 +38 @@
 ;amd64 %SUN%=VBoxMouse, NTamd64
 
-;x86   [VBoxMouse]
-;amd64 [VBoxMouse.NTamd64]
-%VBoxMouse.SvcDesc% = VBoxMouse_Install, *PNP0F03      ; PS/2 device
-
-[VBoxMouse_Install]
-CopyFiles = VBoxMouse_CopyFiles
+[DefaultInstall]
+;
+; DefaultInstall section is used to install the class filter driver.
+;
+CopyFiles = @VBoxMouse.sys
 AddReg = VBoxMouse_AddReg
-AddServices = VBoxMouse_AddServices
-
-[VBoxMouse_CopyFiles]
-VBoxMouse.sys
 
 [VBoxMouse_AddReg]
 HKLM, System\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}, UpperFilters, 0x00010000, "VBoxMouse", "mouclass"
 
-[VBoxMouse_AddServices]
+[DefaultInstall.Services]
 AddService = VBoxMouse, , VBoxMouse_Service_Inst
+
 
 [VBoxMouse_Service_Inst]
@@ -66 +59 @@
 ServiceBinary  = %12%\VBoxMouse.sys
 
-[ClassInstall32]
-; This should fix the error 0xe0000101 (The required section was not found in the INF).
 
 [Strings]