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

Timestamp:

Mar 28, 2025 1:26:22 PM (3 weeks ago)

Author:

vboxsync

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

168216

Message:

Windows Guest Additions installer: Bugfixes for Shared Folders installation on arm64. bugref:10734

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditionsCommon.nsh (modified) (4 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

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

@@ -588 +588 @@
 
 ;;
-; Switches (back) the path + registry view to 32-bit mode (SysWOW64) on 64-bit guests.
+; Switches (back) the path + registry view to 32-bit mode (SysWOW64)
+; for 64-bit Intel + ARM guests.
 ;
 ; Input:
@@ -597 +598 @@
 !macro SetAppMode32 un
 Function ${un}SetAppMode32
-  !if $%KBUILD_TARGET_ARCH% == "amd64"
+  !if $%KBUILD_TARGET_ARCH% != "x86" ; amd64 + arm64
+    ${LogVerbose} "Setting application mode to 32-bit"
     ${EnableX64FSRedirection}
     SetRegView 32
@@ -612 +614 @@
 ; Sets the installer's application mode.
 ;
-; Because this NSIS installer is always built in 32-bit mode, we have to
-; do some tricks for the Windows paths + registry on 64-bit guests.
+; Because this NSIS installer is always built for x86 (32-bit), we have to
+; do some tricks for the Windows paths + registry on Intel + ARM 64-bit guests.
 ;
 ; Input:
@@ -622 +624 @@
 !macro SetAppMode64 un
 Function ${un}SetAppMode64
-  !if $%KBUILD_TARGET_ARCH% == "amd64"
+  !if $%KBUILD_TARGET_ARCH% != "x86" ; amd64 + arm64
+    ${LogVerbose} "Setting application mode to 64-bit"
     ${DisableX64FSRedirection}
     SetRegView 64

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

@@ -586 +586 @@
   !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP.dll" "$g_strSystemDir\VBoxMRXNP.dll" "$INSTDIR"
   AccessControl::GrantOnFile "$g_strSystemDir\VBoxMRXNP.dll" "(BU)" "GenericRead"
-  !if $%KBUILD_TARGET_ARCH% == "amd64"
-    ; Only 64-bit installer: Copy the 32-bit DLL for 32 bit applications.
+  !if $%KBUILD_TARGET_ARCH% == "amd64" ; Note: Does not exist for arm64.
+    ; Only amd64 installer: Copy the x86 DLL for 32 bit applications.
     !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP-x86.dll" "$g_strSysWow64\VBoxMRXNP.dll" "$INSTDIR"
     AccessControl::GrantOnFile "$g_strSysWow64\VBoxMRXNP.dll" "(BU)" "GenericRead"