Changeset 95648 in vbox

Timestamp:

Jul 14, 2022 12:59:06 PM (2 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Installer: Remove the VBoxFakeWHQL tool which requires AutoIt and needs to be activated by a special CLI switch and is probably unused for a long time now, bugref:8515 [reverted]

Location:

trunk

Files:

• src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (3 diffs)
• src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (4 diffs)
• src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (4 diffs)
• src/VBox/Additions/WINNT/Installer/VBoxWHQLFake.au3 (copied) (copied from trunk/src/VBox/Additions/WINNT/Installer/VBoxWHQLFake.au3 )
• tools/darwin.amd64/bin/iasl (deleted)

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

@@ -66 +66 @@
 PACKING     += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
 OTHER_CLEAN += \
-        $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
+        $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \
+        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe
 
 ## @todo r=andy Rename DRIVER_FILES to INST_FILES or something, as those files are not strictly driver-related files.
@@ -81 +82 @@
         $(PATH_STAGE_BIN)/additions/VBoxTray.exe \
         $(PATH_STAGE_BIN)/additions/VBoxControl.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
         $(PATH_STAGE_BIN)/additions/VBoxService.exe
 ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -219 +221 @@
         $(call VBOX_SIGN_FILE_FN,$@)
 endif
+
+WHQLFAKE := $(PATH_SUB_CURRENT)/VBoxWHQLFake.au3
+
+$(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe:
+        $(call MSG_L1,Creating $@, from $<)
+        $(QUIET)$(EXEC_X86_WIN32) $(VBOX_PATH_AUTOIT3)/Aut2Exe/Aut2exe.exe \
+                /in $(WHQLFAKE) \
+                /out $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
+                /icon $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
+                /comp 4 \
+                /unicode
 
 ifdef VBOX_GA_ATTESTATION_SIGNING

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

@@ -33 +33 @@
 
 ; Defines for special functions
+!define WHQL_FAKE                   ; Enables faking of non WHQL signed / approved drivers
+                                    ; Needs the VBoxWHQLFake.exe in the additions output directory!
 !define WFP_FILE_EXCEPTION          ; Enables setting a temporary file exception for WFP proctected files
 
@@ -226 +228 @@
 ; Command line parameters - these can be set/modified
 ; on the command line
+Var g_bFakeWHQL                         ; Cmd line: Fake Windows to install non WHQL certificated drivers (only for W2K and XP currently!!) ("/unsig_drv")
 Var g_bForceInstall                     ; Cmd line: Force installation on unknown Windows OS version
 Var g_bUninstall                        ; Cmd line: Just uninstall any previous Guest Additions and exit
@@ -377 +380 @@
         StrCpy $g_iSfOrder $5
         ${Break}
+
+!ifdef WHQL_FAKE
+      ${Case} '/unsig_drv'
+        StrCpy $g_bFakeWHQL "true"
+      ${Break}
+!endif
 
       ${Case} '/uninstall'
@@ -919 +928 @@
   StrCpy $g_bIgnoreUnknownOpts "false"
   StrCpy $g_bLogEnable "false"
+  StrCpy $g_bFakeWHQL "false"
   StrCpy $g_bForceInstall "false"
   StrCpy $g_bUninstall "false"

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

@@ -207 +207 @@
 !ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
   FILE "$%PATH_OUT%\bin\additions\VBoxAudioTest.exe"
+!endif
+
+  ; WHQL fake
+!ifdef WHQL_FAKE
+  FILE "$%PATH_OUT%\bin\additions\VBoxWHQLFake.exe"
 !endif
 
@@ -282 +287 @@
 FunctionEnd
 
+!ifdef WHQL_FAKE
+
+Function W2K_WHQLFakeOn
+
+  StrCmp $g_bFakeWHQL "true" do
+  Goto exit
+
+do:
+
+  ${LogVerbose} "Turning off WHQL protection..."
+  ${CmdExecute} "$\"$INSTDIR\VBoxWHQLFake.exe$\" $\"ignore$\"" "true"
+
+exit:
+
+FunctionEnd
+
+Function W2K_WHQLFakeOff
+
+  StrCmp $g_bFakeWHQL "true" do
+  Goto exit
+
+do:
+
+  ${LogVerbose} "Turning back on WHQL protection..."
+  ${CmdExecute} "$\"$INSTDIR\VBoxWHQLFake.exe$\" $\"warn$\"" "true"
+
+exit:
+
+FunctionEnd
+
+!endif
 
 Function W2K_InstallFiles
@@ -393 +429 @@
   Call W2K_Prepare
   Call W2K_CopyFiles
+
+!ifdef WHQL_FAKE
+  Call W2K_WHQLFakeOn
+!endif
+
   Call W2K_InstallFiles
+
+!ifdef WHQL_FAKE
+  Call W2K_WHQLFakeOff
+!endif
+
   Call W2K_SetVideoResolution
 
@@ -465 +511 @@
 !endif ; $%VBOX_WITH_WDDM% == "1"
 
+  ; WHQL fake
+!ifdef WHQL_FAKE
+  Delete /REBOOTOK "$INSTDIR\VBoxWHQLFake.exe"
+!endif
+
   ; Log file
   Delete /REBOOTOK "$INSTDIR\install.log"