Changeset 109134 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

Timestamp:

May 1, 2025 8:47:02 AM (9 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168686

Message:

Windows Additions installer: Got rid of the ancient ReplaceDLL.nsh and use the official (included with NSIS) InstallLib macro from the NSIS distribution (defined in Include\Library.nsh).

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (4 diffs)

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

@@ -66 +66 @@
 !define REGISTRY_VAL_ORG_MOUSE_PATH "MousePath"
 
-; Needed for InstallLib macro: Install libraries in every case.
-!define LIBRARY_IGNORE_VERSION
-
 VIProductVersion "${PRODUCT_VERSION}"
 VIAddVersionKey "FileVersion"       "$%VBOX_VERSION_STRING%"
@@ -109 +106 @@
 !endif
 !include "winver.nsh"         ; Function for determining Windows version.
-!define REPLACEDLL_NOREGISTER ; Replace in use DLL function.
-!include "ReplaceDLL.nsh"
+
+; Needed for the InstallLib macro (defined in NSIS' Library.nsh):
+;
+; Make sure we always replace DLLs, no matter if the version is the same.
+; This also is needed for supporting downgrades.
+!define LIBRARY_IGNORE_VERSION
 
 !if $%KBUILD_TARGET_ARCH% == "amd64"
@@ -738 +739 @@
       ; Use VBoxCredProv on Vista and up.
       ${LogVerbose} "Installing VirtualBox credential provider ..."
-      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxCredProv.dll" "$g_strSystemDir\VBoxCredProv.dll" "$INSTDIR"
+      !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\VBoxCredProv.dll" "$g_strSystemDir\VBoxCredProv.dll" "$INSTDIR"
       WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\Credential Providers\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}" "" "VBoxCredProv" ; adding to (default) key
       WriteRegStr HKCR "CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}" "" "VBoxCredProv"                       ; adding to (Default) key
@@ -749 +750 @@
 !endif
       ${LogVerbose} "Installing VirtualBox GINA ..."
-      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxGINA.dll" "$g_strSystemDir\VBoxGINA.dll" "$INSTDIR"
+      !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\VBoxGINA.dll" "$g_strSystemDir\VBoxGINA.dll" "$INSTDIR"
       WriteRegStr HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL" "VBoxGINA.dll"
       ; Add Windows notification package callbacks for VBoxGINA