VirtualBox

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


Ignore:
Timestamp:
Oct 15, 2024 1:06:30 PM (4 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
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/HostDrivers/Support/win/VBoxSup.inf

    r106061 r106321  
    4343DriverPackageType=KernelService
    4444;cat CatalogFile=VBoxSup.cat
     45;PnpLockdown=1
    4546
    4647[DestinationDirs]
    … …  
    4849
    4950[DefaultInstall@DOT-NT-ARCH@]
     51%ORACLE%=VBoxSup@COMMA-NT-ARCH@
    5052CopyFiles=VBoxSup_CopyFiles
    5153
    … …  
    6163LegacyUninstall=1
    6264
    63 ;; This does not actually work either (see VBoxUSBMon), though it triggers in the
    64 ;; installer rather at manual installation on my test system (could be polluted & confused).
    65 ;; This may apparently also causes unloading trouble due to 'root\VBoxSup' or something related to that.
    66 ;; [Manufacturer]
    67 ;; %ORACLE%=VBoxSup@COMMA-NT-ARCH@
    68 ;;
    69 ;; ; Models section (referenced by [Manufacturer]).
    70 ;; [VBoxSup@DOT-NT-ARCH@]
    71 ;; %VBoxSup.DRVDESC%=VBoxSup_Install,root\VBoxSup
    72 ;;
    73 ;; [VBoxSup_Install@DOT-NT-ARCH@]
    74 ;; CopyFiles=VBoxSup_CopyFiles
    75 ;;
    76 ;; [VBoxSup_Install@[email protected]]
    77 ;; AddService=VBoxSup,0x00000002,VBoxSup_Service
     65[Manufacturer]
     66%ORACLE%=VBoxSup@COMMA-NT-ARCH@
     67
     68[VBoxSup@DOT-NT-ARCH@]
     69%VBoxSup.DRVDESC%=VBoxSup_Install
     70
     71[VBoxSup_Install@DOT-NT-ARCH@]
     72CopyFiles=VBoxSup_CopyFiles
     73
     74[VBoxSup_Install@[email protected]]
     75AddService=VBoxSup,0x00000002,VBoxSup_Service
    7876
    7977[SourceDisksFiles]
    … …  
    8886[VBoxSup_Service]
    8987DisplayName    = %VBoxSup.SVCDESC%
    90 ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
    91 ;StartType      = 3                  ; SERVICE_DEMAND_START
    92 StartType      = 1                  ; autostart to fix Vista problem
    93 ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
     88ServiceType    = %SERVICE_TYPE_KERNEL_DRIVER%
     89StartType      = %SERVICE_STARTTYPE_AUTO%
     90ErrorControl   = %SERVICE_ERRORCTL_NORMAL%
    9491ServiceBinary  = %12%\VBoxSup.sys
    9592
    … …  
    9996VBoxSup.DRVDESC = "VirtualBox Support Driver"
    10097VBoxSup.DSKDESC = "VirtualBox Support Driver Installation Disk"
     98
     99; Useful constants
     100SERVICE_TYPE_KERNEL_DRIVER = 1
     101SERVICE_STARTTYPE_BOOT = 0
     102SERVICE_STARTTYPE_AUTO = 1
     103SERVICE_STARTTYPE_DEMAND = 3
     104SERVICE_ERRORCTL_IGNORE = 0
     105SERVICE_ERRORCTL_NORMAL = 1
     106

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

    r106061 r106321  
    4242;edit-DriverVer=08/26/2008,2.00.0000
    4343;cat CatalogFile=VBoxUSB.cat
     44;PnpLockdown=1
    4445
    4546[SourceDisksNames]
    46 1=%Disk_Description%,,,
     471=%VBoxUSB_DiskDesc%,,,
    4748
    4849[SourceDisksFiles]
    4950VBoxUSB.sys = 1
     51
     52[DestinationDirs]
     53DefaultDestDir = 10,System32\Drivers
    5054
    5155[Manufacturer]
    … …  
    5357
    5458[VBoxUSB@DOT-NT-ARCH@]
    55 %USB\VID_80EE&PID_CAFE.DeviceDesc%=VBoxUSB.Dev, USB\VID_80EE&PID_CAFE
     59%VBoxUSB_DrvDesc%=VBoxUSBDev,USB\VID_80EE&PID_CAFE
    5660
    57 [DestinationDirs]
    58 VBoxUSB.Files.Ext = 10,System32\Drivers
     61[VBoxUSB@[email protected]s]
     62AddService=VBoxUSB,0x00000002,VBoxUSB_Service,VBoxUSB_AddReg
    5963
    60 [VBoxUSB.Dev.NT]
    61 CopyFiles=VBoxUSB.Files.Ext
     64[VBoxUSBDev@DOT-NT-ARCH@]
     65CopyFiles=VBoxUSB_CopyFiles
    6266
    63 [VBoxUSB.Dev.NT.Services]
    64 Addservice = VBoxUSB, 0x00000002, VBoxUSB.AddService
     67[DefaultUninstall@[email protected]]
     68DelService = VBoxUSB,0x00000200
     69DelReg     = VBoxUSB_Registry
    6570
    66 [VBoxUSB.AddService]
    67 DisplayName    = %VBoxUSB.SvcDesc%
    68 ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
    69 StartType      = 3                  ; SERVICE_DEMAND_START
    70 ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
     71[VBoxUSB_Service]
     72DisplayName    = %VBoxUSB_SvcDesc%
     73ServiceType    = %SERVICE_TYPE_KERNEL_DRIVER%
     74StartType      = %SERVICE_STARTTYPE_DEMAND%
     75ErrorControl   = %SERVICE_ERRORCTL_NORMAL%
    7176ServiceBinary  = %10%\System32\Drivers\VBoxUSB.sys
    72 AddReg         = VBoxUSB.AddReg
    7377LoadOrderGroup = Base
    7478
    75 [VBoxUSB.AddReg]
     79[VBoxUSB_AddReg]
     80AddReg         = VBoxUSB_Registry
     81
     82[VBoxUSB_Registry]
    7683HKR,,DevLoader,,*ntkern
    7784HKR,,NTMPDriver,,VBoxUSB.sys
    7885
    79 [VBoxUSB.Files.Ext]
     86[VBoxUSB_CopyFiles]
    8087VBoxUSB.sys
    81 
    82 ;---------------------------------------------------------------;
    8388
    8489[Strings]
    8590ORACLE="Oracle Corporation"
    86 Disk_Description="VBoxUSB Installation Disk"
    87 USB\VID_80EE&PID_CAFE.DeviceDesc="VirtualBox USB"
    88 VBoxUSB.SvcDesc="VirtualBox USB"
     91VBoxUSB_SvcDesc="VirtualBox USB Service"
     92VBoxUSB_DrvDesc="VirtualBox USB Driver"
     93VBoxUSB_DiskDesc="VBoxUSB Installation Disk"
     94
     95; Useful constants
     96SERVICE_TYPE_KERNEL_DRIVER = 1
     97SERVICE_STARTTYPE_BOOT = 0
     98SERVICE_STARTTYPE_DEMAND = 3
     99SERVICE_ERRORCTL_IGNORE = 0
     100SERVICE_ERRORCTL_NORMAL = 1
     101

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

    r106061 r106321  
    4343DriverPackageType=KernelService
    4444;cat CatalogFile=VBoxUSBMon.cat
     45;PnpLockdown=1
    4546
    4647[DestinationDirs]
    4748DefaultDestDir = 12
    4849
    49 [DefaultInstall@DOT-NT-ARCH@]
    50 CopyFiles=VBoxUSBMon_CopyFiles
     50[Manufacturer]
     51%ORACLE%=VBoxUSBMon@COMMA-NT-ARCH@
    5152
    52 [DefaultInstall@[email protected]]
     53[VBoxUSBMon@DOT-NT-ARCH@]
     54%VBoxUSBMon_DrvDesc%=VBoxUSBMonDev
     55
     56[VBoxUSBMon@[email protected]]
    5357AddService=VBoxUSBMon,0x00000002,VBoxUSBMon_Service,VBoxUSBMon_AddEventLog
    5458
    55 ;; Cannot get this to work (same works fine for VBoxDrv):
    56 ;; [Manufacturer]
    57 ;; %ORACLE%=VBoxUSBMon@COMMA-NT-ARCH@
    58 ;;
    59 ;; ; Models section (referenced by [Manufacturer]).
    60 ;; [VBoxUSBMon@DOT-NT-ARCH@]
    61 ;; %VBoxUSBMon.DRVDESC%=VBoxUSBMon_Install,root\VBoxUSBMon
    62 ;;
    63 ;; [VBoxUSBMon_Install@DOT-NT-ARCH@]
    64 ;; CopyFiles=VBoxUSBMon_CopyFiles
    65 ;;
    66 ;; [VBoxUSBMon_Install@[email protected]]
    67 ;; AddService=VBoxUSBMon,0x00000002,VBoxUSBMon_Service,VBoxUSBMon_AddEventLog
     59[VBoxUSBMonDev@DOT-NT-ARCH@]
     60CopyFiles=VBoxUSBMon_CopyFiles
    6861
    6962[SourceDisksFiles]
    … …  
    7164
    7265[SourceDisksNames]
    73 1=%VBoxUSBMon.DSKDESC%,
     661=%VBoxUSBMon_DiskDesc%,
    7467
    7568[VBoxUSBMon_CopyFiles]
    … …  
    7770
    7871[VBoxUSBMon_Service]
    79 DisplayName    = %VBoxUSBMon.SVCDESC%
    80 ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
    81 ;StartType      = 3                  ; SERVICE_DEMAND_START
    82 StartType      = 1                  ; autostart to fix Vista problem
    83 ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
     72DisplayName    = %VBoxUSBMon_SvcDesc%
     73ServiceType    = %SERVICE_TYPE_KERNEL_DRIVER%
     74StartType      = %SERVICE_STARTTYPE_AUTO%
     75ErrorControl   = %SERVICE_ERRORCTL_NORMAL%
    8476ServiceBinary  = %12%\VBoxUSBMon.sys
    8577
    … …  
    9385[Strings]
    9486ORACLE = "Oracle Corporation"
    95 VBoxUSBMon.SVCDESC = "VirtualBox USB Monitor Service"
    96 VBoxUSBMon.DRVDESC = "VirtualBox USB Monitor Driver"
    97 VBoxUSBMon.DSKDESC = "VirtualBox USB Monitor Driver Installation Disk"
     87VBoxUSBMon_SvcDesc = "VirtualBox USB Monitor Service"
     88VBoxUSBMon_DrvDesc = "VirtualBox USB Monitor Driver"
     89VBoxUSBMon_DiskDesc = "VirtualBox USB Monitor Driver Installation Disk"
    9890
     91; Useful constants
     92SERVICE_TYPE_KERNEL_DRIVER = 1
     93SERVICE_STARTTYPE_BOOT = 0
     94SERVICE_STARTTYPE_AUTO = 1
     95SERVICE_STARTTYPE_DEMAND = 3
     96SERVICE_ERRORCTL_IGNORE = 0
     97SERVICE_ERRORCTL_NORMAL = 1
     98
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette