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

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

Files:

• Makefile.kmk (modified) (3 diffs)
• WINNT/Graphics/Video/Makefile.kmk (modified) (3 diffs)
• WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf (modified) (1 diff)
• WINNT/Graphics/Video/mp/xpdm/VBoxVideoEarlyNT.inf (copied) (copied from trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf ) (4 diffs)
• WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• WINNT/Installer/VBoxGuestAdditions.nsi (modified) (3 diffs)
• WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (3 diffs)
• WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (7 diffs)
• common/VBoxGuest/win/VBoxGuest.inf (modified) (1 diff)
• common/VBoxGuest/win/VBoxGuestEarlyNT.inf (copied) (copied from trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf ) (3 diffs)

trunk/src/VBox/Additions/Makefile.kmk

@@ -109 +109 @@
  VBoxGuest-inf_SOURCES = \
         $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf
+ VBoxGuest-inf_SOURCES.x86 = \
+        $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuestEarlyNT.inf
  VBoxGuest-inf_CLEAN = $(VBoxGuest-inf_SOURCES)
+ VBoxGuest-inf_CLEAN.x86 = $(VBoxGuest-inf_SOURCES.x86)
  VBoxGuest-inf_BLDDIRS = $(PATH_TARGET)/VBoxGuestCat.dir
+ VBoxGuest-inf_BLDDIRS.x86 = $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir
 
  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf: $(PATH_SUB_CURRENT)/common/VBoxGuest/win/VBoxGuest.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxGuest-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+ $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuestEarlyNT.inf: $(PATH_SUB_CURRENT)/common/VBoxGuest/win/VBoxGuestEarlyNT.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,VBoxGuestEarlyNT-inf,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
 
@@ -123 +131 @@
         $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
         $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
