Additions

Timestamp:

Oct 18, 2024 6:53:10 PM (4 months ago)

Author:

vboxsync

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

165319

Message:

Additions/VBoxGuest.inf: Try fixing installation errors. bugref:10762

File:

trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf

-              r106321
+              r106487
 [VBoxGuest@DOT-NT-ARCH@]
+%VBoxGuest.DeviceDesc%=VBoxGuest_Install,PCI\VEN_80ee&DEV_cafe
+%VBoxGuest_DeviceDesc%=VBoxGuest,PCI\VEN_80ee&DEV_cafe
+CopyFiles = VBoxGuest_CopyFiles
+CopyFiles = VBoxTray_CopyFiles ; Separate CopyFiles directive to make InfVerif.exe happy. Bug?
+AddReg = VBoxTray_Registry
 [VBoxGuest_Install]
+CopyFiles = VBoxGuest_CopyFiles, VBoxTray_CopyFiles
+AddReg = VBoxTray_AddReg
+[VBoxGuest@[email protected]]
+AddService = VBoxGuest, 0x00000002, VBoxGuest_AddService
+DelService = VBoxTray, 0x00000004
 [VBoxGuest_CopyFiles]
 …
 VBoxTray.exe,,,0x4000           ; COPYFLG_IN_USE_TRY_RENAME
 VBoxControl.exe,,,0x4000        ; COPYFLG_IN_USE_TRY_RENAME
-[VBoxGuest_Install.Services]
-AddService = VBoxGuest, 0x00000002, VBoxGuest_AddService
-DelService = VBoxTray, 0x00000004
 [VBoxGuest_AddService]
 …
 ServiceBinary  = %12%\VBoxGuest.sys
+[VBoxTray_AddReg]
+[DefaultUninstall@[email protected]]
+DelService = VBoxGuest,0x00000200
+DelReg     = VBoxTray_Registry
+LegacyUninstall=1
+[VBoxTray_Registry]
 HKLM, SOFTWARE\Microsoft\Windows\CurrentVersion\Run, VBoxTray, 0x00020000, %%SystemRoot%%\system32\VBoxTray.exe
 …
 [Strings]
 ORACLE = "Oracle Corporation"
 VBoxGuest.DeviceDesc = "VirtualBox Guest Device"
+VBoxGuest_DeviceDesc = "VirtualBox Guest Device"
 VBoxGuest_SvcDesc = "VirtualBox Guest Driver"
 VBoxTray_SvcDesc = "VirtualBox Guest Tray"

Note: See TracChangeset for help on using the changeset viewer.