Installer: Support 64-bit installation on Windows 10 1809+ (was 2004+)

tnodir · May 11, 2024 · 359e049 · 359e049
1 parent dce646d
commit 359e049
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 13 deletions.
diff --git a/deploy/FortFirewall.iss b/deploy/FortFirewall.iss
@@ -194,7 +194,7 @@ var
   Version: TWindowsVersion;
 begin
   GetWindowsVersionEx(Version);
-  Result := (Version.Major > 10) or ((Version.Major = 10) and (Version.Build > 19040));
+  Result := (Version.Major > 10) or ((Version.Major = 10) and (Version.Build >= 17763));
 end;
 
 function IsWindows7(): Boolean;

diff --git a/deploy/deployment.json b/deploy/deployment.json
@@ -25,6 +25,11 @@
 			"sys": [
 				"${BUILD}-driver-${CONFIG}/x64/fortfw.sys"
 			]
+		},
+		"${TARGET}/driver/x86_64_old | win10": {
+			"sys": [
+				"${BUILD}-driver-win7/x64/fortfw.sys"
+			]
 		}
 	}
 }
diff --git a/deploy/languages/custom/BrazilianPortuguese.isl b/deploy/languages/custom/BrazilianPortuguese.isl
@@ -13,7 +13,7 @@ UninstallPassword=Uninstall Password
 UninstallPasswordOK=OK
 UninstallPasswordCancel=Cancel
 WrongPassword=Wrong password
-NotCompatibleWithWindows=This program is not compatible with Windows version (Windows 10 2004 or newer required).
+NotCompatibleWithWindows=This program is not compatible with Windows version (Windows 10 1809 or newer required).
 NotCompatibleWithWindows7=This program is not compatible with Windows 7 version (KB4474419 required).
 NotCompatibleWithHVCI=This program is not compatible with HVCI (Core Isolation).
 InstallVCRedist=Install the latest Visual C++ redistributable!

diff --git a/deploy/languages/custom/ChineseSimplified.isl b/deploy/languages/custom/ChineseSimplified.isl
@@ -13,7 +13,7 @@ UninstallPassword=
 UninstallPasswordOK=确定
 UninstallPasswordCancel=取消
 WrongPassword=密码错误
-NotCompatibleWithWindows=此程序与 Windows 版本不兼容 (Windows 10 2004 或需要更新)。
+NotCompatibleWithWindows=此程序与 Windows 版本不兼容 (Windows 10 1809 或需要更新)。
 NotCompatibleWithWindows7=此程序与 Windows 版本不兼容 (Windows 7 或需要 KB4474419 更新)。
 NotCompatibleWithHVCI=这个程序与HVCI（核心隔离）不兼容。
 InstallVCRedist=安装最新的 Visual C++ 可再分发版本！

diff --git a/deploy/languages/custom/Default.isl b/deploy/languages/custom/Default.isl
@@ -13,7 +13,7 @@ UninstallPassword=Uninstall Password
 UninstallPasswordOK=OK
 UninstallPasswordCancel=Cancel
 WrongPassword=Wrong password
-NotCompatibleWithWindows=This program is not compatible with Windows version (Windows 10 2004 or newer required).
+NotCompatibleWithWindows=This program is not compatible with Windows version (Windows 10 1809 or newer required).
 NotCompatibleWithWindows7=This program is not compatible with Windows 7 version (KB4474419 required).
 NotCompatibleWithHVCI=This program is not compatible with HVCI (Core Isolation).
 InstallVCRedist=Install the latest Visual C++ redistributable!

diff --git a/deploy/languages/custom/French.isl b/deploy/languages/custom/French.isl
@@ -13,7 +13,7 @@ UninstallPassword=D
 UninstallPasswordOK=OK
 UninstallPasswordCancel=Annuler
 WrongPassword=Mot de passe incorrect
-NotCompatibleWithWindows=Ce programme est incompatible avec la version Windows (Windows 10 2004 ou plus récent requis).
+NotCompatibleWithWindows=Ce programme est incompatible avec la version Windows (Windows 10 1809 ou plus récent requis).
 NotCompatibleWithWindows7=Ce programme n'est pas compatible avec la version de Windows 7 (KB4474419 requis).
 NotCompatibleWithHVCI=Ce programme est incompatible avec HVCI (Core Isolation).
 InstallVCRedist=Installez le dernier redistribuable Visual C++ !

diff --git a/deploy/languages/custom/German.isl b/deploy/languages/custom/German.isl
@@ -13,7 +13,7 @@ UninstallPassword=Passwort deinstallieren
 UninstallPasswordOK=OK
 UninstallPasswordCancel=Abbrechen
 WrongPassword=Falsches Passwort
-NotCompatibleWithWindows=Das Programm ist nicht kompatibel zu dieser Version von Windows (Windows 10 2004 oder neuer erforderlich).
+NotCompatibleWithWindows=Das Programm ist nicht kompatibel zu dieser Version von Windows (Windows 10 1809 oder neuer erforderlich).
 NotCompatibleWithWindows7=Das Programm ist nicht kompatibel zu dieser Version von Windows 7 (KB4474419 erforderlich).
 NotCompatibleWithHVCI=Dieses Programm ist nicht kompatibel mit HVCI (Kernisolierung).
 InstallVCRedist=Installieren Sie die neueste Visual C++ Runtime!

