Skip to content

Commit

Permalink
installer: Refine the WoW64 decision logic
Browse files Browse the repository at this point in the history
The registry and file reflection is also present on ARM64 platform.
Therefore, the reflection logic should resemble `${RunningX64} ||
${RunningArm64}` or `${IsWow64}` or `!${RunningX86}` for short.

Signed-off-by: Simon Rozman <[email protected]>
  • Loading branch information
rozmansi committed Nov 9, 2019
1 parent 01fbfb9 commit f1cf3f0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions installer/tap-windows6.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ ${EndIf}
!insertmacro MULTIUSER_INIT
SetShellVarContext all

${If} ${RunningX64}
${If} ${IsWow64}
SetRegView 64
StrCpy $INSTDIR "$PROGRAMFILES64\${PRODUCT_NAME}"
${Else}
Expand Down Expand Up @@ -315,7 +315,7 @@ Function un.onInit
ClearErrors
!insertmacro MULTIUSER_UNINIT
SetShellVarContext all
${If} ${RunningX64}
${If} ${IsWow64}
SetRegView 64
${EndIf}
FunctionEnd
Expand Down

0 comments on commit f1cf3f0

Please sign in to comment.