solenv/bin/modules/installer/windows/msiglobal.pm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
New commits:
commit f782b13a271c127c84799829b6a32fcf28a5cd35
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Aug 18 14:04:33 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Aug 18 16:25:24 2025 +0200
tdf#166947 properly fix windows installation sets for aarch64
While https://learn.microsoft.com/en-us/windows/win32/msi/template-summary
says that the value should be Arm64 for aarch64, the installsets created
by the baseline fail to install/produce error 1620 on installation.
The missing bit was that for that to work properly the msi summary
information table must be at least schema version 500.
That is mentioned here:
https://learn.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages
Thanks a lot to Mike Kaganski for that pointer
this cherry-pick contains part of the janitorial cleanup that replaced
pointless function calls to get static values from
25d62325f320ba75a2b64584fe1d5d98c18275f1
Change-Id: I5fc84f877c6af98c78107ff99920def7053a3950
(cherry picked from commit 354f6d4eb00bf7cc5e2ae576706f101fb544eab3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189869
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 3b392c4fd4a1..235033d374a7 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -490,16 +490,6 @@ sub create_msi_database
}
}
-#################################################################
-# Returning the msi version for the Summary Information Stream
-#################################################################
-
-sub get_msiversion_for_sis
-{
- my $msiversion = "200";
- return $msiversion;
-}
-
#################################################################
# Returning the word count for the Summary Information Stream
#################################################################
@@ -608,7 +598,9 @@ sub write_summary_into_msi_database
my $msiinfo = "msiinfo.exe"; # Has to be in the path
- my $msiversion = get_msiversion_for_sis();
+ # schema version needs to be at least 500 to support 64bit packages on
Arm64
+ # see
https://learn.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages
+ my $msiversion = 500;
my $codepage = 0; # PID_CODEPAGE summary property in a signed short,
therefore it is impossible to set 65001 here.
my $template = get_template_for_sis($language, $allvariableshashref);
my $guid = get_packagecode_for_sis();
