diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-02 09:53:21 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-02 09:42:43 +0100 |
| commit | 419866e851c7ad4a39bd508d607baba3590f3d45 (patch) | |
| tree | 8993314aa4513e1d337a40dd51fa4d1cdfc38a8d /instsetoo_native | |
| parent | 3d83bdb94a43b7d77c5a2362cb8204caf47a6b54 (diff) | |
MSI: Fix Signature table's FileName column type
It was "Filename" [1] since commit 68d28e25348ced2619733d8b177423d3aefab900
(#i28464# ooo native installer, 2004-05-24). But according to the spec [2],
it should be "Text" [3].
Found accidentally, because of an MSM bug in VS 2022 [4]. The unnecessary
entries there for Signature table conflicted with ours, preventing merge.
[1] https://learn.microsoft.com/en-us/windows/win32/msi/filename
[2] https://learn.microsoft.com/en-us/windows/win32/msi/signature-table
[3] https://learn.microsoft.com/en-us/windows/win32/msi/text
[4] https://developercommunity.visualstudio.com/t/Microsoft_VC143_CRT_x64msm-v14363253/10505819
Change-Id: I9911b8c02df57f202d197c634b565ce74b35d7e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158783
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'instsetoo_native')
3 files changed, 3 insertions, 3 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt index 80ab50b265cb..53dcdd84e45c 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt @@ -421,7 +421,7 @@ Shortcut Shortcut N Identifier Primary key, non-localized token. Shortcut ShowCmd Y 1;3;7 The show command for the application window.The following values may be used. Shortcut Target N Shortcut The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to. Shortcut WkDir Y Identifier Name of property defining location of working directory. -Signature FileName N Filename The name of the file. This may contain a "short name|long name" pair. +Signature FileName N Text The name of the file. This may contain a "short name|long name" pair. Signature Languages Y Language The languages supported by the file. Signature MaxDate Y 0 2147483647 The maximum creation date of the file. Signature MaxSize Y 0 2147483647 The maximum size of the file. diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt index f3b5648311a7..ea986c0ea1d8 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt @@ -425,7 +425,7 @@ Shortcut Shortcut N Identifier Primary key, non-localized token. Shortcut ShowCmd Y 1;3;7 The show command for the application window.The following values may be used. Shortcut Target N Shortcut The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to. Shortcut WkDir Y Identifier Name of property defining location of working directory. -Signature FileName N Filename The name of the file. This may contain a "short name|long name" pair. +Signature FileName N Text The name of the file. This may contain a "short name|long name" pair. Signature Languages Y Language The languages supported by the file. Signature MaxDate Y 0 2147483647 The maximum creation date of the file. Signature MaxSize Y 0 2147483647 The maximum size of the file. diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt index 80ab50b265cb..53dcdd84e45c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt @@ -421,7 +421,7 @@ Shortcut Shortcut N Identifier Primary key, non-localized token. Shortcut ShowCmd Y 1;3;7 The show command for the application window.The following values may be used. Shortcut Target N Shortcut The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to. Shortcut WkDir Y Identifier Name of property defining location of working directory. -Signature FileName N Filename The name of the file. This may contain a "short name|long name" pair. +Signature FileName N Text The name of the file. This may contain a "short name|long name" pair. Signature Languages Y Language The languages supported by the file. Signature MaxDate Y 0 2147483647 The maximum creation date of the file. Signature MaxSize Y 0 2147483647 The maximum size of the file. |