tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Installer enhancement: prevent arm64 installer from installing on non ARM64 system 

Fix #12320, close #12331
This commit is contained in:
xomx 2022-10-14 17:51:00 +02:00 committed by Don Ho
parent a6a1442bab
commit 1be0044663
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/installer/nppSetup.nsi
View File

@ -172,7 +172,7 @@ updaterDone:
Call SetRoughEstimation ; This is rough estimation of files present in function copyCommonFiles Call SetRoughEstimation ; This is rough estimation of files present in function copyCommonFiles
InitPluginsDir ; Initializes the plug-ins dir ($PLUGINSDIR) if not already initialized. InitPluginsDir ; Initializes the plug-ins dir ($PLUGINSDIR) if not already initialized.
Call preventInstallInWin9x Call checkCompatibility ; check unsupported OSes and CPUs
; look for previously selected language ; look for previously selected language
ClearErrors ClearErrors

30
PowerEditor/installer/nsisInclude/tools.nsh
View File

@ -124,28 +124,28 @@ Function ExtraOptions
nsDialogs::Show nsDialogs::Show
FunctionEnd FunctionEnd
Function preventInstallInWin9x Function checkCompatibility
;Test if window9x
${GetWindowsVersion} $WinVer ${GetWindowsVersion} $WinVer
StrCmp $WinVer "95" 0 +3 StrCmp $WinVer "95" 0 +3
MessageBox MB_OK "Notepad++ does not support your OS. The installation will be aborted." MessageBox MB_OK|MB_ICONSTOP "Notepad++ does not support your OS. The installation will be aborted."
Abort Abort
StrCmp $WinVer "98" 0 +3 StrCmp $WinVer "98" 0 +3
MessageBox MB_OK "Notepad++ does not support your OS. The installation will be aborted." MessageBox MB_OK|MB_ICONSTOP "Notepad++ does not support your OS. The installation will be aborted."
Abort Abort
StrCmp $WinVer "ME" 0 +3 StrCmp $WinVer "ME" 0 +3
MessageBox MB_OK "Notepad++ does not support your OS. The installation will be aborted." MessageBox MB_OK|MB_ICONSTOP "Notepad++ does not support your OS. The installation will be aborted."
Abort Abort
StrCmp $WinVer "2000" 0 +3 ; Windows 2000 StrCmp $WinVer "2000" 0 +3 ; Windows 2000
MessageBox MB_OK "Notepad++ does not support your OS. The installation will be aborted." MessageBox MB_OK|MB_ICONSTOP "Notepad++ does not support your OS. The installation will be aborted."
Abort Abort
StrCmp $WinVer "XP" 0 xp_endTest ; XP StrCmp $WinVer "XP" 0 xp_endTest ; XP
MessageBox MB_YESNO "This version of Notepad++ doesn't support Windows XP. The installation will be aborted.$\nDo you want to go to Notepad++ download page for downloading the last version which supports XP (v7.9.2)?" IDYES xp_openDlPage IDNO xp_goQuit MessageBox MB_YESNO|MB_ICONSTOP "This version of Notepad++ doesn't support Windows XP. The installation will be aborted.$\n$\nDo you want to go to Notepad++ download page for downloading the last version which supports XP (v7.9.2)?" IDYES xp_openDlPage IDNO xp_goQuit
xp_openDlPage: xp_openDlPage:
ExecShell "open" "https://notepad-plus-plus.org/downloads/v7.9.2/" ExecShell "open" "https://notepad-plus-plus.org/downloads/v7.9.2/"
xp_goQuit: xp_goQuit:
@ -153,12 +153,26 @@ xp_goQuit:
xp_endTest: xp_endTest:
StrCmp $WinVer "2003" 0 ws2003_endTest ; Windows Server 2003 StrCmp $WinVer "2003" 0 ws2003_endTest ; Windows Server 2003
MessageBox MB_YESNO "This version of Notepad++ doesn't support Windows Server 2003. The installation will be aborted.$\nDo you want to go to Notepad++ download page for downloading the last version which supports this OS?" IDYES ws2003_openDlPage IDNO ws2003_goQuit MessageBox MB_YESNO|MB_ICONSTOP "This version of Notepad++ doesn't support Windows Server 2003. The installation will be aborted.$\n$\nDo you want to go to Notepad++ download page for downloading the last version which supports this OS?" IDYES ws2003_openDlPage IDNO ws2003_goQuit
ws2003_openDlPage: ws2003_openDlPage:
ExecShell "open" "https://notepad-plus-plus.org/downloads/v7.9.2/" ExecShell "open" "https://notepad-plus-plus.org/downloads/v7.9.2/"
ws2003_goQuit: ws2003_goQuit:
Abort Abort
ws2003_endTest: ws2003_endTest:
!ifdef ARCHARM64
${If} ${IsNativeARM64}
; OK
${Else}
; we cannot run ARM64 binaries on a x86/x64 CPU (the other way around is possible - x86 on ARM64 CPU)
MessageBox MB_YESNO|MB_ICONSTOP "This installer contains ARM64 version of Notepad++ incompatible with your computer processor running, so the installation will be aborted.$\n$\nDo you want to go to the Notepad++ site to download a compatible (x86/x64) installer instead?" IDYES arm64_openDlPage IDNO arm64_goQuit
arm64_openDlPage:
ExecShell "open" "https://notepad-plus-plus.org/downloads/"
arm64_goQuit:
Abort
${EndIf}
!endif
FunctionEnd FunctionEnd