diff --git a/deploy/languages/custom/Italian.isl b/deploy/languages/custom/Italian.isl
@@ -13,7 +13,7 @@ UninstallPassword=Password disinstallazione
 UninstallPasswordOK=Ok
 UninstallPasswordCancel=Annulla
 WrongPassword=Password errata
-NotCompatibleWithWindows=Questo programma non è compatibile con la versione di Windows (è richiesto Windows 10 2004 o successivo).
+NotCompatibleWithWindows=Questo programma non è compatibile con la versione di Windows (è richiesto Windows 10 1809 o successivo).
 NotCompatibleWithWindows7=Questo programma non è compatibile con la versione di Windows 7 (richiesto KB4474419).
 NotCompatibleWithHVCI=Questo programma non è compatibile con HVCI (Core Isolation).
 InstallVCRedist=Installare l'ultimo Visual C++ ridistribuibile!

diff --git a/deploy/languages/custom/Korean.isl b/deploy/languages/custom/Korean.isl
@@ -13,7 +13,7 @@ UninstallPassword=
 UninstallPasswordOK=확인
 UninstallPasswordCancel=취소
 WrongPassword=잘못된 암호
-NotCompatibleWithWindows=이 프로그램은 Windows 버전 (Windows 10 2004 이상 필요)과 호환되지 않습니다.
+NotCompatibleWithWindows=이 프로그램은 Windows 버전 (Windows 10 1809 이상 필요)과 호환되지 않습니다.
 NotCompatibleWithWindows7=이 프로그램은 Windows 7 버전과 호환되지 않습니다 (KB4474419 필요).
 NotCompatibleWithHVCI=이 프로그램은 HVCI (코어 격리)와 호환되지 않습니다.
 InstallVCRedist=최신 Visual C++ 재배포판을 설치하세요!

diff --git a/deploy/languages/custom/Portuguese.isl b/deploy/languages/custom/Portuguese.isl
@@ -13,7 +13,7 @@ UninstallPassword=Uninstall Password
 UninstallPasswordOK=OK
 UninstallPasswordCancel=Cancel
 WrongPassword=Wrong password
-NotCompatibleWithWindows=This program is not compatible with Windows version (Windows 10 2004 or newer required).
+NotCompatibleWithWindows=This program is not compatible with Windows version (Windows 10 1809 or newer required).
 NotCompatibleWithWindows7=This program is not compatible with Windows 7 version (KB4474419 required).
 NotCompatibleWithHVCI=This program is not compatible with HVCI (Core Isolation).
 InstallVCRedist=Install the latest Visual C++ redistributable!

diff --git a/deploy/languages/custom/Russian.isl b/deploy/languages/custom/Russian.isl
@@ -13,7 +13,7 @@ UninstallPassword=
 UninstallPasswordOK=OK
 UninstallPasswordCancel=Отмена
 WrongPassword=Неверный пароль
-NotCompatibleWithWindows=Эта программа несовместима с версией Windows (требуется Windows 10 2004 или новее).
+NotCompatibleWithWindows=Эта программа несовместима с версией Windows (требуется Windows 10 1809 или новее).
 NotCompatibleWithWindows7=Эта программа несовместима с версией Windows 7 (требуется KB4474419).
 NotCompatibleWithHVCI=Эта программа несовместима с HVCI (Core Isolation).
 InstallVCRedist=Установите последнюю версию распространяемого пакета Visual C++!

diff --git a/deploy/languages/custom/Slovenian.isl b/deploy/languages/custom/Slovenian.isl
@@ -13,7 +13,7 @@ UninstallPassword=Odstrani geslo
 UninstallPasswordOK=Vredu
 UninstallPasswordCancel=PrekliŃi
 WrongPassword=NapaŃno geslo
-NotCompatibleWithWindows=Ta program ni zdruŘljiv z razliŃico sistema Windows (potreben je Windows 10 2004 ali novejŐi).
+NotCompatibleWithWindows=Ta program ni zdruŘljiv z razliŃico sistema Windows (potreben je Windows 10 1809 ali novejŐi).
 NotCompatibleWithWindows7=Ta program ni zdruŘljiv z razliŃico sistema Windows 7 (potrebna je KB4474419).
 NotCompatibleWithHVCI=Ta program ni zdruŘljiv s HVCI (izolacija jedra).
 InstallVCRedist=Namesti najnovejŐi Visual C++ za redistribucijo!

diff --git a/src/driver/scripts/setup-vars.bat b/src/driver/scripts/setup-vars.bat
@@ -1,8 +1,16 @@
 @rem Setup variables
 
 @set ARCH=x86
-@if "%PROCESSOR_ARCHITECTURE%" == "AMD64" @set ARCH=x86_64
-@if "%PROCESSOR_ARCHITECTURE%" == "ARM64" @set ARCH=ARM64
+@if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
+    @set ARCH=x86_64
+
+    @rem Check for Windows 10 2004
+    @for /f "tokens=4-6 delims=. " %%i in ('ver') do @(
+        @if %%i.%%j.%%k lss 10.0.19041 @set ARCH=x86_64_old
+    )
+) else (
+    @if "%PROCESSOR_ARCHITECTURE%" == "ARM64" @set ARCH=ARM64
+)
 
 @set BASENAME=fortfw
 @set FILENAME=%BASENAME%.sys