diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-12-07 22:20:03 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-12-07 20:06:46 +0100 |
| commit | ec0a49ecc7ea8449d90c1e69857d62728af19829 (patch) | |
| tree | 8c8867bb7ff03bb58eaed05bc157001ff0b61abf /instsetoo_native | |
| parent | 762d76d9a44704af45b4989f900a906f8f7aa3a3 (diff) | |
Windows 7-8.1 support was removed, prevent install on these old systems
There is no simple "Windows is 10 or newer" check in MSI, with the
Microsoft policy of "you don't need to know real Windows version".
See also https://developercommunity.visualstudio.com/t/detect-a-windows-version-from-msi/412198
The values that MSI sees (e.g. on my Win11) are:
Property(C): VersionNT = 603
Property(C): VersionNT64 = 603
Property(C): WindowsBuild = 9600
So those can't be used for the check. I use the WINMAJORVER that is
read from registry (Software\Microsoft\Windows NT\CurrentVersion).
There is no more need to check and install UCRT; it was dropped.
Change-Id: Ic02d6aeb965e9684bafd4357f969980f77000e73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178049
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'instsetoo_native')
6 files changed, 2 insertions, 12 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf index 5e57eb1c3c0e..8f4fa841aac6 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf @@ -2,5 +2,3 @@ en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system." [OOO_LAUNCH_2] en-US = "[ProductName] cannot be installed on this Windows version. [WindowsMinVersionText] or newer is required." -[OOO_LAUNCH_3] -en-US = "To install [ProductName] on Windows 8.1, at least April 2014 update rollup (MS KB 2919355) must be installed." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index 0a5b68ed4186..569132a50bae 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -1,5 +1,4 @@ Property Signature_ s72 s72 AppSearch Property Signature_ -WIN81S14 win81s14 WINMAJORVER WinMajorVer diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt index 589ab7c52806..dfdbe78c60ec 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt @@ -1,4 +1,3 @@ Signature_ Parent Path Depth s72 S72 S255 I2 DrLocator Signature_ Parent Path -win81s14 [SystemFolder] diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 629c3c5582e1..4d064b92ed0a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,5 +2,4 @@ Condition Description s255 l255 65001 LaunchCondition Condition Privileged OOO_LAUNCH_1 -Installed Or VersionNT > WindowsMinVersionNumber Or (VersionNT = WindowsMinVersionNumber And ServicePackLevel >= WindowsMinSPNumber) OOO_LAUNCH_2 -Installed Or VersionNT <> 603 Or WIN81S14 OOO_LAUNCH_3 +Installed Or (WINMAJORVER >= WinMajorVerMin) OOO_LAUNCH_2 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index e528cac384ec..c066aa162c7f 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -63,5 +63,4 @@ STR_INSTALLATION_WIZARD OOO_STR_INSTALLATION_WIZARD UpgradeCode UPGRADECODETEMPLATE VC_REDIST 1 WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE -WindowsMinVersionNumber WINDOWSMINVERSIONNUMBERTEMPLATE -WindowsMinSPNumber WINDOWSMINSPNUMBERTEMPLATE +WinMajorVerMin WINMAJORVERMINTEMPLATE diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt index d5abd9769125..5004a55863ba 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt @@ -1,7 +1,3 @@ Signature FileName MinVersion MaxVersion MinSize MaxSize MinDate MaxDate Languages s72 s255 S20 S20 I4 I4 I4 I4 S255 Signature Signature -# Since it's impossible to match minimal version in Signature table independent of -# language, and we need language-independent comparison, we use a value that is at -# least 1 less (see note at https://msdn.microsoft.com/en-us/library/aa371853). -win81s14 kernel32.dll 6.3.9600.17030 |