Changeset 98626 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Feb 18, 2023 2:13:49 AM (2 years ago)

Author:

vboxsync

Message:

Add/VBoxGuest.inf,VBoxVideo.inf,Installer: Seems we need special versions of the .INF-files for windows 2000 and NT4, as these doesn't grok the comma stuff in the [Manufacturer] section. VBoxGuest works, VBoxVideo not so much on W2K.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• Makefile.kmk (modified) (3 diffs)
• mp/xpdm/VBoxVideo.inf (modified) (1 diff)
• mp/xpdm/VBoxVideoEarlyNT.inf (copied) (copied from trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf ) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

@@ -43 +43 @@
 VBoxVideo-inf_SOURCES = \
         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf
+VBoxVideo-inf_SOURCES.x86 = \
+        $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf
 VBoxVideo-inf_CLEAN = $(VBoxVideo-inf_SOURCES)
 VBoxVideo-inf_BLDDIRS = $(PATH_TARGET)/VBoxVideoCat.dir
+VBoxVideo-inf_BLDDIRS.x86 = $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir
 
 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideo.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxVideo-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+$(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideoEarlyNT.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,VBoxVideoEarlyNT-inf,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
 
@@ -56 +63 @@
         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
         $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll
-
- $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
- $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)
+ VBoxVideo-inf_SOURCES.x86 += \
+        $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.cat
+
+ $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
+ $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@)
+        $(INSTALL) -m 644 $< $(@D)
+
+ $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \
+ $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
 
@@ -69 +80 @@
         $(call MSG_TOOL,Inf2Cat,VBoxVideo-inf,$@,$<)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+
+ $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.cat: \
+                $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf \
+                $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideo.sys \
+                $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxDisp.dll
+        $(call MSG_TOOL,Inf2Cat,VBoxVideoEarlyNT-inf,$@,$<)
+        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+
 endif # signing
 

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; VirtualBox Video miniport driver
+; VirtualBox Video miniport driver, XP+ edition.
 ;
 

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; VirtualBox Video miniport driver
+; VirtualBox Video miniport driver, Windows 2000 and NT4 edition.
 ;
 
@@ -33 +33 @@
 DriverPackageType=PlugAndPlay
 ;edit-DriverVer=08/26/2008,2.00.0000
-;cat CatalogFile = VBoxVideo.cat
+;cat CatalogFile = VBoxVideoEarlyNT.cat
 
 [DestinationDirs]
@@ -40 +40 @@
 VBoxVideo.Display  = 11 ; system32
 
+; Windows 2000 and NT4 treats entries here as pure 'name=section' and will not
+; split the value on commas. Newer InfVerif.exe requires the comma stuff here.
 [Manufacturer]
-;x86   %ORACLE%=VBoxVideo@COMMA-NT-ARCH@
-;amd64 %ORACLE%=VBoxVideo@COMMA-NT-ARCH@@[email protected]
+%ORACLE%=VBoxVideo
 
-[VBoxVideo@DOT-NT-ARCH@]
+[VBoxVideo]
 %VBoxVideo.SvcDesc% = VBoxVideo_Install, PCI\VEN_80EE&DEV_BEEF
-
-;amd64 [VBoxVideo@[email protected]]
-;amd64 %VBoxVideo.SvcDesc% = VBoxVideo_Install, PCI\VEN_80EE&DEV_BEEF
 
 [VBoxVideo_Install]
@@ -60 +58 @@
 VBoxDisp.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 
-[VBoxVideo_Install.Services]
+[VBoxVideo.Services]
 AddService=VBoxVideo, 0x00000002, vboxvideo_Service_Inst, vboxvideo_EventLog_Inst