Changeset 106321 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB

Timestamp:

Oct 15, 2024 1:06:30 PM (5 months ago)

Author:

vboxsync

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

165131

Message:

Windows installers: Big revamp for removing all DIFxApp-related / DIFxApi-related code and build dependencies for the host and guest installers. bugref:10762

This implements an own framework (VBoxWinDrvInst and VBoxWinDrvStore) for installing Windows drivers and querying / handling the Windows driver store,
along with testcases for the Windows guest and host installers.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win

Files:

• dev/VBoxUSB.inf (modified) (2 diffs)
• mon/VBoxUSBMon.inf (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf

@@ -42 +42 @@
 ;edit-DriverVer=08/26/2008,2.00.0000
 ;cat CatalogFile=VBoxUSB.cat
+;PnpLockdown=1
 
 [SourceDisksNames]
-1=%Disk_Description%,,,
+1=%VBoxUSB_DiskDesc%,,,
 
 [SourceDisksFiles]
 VBoxUSB.sys = 1
+
+[DestinationDirs]
+DefaultDestDir = 10,System32\Drivers
 
 [Manufacturer]
@@ -53 +57 @@
 
 [VBoxUSB@DOT-NT-ARCH@]
-%USB\VID_80EE&PID_CAFE.DeviceDesc%=VBoxUSB.Dev, USB\VID_80EE&PID_CAFE
+%VBoxUSB_DrvDesc%=VBoxUSBDev,USB\VID_80EE&PID_CAFE
 
-[DestinationDirs]
-VBoxUSB.Files.Ext = 10,System32\Drivers
+[VBoxUSB@[email protected]s]
+AddService=VBoxUSB,0x00000002,VBoxUSB_Service,VBoxUSB_AddReg
 
-[VBoxUSB.Dev.NT]
-CopyFiles=VBoxUSB.Files.Ext
+[VBoxUSBDev@DOT-NT-ARCH@]
+CopyFiles=VBoxUSB_CopyFiles
 
-[VBoxUSB.Dev.NT.Services]
-Addservice = VBoxUSB, 0x00000002, VBoxUSB.AddService
+[DefaultUninstall@[email protected]]
+DelService = VBoxUSB,0x00000200
+DelReg     = VBoxUSB_Registry
 
-[VBoxUSB.AddService]
-DisplayName    = %VBoxUSB.SvcDesc%
-ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
-StartType      = 3                  ; SERVICE_DEMAND_START
-ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
+[VBoxUSB_Service]
+DisplayName    = %VBoxUSB_SvcDesc%
+ServiceType    = %SERVICE_TYPE_KERNEL_DRIVER%
+StartType      = %SERVICE_STARTTYPE_DEMAND%
+ErrorControl   = %SERVICE_ERRORCTL_NORMAL%
 ServiceBinary  = %10%\System32\Drivers\VBoxUSB.sys
-AddReg         = VBoxUSB.AddReg
 LoadOrderGroup = Base
 
-[VBoxUSB.AddReg]
+[VBoxUSB_AddReg]
+AddReg         = VBoxUSB_Registry
+
+[VBoxUSB_Registry]
 HKR,,DevLoader,,*ntkern
 HKR,,NTMPDriver,,VBoxUSB.sys
 
-[VBoxUSB.Files.Ext]
+[VBoxUSB_CopyFiles]
 VBoxUSB.sys
-
-;---------------------------------------------------------------;
 
 [Strings]
 ORACLE="Oracle Corporation"
-Disk_Description="VBoxUSB Installation Disk"
-USB\VID_80EE&PID_CAFE.DeviceDesc="VirtualBox USB"
-VBoxUSB.SvcDesc="VirtualBox USB"
+VBoxUSB_SvcDesc="VirtualBox USB Service"
+VBoxUSB_DrvDesc="VirtualBox USB Driver"
+VBoxUSB_DiskDesc="VBoxUSB Installation Disk"
+
+; Useful constants
+SERVICE_TYPE_KERNEL_DRIVER = 1
+SERVICE_STARTTYPE_BOOT = 0
+SERVICE_STARTTYPE_DEMAND = 3
+SERVICE_ERRORCTL_IGNORE = 0
+SERVICE_ERRORCTL_NORMAL = 1
+

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf

@@ -43 +43 @@
 DriverPackageType=KernelService
 ;cat CatalogFile=VBoxUSBMon.cat
+;PnpLockdown=1
 
 [DestinationDirs]
 DefaultDestDir = 12
 
-[DefaultInstall@DOT-NT-ARCH@]
-CopyFiles=VBoxUSBMon_CopyFiles
+[Manufacturer]
+%ORACLE%=VBoxUSBMon@COMMA-NT-ARCH@
 
-[DefaultInstall@[email protected]]
+[VBoxUSBMon@DOT-NT-ARCH@]
+%VBoxUSBMon_DrvDesc%=VBoxUSBMonDev
+
+[VBoxUSBMon@[email protected]]
 AddService=VBoxUSBMon,0x00000002,VBoxUSBMon_Service,VBoxUSBMon_AddEventLog
 
-;; Cannot get this to work (same works fine for VBoxDrv):
-;; [Manufacturer]
-;; %ORACLE%=VBoxUSBMon@COMMA-NT-ARCH@
-;;
-;; ; Models section (referenced by [Manufacturer]).
-;; [VBoxUSBMon@DOT-NT-ARCH@]
-;; %VBoxUSBMon.DRVDESC%=VBoxUSBMon_Install,root\VBoxUSBMon
-;;
-;; [VBoxUSBMon_Install@DOT-NT-ARCH@]
-;; CopyFiles=VBoxUSBMon_CopyFiles
-;;
-;; [VBoxUSBMon_Install@[email protected]]
-;; AddService=VBoxUSBMon,0x00000002,VBoxUSBMon_Service,VBoxUSBMon_AddEventLog
+[VBoxUSBMonDev@DOT-NT-ARCH@]
+CopyFiles=VBoxUSBMon_CopyFiles
 
 [SourceDisksFiles]
@@ -71 +64 @@
 
 [SourceDisksNames]
-1=%VBoxUSBMon.DSKDESC%,
+1=%VBoxUSBMon_DiskDesc%,
 
 [VBoxUSBMon_CopyFiles]
@@ -77 +70 @@
 
 [VBoxUSBMon_Service]
-DisplayName    = %VBoxUSBMon.SVCDESC%
-ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
-;StartType      = 3                  ; SERVICE_DEMAND_START
-StartType      = 1                  ; autostart to fix Vista problem
-ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
+DisplayName    = %VBoxUSBMon_SvcDesc%
+ServiceType    = %SERVICE_TYPE_KERNEL_DRIVER%
+StartType      = %SERVICE_STARTTYPE_AUTO%
+ErrorControl   = %SERVICE_ERRORCTL_NORMAL%
 ServiceBinary  = %12%\VBoxUSBMon.sys
 
@@ -93 +85 @@
 [Strings]
 ORACLE = "Oracle Corporation"
-VBoxUSBMon.SVCDESC = "VirtualBox USB Monitor Service"
-VBoxUSBMon.DRVDESC = "VirtualBox USB Monitor Driver"
-VBoxUSBMon.DSKDESC = "VirtualBox USB Monitor Driver Installation Disk"
+VBoxUSBMon_SvcDesc = "VirtualBox USB Monitor Service"
+VBoxUSBMon_DrvDesc = "VirtualBox USB Monitor Driver"
+VBoxUSBMon_DiskDesc = "VirtualBox USB Monitor Driver Installation Disk"
 
+; Useful constants
+SERVICE_TYPE_KERNEL_DRIVER = 1
+SERVICE_STARTTYPE_BOOT = 0
+SERVICE_STARTTYPE_AUTO = 1
+SERVICE_STARTTYPE_DEMAND = 3
+SERVICE_ERRORCTL_IGNORE = 0
+SERVICE_ERRORCTL_NORMAL = 1
+