diff --git a/Drivers/README.md b/Drivers/README.md index 81e32db5..f99b3c74 100644 --- a/Drivers/README.md +++ b/Drivers/README.md @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-only # Declaration of License Compliance -These drivers are from a binary distribution of VirtualBox, version 7.1.4, provided +These drivers are from a binary distribution of VirtualBox, version 7.1.6, provided by Oracle Corporation, subject to the terms and conditions of the [GNU General Public License, version 3](https://www.gnu.org/licenses/gpl-3.0.html). diff --git a/Drivers/VBoxUSB.cat b/Drivers/VBoxUSB.cat index ef312562..195222f7 100644 Binary files a/Drivers/VBoxUSB.cat and b/Drivers/VBoxUSB.cat differ diff --git a/Drivers/VBoxUSB.inf b/Drivers/VBoxUSB.inf index a31968cc..12d0d866 100644 --- a/Drivers/VBoxUSB.inf +++ b/Drivers/VBoxUSB.inf @@ -1,4 +1,4 @@ -; $Id: VBoxUSB.inf 164827 2024-09-16 14:03:52Z bird $ +; $Id: VBoxUSB.inf 166130 2024-11-26 12:34:25Z andy $ ;; @file ; VBox host drivers - USB drivers - Win32 USB device ; @@ -39,50 +39,63 @@ Signature="$Windows NT$" Class=USB ClassGUID={36FC9E60-C465-11CF-8056-444553540000} provider=%ORACLE% -DriverVer = 10/10/2024,7.1.4.15100 ; r165100 +DriverVer = 01/21/2025,7.1.6.17084 ; r167084 CatalogFile=VBoxUSB.cat +;PnpLockdown=1 [SourceDisksNames] -1=%Disk_Description%,,, +1=%VBoxUSB_DiskDesc%,,, [SourceDisksFiles] VBoxUSB.sys = 1 +[DestinationDirs] +DefaultDestDir = 10,System32\Drivers + [Manufacturer] %ORACLE%=VBoxUSB,NTAMD64 [VBoxUSB.NTAMD64] -%USB\VID_80EE&PID_CAFE.DeviceDesc%=VBoxUSB.Dev, USB\VID_80EE&PID_CAFE - -[DestinationDirs] -VBoxUSB.Files.Ext = 10,System32\Drivers +%VBoxUSB_DrvDesc%=VBoxUSB,USB\VID_80EE&PID_CAFE +CopyFiles=VBoxUSB_CopyFiles -[VBoxUSB.Dev.NT] -CopyFiles=VBoxUSB.Files.Ext +[VBoxUSB.NTAMD64.Services] +AddService=VBoxUSB,0x00000002,VBoxUSB_Service,VBoxUSB_AddReg -[VBoxUSB.Dev.NT.Services] -Addservice = VBoxUSB, 0x00000002, VBoxUSB.AddService +[DefaultUninstall.NTAMD64.Services] +DelService = VBoxUSB,0x00000200 +DelReg = VBoxUSB_Registry +LegacyUninstall=1 -[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_AUTO = 1 +SERVICE_STARTTYPE_DEMAND = 3 +SERVICE_ERRORCTL_IGNORE = 0 +SERVICE_ERRORCTL_NORMAL = 1 + diff --git a/Drivers/VBoxUSB.sys b/Drivers/VBoxUSB.sys index ede926db..5a9df24b 100644 Binary files a/Drivers/VBoxUSB.sys and b/Drivers/VBoxUSB.sys differ diff --git a/Drivers/VBoxUSB.sys.license b/Drivers/VBoxUSB.sys.license index d8365781..ea1b0edc 100644 --- a/Drivers/VBoxUSB.sys.license +++ b/Drivers/VBoxUSB.sys.license @@ -1,3 +1,3 @@ -SPDX-FileCopyrightText: 2009-2024 Oracle Corporation +SPDX-FileCopyrightText: 2009-2025 Oracle Corporation SPDX-License-Identifier: GPL-3.0-only diff --git a/Drivers/VBoxUSBMon.sys b/Drivers/VBoxUSBMon.sys index 7cb4bf51..9c67a034 100644 Binary files a/Drivers/VBoxUSBMon.sys and b/Drivers/VBoxUSBMon.sys differ diff --git a/Drivers/VBoxUSBMon.sys.license b/Drivers/VBoxUSBMon.sys.license index d8365781..ea1b0edc 100644 --- a/Drivers/VBoxUSBMon.sys.license +++ b/Drivers/VBoxUSBMon.sys.license @@ -1,3 +1,3 @@ -SPDX-FileCopyrightText: 2009-2024 Oracle Corporation +SPDX-FileCopyrightText: 2009-2025 Oracle Corporation SPDX-License-Identifier: GPL-3.0-only