Changeset 98308 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 25, 2023 11:14:24 PM (2 years ago)

Author:

vboxsync

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

155518

Message:

/Config.kmk, Additions/*.inf: Always qualify the key installer sections with the architecture. Plus some cleanups reducing naming randomness and platform dependent lines.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf (modified) (1 diff)
• WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf (modified) (1 diff)
• WINNT/Mouse/NT5/VBoxMouse.inf (modified) (1 diff)
• WINNT/SharedFolders/driver/VBoxSF.inf (modified) (1 diff)
• common/VBoxGuest/win/VBoxGuest.inf (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf

@@ -42 +42 @@
 
 [Manufacturer]
-;x86   %ORACLE%=Model, NTx86.6.0
-;amd64 %ORACLE%=Model, NTamd64.6.0
+%ORACLE%=VBoxWDDM@[email protected]
 
-;amd64 [Model.NTamd64.6.0]
-;x86   [Model.NTx86.6.0]
-%VBoxVideo.SvcDesc% = VBoxVideo, PCI\VEN_80EE&DEV_BEEF
+[VBoxWDDM@[email protected]]
+%VBoxVideo.SvcDesc% = VBoxVideo_Install, PCI\VEN_80EE&DEV_BEEF
 
-[VBoxVideo]
+[VBoxVideo_Install]
 FeatureScore = F8
 Include = msdv.inf

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf

@@ -41 +41 @@
 
 [Manufacturer]
-;x86   %ORACLE%=Model
-;amd64 %ORACLE%=Model, NTamd64, NTamd64.6.0
+;x86   %ORACLE%=VBoxVideo@COMMA-NT-ARCH@
+;amd64 %ORACLE%=VBoxVideo@COMMA-NT-ARCH@@COMMA-NT-ARCH@.6.0
 
-;x86   [Model]
-;amd64 [Model.NTamd64]
-%VBoxVideo.SvcDesc% = VBoxVideo, PCI\VEN_80EE&DEV_BEEF
+[VBoxVideo@DOT-NT-ARCH@]
+%VBoxVideo.SvcDesc% = VBoxVideo_Install, PCI\VEN_80EE&DEV_BEEF
 
-;amd64 [Model.NTamd64.6.0]
-;amd64 %VBoxVideo.SvcDesc% = VBoxVideo, PCI\VEN_80EE&DEV_BEEF
+;amd64 [VBoxVideo@DOT-NT-ARCH@.6.0]
+;amd64 %VBoxVideo.SvcDesc% = VBoxVideo_Install, PCI\VEN_80EE&DEV_BEEF
 
-[VBoxVideo]
+[VBoxVideo_Install]
 ;amd64 FeatureScore = F8
 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display

trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf

@@ -46 +46 @@
 ; Disabled install via [Manufacturer], not working. See [DefaultInstall].
 ;[Manufacturer]
-;;x86   %ORACLE%=VBoxMouse
-;;amd64 %ORACLE%=VBoxMouse, NTamd64
+;%ORACLE%=VBoxMouse@COMMA-NT-ARCH@
 ;
-;;x86   [VBoxMouse]
-;;amd64 [VBoxMouse.NTamd64]
-;%ORACLE%=VBoxMouse_Install
+;[VBoxMouse@DOT-NT-ARCH@]
+;%VBoxMouse.SvcDesc%=VBoxMouse_Install
 ;
 ;[VBoxMouse_Install]

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.inf

@@ -46 +46 @@
 
 [Manufacturer]
-;x86   %ORACLE%=VBoxSF
-;amd64 %ORACLE%=VBoxSF, NTamd64
+%ORACLE%=VBoxSF@COMMA-NT-ARCH@
 
-;x86   [VBoxSF]
-;amd64 [VBoxSF.NTamd64]
+[VBoxSF@DOT-NT-ARCH@]
 %VBoxSF.DeviceDesc%=VBoxSF_Install,PCI\VEN_80ee&DEV_cafe
 

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

@@ -57 +57 @@
 
 [Manufacturer]
-;x86   %ORACLE%=VBoxGuest
-;amd64 %ORACLE%=VBoxGuest, NTamd64
+%ORACLE%=VBoxGuest@COMMA-NT-ARCH@
 
-;x86   [VBoxGuest]
-;amd64 [VBoxGuest.NTamd64]
+[VBoxGuest@DOT-NT-ARCH@]
 %VBoxGuest.DeviceDesc%=VBoxGuest_Install,PCI\VEN_80ee&DEV_cafe