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

Timestamp:

Nov 12, 2024 3:33:37 PM (2 months ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Got rid of RegCleanup.exe by embedding those two lines into VBoxGuestInstallHelper.exe. bugref:10799

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• InstallHelper/VBoxGuestInstallHelper.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (4 diffs)
• RegCleanup.cpp (deleted)
• RegCleanup.rc (deleted)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
• VBoxGuestAdditionsNT4.nsh (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -2231 +2231 @@
 }
 
+/** Handles 'nt4 installcleanup'. */
+static int handleNT4InstallCleanup(unsigned cArgs, wchar_t **papwszArgs)
+{
+    RT_NOREF(cArgs, papwszArgs);
+
+    OSVERSIONINFOW VerInfo = { sizeof(VerInfo), 0 };
+    GetVersionExW(&VerInfo);
+    if (   VerInfo.dwPlatformId   != VER_PLATFORM_WIN32_NT
+        || VerInfo.dwMajorVersion != 4)
+    {
+        return ErrorMsg("This command only runs on NT4.");
+    }
+
+    /*
+     * Deletes the "InvalidDisplay" key which causes the display
+     * applet to be started on every boot. For some reason this key
+     * isn't removed after setting the proper resolution and even not when
+     * doing a driver re-install.
+     */
+    RegDeleteKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\GraphicsDrivers\\InvalidDisplay");
+    RegDeleteKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\GraphicsDrivers\\NewDisplay");
+
+    return EXIT_OK;
+}
 
 /** Handles 'version' and its aliases. */
@@ -2276 +2300 @@
              "        [position [dup|no-dup]]\r\n"
              "    VBoxGuestInstallHelper registry dellistitem <root> <sub-key> <value-name> <to-remove>\r\n"
+             "NT4:\r\n"
+             "    VBoxGuestInstallHelper nt4 installcleanup\r\n"
              "\r\n"
              "Standard options:\r\n"
@@ -2308 +2334 @@
         { "netprovider",    "add",                  1,  2, handleNetProviderAdd },
         { "netprovider",    "remove",               1,  2, handleNetProviderRemove },
+        { "nt4",            "installcleanup",       0,  0, handleNT4InstallCleanup },
         { "registry",       "addlistitem",          4,  6, handleRegistryAddListItem },
         { "registry",       "dellistitem",          4,  4, handleRegistryDelListItem },

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

@@ -49 +49 @@
  TOOL_ZIP_PACK ?= zip
 endif
-
-
-#
-# RegCleanup - A NT4 post-install registry cleanup helper preventing the
-#              display config dialog from popping up on subsequent reboots.
-#
-PROGRAMS += RegCleanup
-RegCleanup_TEMPLATE     := VBoxGuestR3Exe
-if1of ($(KBUILD_TARGET_ARCH), amd64)
- RegCleanup_BLD_TRG_ARCH := x86
-endif
-RegCleanup_DEFS         := _WIN32_WINNT=0x0400
-RegCleanup_SOURCES      := \
-        RegCleanup.cpp \
-        RegCleanup.rc
-RegCleanup_VBOX_IMPORT_CHECKER.win.x86 := nt4
 
 
@@ -204 +188 @@
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES := \
         $(PATH_STAGE_BIN)/additions/VBoxService.exe \
-        $(PATH_STAGE_BIN)/additions/VBoxHook.dll \
-        $(PATH_STAGE_BIN)/additions/RegCleanup.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxHook.dll
         $(PATH_STAGE_BIN)/additions/VBoxDrvInst.exe
 
@@ -424 +407 @@
 endif # VBOX_WIN_ATTESTATION_SIGNING && VBOX_SIGNING_MODE && VBOX_SIGN_ADDITIONS
 
-
-#
+#
+
 # Repackaging scripts and files.
 #
@@ -521 +504 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-

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

@@ -242 +242 @@
 !ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
   FILE "$%PATH_OUT%\bin\additions\VBoxAudioTest.exe"
-!endif
-
-!if $%KBUILD_TARGET_ARCH% == "x86"
-  SetOutPath "$0\Tools\NT4"
-  FILE "$%PATH_OUT%\bin\additions\RegCleanup.exe"
 !endif
 

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

@@ -123 +123 @@
 
   SetOutPath "$INSTDIR"
-  FILE "$%PATH_OUT%\bin\additions\RegCleanup.exe"
-  AccessControl::SetOnFile "$INSTDIR\RegCleanup.exe" "(BU)" "GenericRead"
+  FILE "$%PATH_OUT%\bin\additions\GuestInstallHelper.exe"
+  AccessControl::SetOnFile "$INSTDIR\GuestInstallHelper.exe" "(BU)" "GenericRead"
 !ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
   FILE "$%PATH_OUT%\bin\additions\VBoxAudioTest.exe"
@@ -208 +208 @@
 
   ; This removes the flag "new display driver installed on the next bootup
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "VBoxGuestInst" '"$INSTDIR\RegCleanup.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "VBoxGuestInst" '"$INSTDIR\VBoxGuestInstallHelper.exe" nt4 installcleanup'
 
   Call NT4_SaveMouseDriverInfo