Changeset 106847 in vbox for trunk/src/VBox

Timestamp:

Nov 6, 2024 3:07:27 AM (3 months ago)

Author:

vboxsync

Message:

Add/Nt/Installer: Use x64.nsh for determing the native host platform more accurately than our CheckArchitecture (removed). jiraref:VBP-1253

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (1 diff)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)

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

@@ -1068 +1068 @@
 
   ; Check for correct architecture
-  Call CheckArchitecture
-  Pop $0
-  ${If} $0 <> 0 ; Wrong architecture? Tell the world
   !if $%KBUILD_TARGET_ARCH% == "amd64"
-    MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_AMD64) /SD IDOK
+    ${IfNot} ${IsNativeAMD64}
+      MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_AMD64) /SD IDOK
+      Abort "$(VBOX_NOTICE_ARCH_AMD64)"
+    ${EndIf}
   !else if $%KBUILD_TARGET_ARCH% == "arm64"
-    MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_ARM64) /SD IDOK
+    ${IfNot} ${IsNativeARM64}
+      MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_ARM64) /SD IDOK
+      Abort "$(VBOX_NOTICE_ARCH_ARM64)"
+    ${EndIf}
   !else
-    MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_X86) /SD IDOK
+    ${IfNot} ${IsNativeIA32}
+      MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_X86) /SD IDOK
+      Abort "$(VBOX_NOTICE_ARCH_X86)"
+    ${EndIf}
   !endif
-    Abort "$(VBOX_NOTICE_ARCH_AMD64)"
-  ${EndIf}
 
   ; Has the user who calls us admin rights?

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

@@ -251 +251 @@
 FunctionEnd
 !endif ; UNINSTALLER_ONLY
-
-;;
-; Checks that the installer target architecture matches the host,
-; i.e. that we're not trying to install 32-bit binaries on a 64-bit
-; host from WOW64 mode.
-;
-!macro CheckArchitecture un
-Function ${un}CheckArchitecture
-
-  Push $0   ;; @todo r=bird: Why ??
-
-  System::Call "kernel32::GetCurrentProcess() i .s"
-  System::Call "kernel32::IsWow64Process(i s, *i .r0)"
-  ; R0 now contains 1 if we're a 64-bit process, or 0 if not
-
-!if $%KBUILD_TARGET_ARCH% == "amd64"
-  IntCmp $0 0 wrong_platform
-!else ; 32-bit
-  IntCmp $0 1 wrong_platform
-!endif
-
-  Push 0
-  Goto exit
-
-wrong_platform:
-
-  Push 1
-  Goto exit
-
-exit:
-
-FunctionEnd
-!macroend
-!ifndef UNINSTALLER_ONLY
-  !insertmacro CheckArchitecture ""
-  !insertmacro CheckArchitecture "un."
-!endif
 
 ;