diff options
| -rw-r--r-- | src/VBox/Additions/WINNT/Installer/Makefile.kmk | 15 | ||||
| -rw-r--r-- | src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi | 10 | ||||
| -rw-r--r-- | src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh | 51 | ||||
| -rw-r--r-- | src/VBox/Additions/WINNT/Installer/VBoxWHQLFake.au3 | 67 | ||||
| -rwxr-xr-x | tools/darwin.amd64/bin/iasl | bin | 0 -> 988932 bytes |
5 files changed, 1 insertions, 142 deletions
diff --git a/src/VBox/Additions/WINNT/Installer/Makefile.kmk b/src/VBox/Additions/WINNT/Installer/Makefile.kmk index c56a36f6607..fb531623987 100644 --- a/src/VBox/Additions/WINNT/Installer/Makefile.kmk +++ b/src/VBox/Additions/WINNT/Installer/Makefile.kmk @@ -65,8 +65,7 @@ RegCleanup_SOURCES = \ # 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/VBoxWHQLFake.exe + $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe ## @todo r=andy Rename DRIVER_FILES to INST_FILES or something, as those files are not strictly driver-related files. @@ -81,7 +80,6 @@ DRIVER_FILES := \ $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll \ $(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) # Also include 32-bit network provider DLLs on 64-bit guests to enable @@ -221,17 +219,6 @@ $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_A $(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 VBOX_DRIVERS_PACK_NAME := VBoxDrivers-$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)-$(KBUILD_TARGET_ARCH).cab VBOX_SIGNED_DRIVERS_ZIP_NAME := $(VBOX_DRIVERS_PACK_NAME).Signed.zip diff --git a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi index 4979e8519d3..c6df764e2d6 100644 --- a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi +++ b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi @@ -32,8 +32,6 @@ !endif ; 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 !define VENDOR_ROOT_KEY "SOFTWARE\$%VBOX_VENDOR_SHORT%" @@ -227,7 +225,6 @@ Var g_bCapWDDM ; Capability: Is the guest able to handl ; 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 Var g_bRebootOnExit ; Cmd line: Auto-Reboot on successful installation. Good for unattended installations ("/reboot") @@ -380,12 +377,6 @@ Function HandleCommandLine StrCpy $g_iSfOrder $5 ${Break} -!ifdef WHQL_FAKE - ${Case} '/unsig_drv' - StrCpy $g_bFakeWHQL "true" - ${Break} -!endif - ${Case} '/uninstall' StrCpy $g_bUninstall "true" ${Break} @@ -927,7 +918,6 @@ Function .onInit StrCpy $g_bIgnoreUnknownOpts "false" StrCpy $g_bLogEnable "false" - StrCpy $g_bFakeWHQL "false" StrCpy $g_bForceInstall "false" StrCpy $g_bUninstall "false" StrCpy $g_bRebootOnExit "false" diff --git a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh index 2b62433488e..a4a54865617 100644 --- a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh +++ b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh @@ -208,11 +208,6 @@ Function W2K_CopyFiles FILE "$%PATH_OUT%\bin\additions\VBoxAudioTest.exe" !endif - ; WHQL fake -!ifdef WHQL_FAKE - FILE "$%PATH_OUT%\bin\additions\VBoxWHQLFake.exe" -!endif - SetOutPath $g_strSystemDir ; VBoxService @@ -286,37 +281,6 @@ doneCr: 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 @@ -428,17 +392,7 @@ Function W2K_Main 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 FunctionEnd @@ -510,11 +464,6 @@ Function ${un}W2K_UninstallInstDir !endif ; $%KBUILD_TARGET_ARCH% == "amd64" !endif ; $%VBOX_WITH_WDDM% == "1" - ; WHQL fake -!ifdef WHQL_FAKE - Delete /REBOOTOK "$INSTDIR\VBoxWHQLFake.exe" -!endif - ; Log file Delete /REBOOTOK "$INSTDIR\install.log" Delete /REBOOTOK "$INSTDIR\install_ui.log" diff --git a/src/VBox/Additions/WINNT/Installer/VBoxWHQLFake.au3 b/src/VBox/Additions/WINNT/Installer/VBoxWHQLFake.au3 deleted file mode 100644 index 88f18a6d720..00000000000 --- a/src/VBox/Additions/WINNT/Installer/VBoxWHQLFake.au3 +++ /dev/null @@ -1,67 +0,0 @@ -; $Id$ -;; @file -; VBoxFakeWHQL - Turns off / on the WHQL for installing unsigned drivers. -; Currently only tested with Win2K / XP! -; - -; -; Copyright (C) 2008-2022 Oracle Corporation -; -; This file is part of VirtualBox Open Source Edition (OSE), as -; available from http://www.virtualbox.org. This file is free software; -; you can redistribute it and/or modify it under the terms of the GNU -; General Public License (GPL) as published by the Free Software -; Foundation, in version 2 as it comes in the "COPYING" file of the -; VirtualBox OSE distribution. VirtualBox OSE is distributed in the -; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -; - -; Strings for localization -; When using an OS with another language, you have to provide the correct -; strings for it. English and German is provided below. -; -; @todo Needs to be improved to handle the stuff without language strings in -; the future! - -;$sysprop_Title = "System Properties" -;$drvsig_Title = "Driver Signing Options" - -$sysprop_Title = "Systemeigenschaften" -$drvsig_Title = "Treibersignaturoptionen" - -$ok_Title = "OK" - -If $CmdLine[0] < 1 Then - MsgBox ( 0, "ERROR", "Please specify 'ignore', 'warn' or 'block' as parameter!" ) - Exit -EndIf - -Run("control.exe sysdm.cpl") -If WinWait($sysprop_Title, "", 5) = 0 Then - WinClose("[ACTIVE]", "") - Exit -EndIf - -ControlCommand($sysprop_Title, "", "SysTabControl321", "TabRight", "") -ControlCommand($sysprop_Title, "", "SysTabControl321", "TabRight", "") - -Sleep(200) ; Wait a while for tab switching above -ControlClick($sysprop_Title, "", 14007) ; Button 'Driver Signing' - -WinWait($drvsig_Title, "", 5) - -If $CmdLine[1] = "ignore" Then - ControlClick($drvsig_Title, "", 1000) ; 'Ignore' radio button -ElseIf $CmdLine[1] = "warn" Then - ControlClick($drvsig_Title, "", 1001) ; 'Warn' radio button -ElseIf $CmdLine[1] = "block" Then - ControlClick($drvsig_Title, "", 1002) ; 'Block' radio button -Else - Exit -EndIf - -ControlClick($drvsig_Title, "", 1) ; 'OK' button (ID=1) of dialog 'Driver Signing Options' - -WinWait($sysprop_Title, "", 5) -ControlClick($sysprop_Title, "", 1) ; 'OK' button (ID=1) of 'System Properties' - diff --git a/tools/darwin.amd64/bin/iasl b/tools/darwin.amd64/bin/iasl Binary files differnew file mode 100755 index 00000000000..f6b334c3ab6 --- /dev/null +++ b/tools/darwin.amd64/bin/iasl |