-
-  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys: $$(VBoxGuest_1_TARGET) | $$(dir $$@)
+  VBoxGuest-inf_SOURCES.x86 += \
+        $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuestEarlyNT.cat
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
+  $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuest.sys: $$(VBoxGuest_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
 
-  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe: $$(VBoxControl_1_TARGET) | $$(dir $$@)
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
+  $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxControl.exe: $$(VBoxControl_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 755 $< $(@D)
 
-  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe: $$(VBoxTray_1_TARGET) | $$(dir $$@)
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
+  $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxTray.exe: $$(VBoxTray_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 755 $< $(@D)
 
@@ -139 +152 @@
                 $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
         $(call MSG_TOOL,Inf2Cat,VBoxGuest-inf,$@,$<)
+        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+
+  $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuestEarlyNT.cat: \
+                $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuestEarlyNT.inf \
+                $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxGuest.sys \
+                $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxControl.exe \
+                $(PATH_TARGET)/VBoxGuestEarlyNTCat.dir/VBoxTray.exe
+        $(call MSG_TOOL,Inf2Cat,VBoxGuestEarlyNT-inf,$@,$<)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
  endif # signing

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
 

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -177 +177 @@
 endif
 
+ifeq ($(KBUILD_TARGET_ARCH),x86)
+ VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxGuestEarlyNT.inf \
+        $(PATH_STAGE_BIN)/additions/VBoxVideoEarlyNT.inf
+endif
+
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
@@ -185 +191 @@
         $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
         $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxGuestEarlyNT.cat \
+        $(PATH_STAGE_BIN)/additions/VBoxVideoEarlyNT.cat
+ endif
 endif
 

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -237 +237 @@
 Var g_bCapXPDM                          ; Capability: Is the guest able to handle/use our XPDM driver?
 Var g_bCapWDDM                          ; Capability: Is the guest able to handle/use our WDDM driver?
+Var g_strEarlyNTDrvInfix                ; Empty or 'EarlyNT'.  For Picking VBoxGuestEarlyNT.inf and VBoxVideoEarlyNT.inf on w2k & nt4.
+
 
 ; Command line parameters - these can be set/modified
@@ -1039 +1041 @@
   Pop $g_strWinVersion
 
+  ; Init global variables that depends on the windows version.
+  ${If} $g_strWinVersion == "2000"
+    StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
+  ${ElseIf} $g_strWinVersion == "NT4"
+    StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
+  ${Else}
+    StrCpy $g_strEarlyNTDrvInfix ""
+  ${EndIf}
+
   ; Retrieve capabilities
   Call CheckForCapabilities
@@ -1186 +1197 @@
   Pop $g_strWinVersion
 
+  ; Init global variables that depends on the windows version.
+  ${If} $g_strWinVersion == "2000"
+    StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
+  ${ElseIf} $g_strWinVersion == "NT4"
+    StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
+  ${Else}
+    StrCpy $g_strEarlyNTDrvInfix ""
+  ${EndIf}
+
   ; Retrieve capabilities
   Call un.CheckForCapabilities

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -60 +60 @@
 
   FILE "$%PATH_OUT%\bin\additions\VBoxVideo.inf"
+!if $%KBUILD_TARGET_ARCH% == "x86"
+  ${If} $g_strEarlyNTDrvInfix != ""
+    FILE "$%PATH_OUT%\bin\additions\VBoxVideoEarlyNT.inf"
+  !ifdef VBOX_SIGN_ADDITIONS
+    FILE "$%PATH_OUT%\bin\additions\VBoxVideoEarlyNT.cat"
+  !endif
+  ${EndIf}
+!endif
 !ifdef VBOX_SIGN_ADDITIONS
   ${If} $g_strWinVersion == "10"
@@ -92 +100 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxVideo.sys"
   FILE "$%PATH_OUT%\bin\additions\VBoxVideo.inf"
+!if $%KBUILD_TARGET_ARCH% == "x86"
+  ${If} $g_strEarlyNTDrvInfix != ""
+    FILE "$%PATH_OUT%\bin\additions\VBoxVideoEarlyNT.inf"
+  !ifdef VBOX_SIGN_ADDITIONS
+    FILE "$%PATH_OUT%\bin\additions\VBoxVideoEarlyNT.cat"
+  !endif
+  ${EndIf}
+!endif
 !ifdef VBOX_SIGN_ADDITIONS
   ${If} $g_strWinVersion == "10"
@@ -159 +175 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxGuest.sys"
   FILE "$%PATH_OUT%\bin\additions\VBoxGuest.inf"
+!if $%KBUILD_TARGET_ARCH% == "x86"
+  ${If} $g_strEarlyNTDrvInfix != ""
+    FILE "$%PATH_OUT%\bin\additions\VBoxGuestEarlyNT.inf"
+  !ifdef VBOX_SIGN_ADDITIONS
+    FILE "$%PATH_OUT%\bin\additions\VBoxGuestEarlyNT.cat"
+  !endif
+  ${EndIf}
+!endif
 !ifdef VBOX_SIGN_ADDITIONS
   ${If} $g_strWinVersion == "10"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -380 +380 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxGuest.sys"
   FILE "$%PATH_OUT%\bin\additions\VBoxGuest.inf"
+!if $%KBUILD_TARGET_ARCH% == "x86"
+  ${If} $g_strEarlyNTDrvInfix != ""
+    FILE "$%PATH_OUT%\bin\additions\VBoxGuestEarlyNT.inf"
+  !ifdef VBOX_SIGN_ADDITIONS
+    FILE "$%PATH_OUT%\bin\additions\VBoxGuestEarlyNT.cat"
+  !endif
+  ${EndIf}
+!endif
 !ifdef VBOX_SIGN_ADDITIONS
   ${If} $g_strWinVersion == "10"
@@ -506 +514 @@
   ${If} $g_bNoGuestDrv == "false"
     ${LogVerbose} "Installing guest driver ..."
-    ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxGuest.inf$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
+    ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxGuest$g_strEarlyNTDrvInfix.inf$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
   ${Else}
     ${LogVerbose} "Guest driver installation skipped!"
@@ -517 +525 @@
     ${Else}
       ${LogVerbose} "Installing video driver ..."
-      ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideo.inf$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
+      ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideo$g_strEarlyNTDrvInfix.inf$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
     ${EndIf}
   ${Else}
@@ -594 +602 @@
   Delete /REBOOTOK "$INSTDIR\VBoxVideo.inf"
   Delete /REBOOTOK "$INSTDIR\VBoxVideo.cat"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoEarlyNT.inf"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoEarlyNT.cat"
   Delete /REBOOTOK "$INSTDIR\VBoxDisp.dll"
 
@@ -605 +615 @@
   Delete /REBOOTOK "$INSTDIR\VBoxGuest.inf"
   Delete /REBOOTOK "$INSTDIR\VBoxGuest.cat"
+  Delete /REBOOTOK "$INSTDIR\VBoxGuestEarlyNT.inf"
+  Delete /REBOOTOK "$INSTDIR\VBoxGuestEarlyNT.cat"
 
   Delete /REBOOTOK "$INSTDIR\VBCoInst.dll" ; Deprecated, does not get installed anymore
@@ -678 +690 @@
   ; Remove VirtualBox video driver
   ${LogVerbose} "Uninstalling video driver ..."
-  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideo.inf$\"" 'non-zero-exitcode=log'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideo$g_strEarlyNTDrvInfix.inf$\"" 'non-zero-exitcode=log'
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideo" 'non-zero-exitcode=log'
   Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
@@ -764 +776 @@
   ; Remove guest driver
   ${LogVerbose} "Removing guest driver ..."
-  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxGuest.inf$\"" 'non-zero-exitcode=log'
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxGuest$g_strEarlyNTDrvInfix.inf$\"" 'non-zero-exitcode=log'
 
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxGuest" 'non-zero-exitcode=log'

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; INF file for installing the VirtualBox Windows guest driver.
+; INF file for installing the VirtualBox Windows guest driver, XP and later.
 ;
 

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; INF file for installing the VirtualBox Windows guest driver.
+; INF file for installing the VirtualBox Windows guest driver, pre-XP variant.
 ;
 
@@ -42 +42 @@
 DriverPackageType=PlugAndPlay
 ;edit-DriverVer=08/26/2008,2.00.0000
-;cat CatalogFile=VBoxGuest.cat
+;cat CatalogFile=VBoxGuestEarlyNT.cat
 
 [SourceDisksNames]
@@ -56 +56 @@
 VBoxTray_CopyFiles = 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]
-%ORACLE%=VBoxGuest@COMMA-NT-ARCH@
+%ORACLE%=VBoxGuest
 
-[VBoxGuest@DOT-NT-ARCH@]
+[VBoxGuest]
 %VBoxGuest.DeviceDesc%=VBoxGuest_Install,PCI\VEN_80ee&DEV_cafe