diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-20 08:05:41 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-20 09:16:32 +0200 |
commit | 1882827320ed760de82211cf690b686f8d34ff74 (patch) | |
tree | cd28647316ac06c374887203b2b85896e2acdce0 /instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt | |
parent | xmlsec: drop no longer needed xmlsec1-1.2.14_fix_extern_c.patch.1 (diff) | |
download | core-1882827320ed760de82211cf690b686f8d34ff74.tar.gz core-1882827320ed760de82211cf690b686f8d34ff74.zip |
tdf#115405, tdf#119910: don't check if UCRT is already installed
There appears to be common situation that a system has *some* UCRT libraries
in System32, that were installed improperly (presumably by some applications
using simple copy).In these cases, our installer would detect the presence of
ucrtbase.dll, and not try to install UCRT on the system.
Unfortunately, it seems that oftentimes such improper UCRT installations miss
some parts of UCRT, which leads to LibreOffice failing to start with messages
like "The program can't start because api-ms-win-crt-string-l1-1-0.dll is
missing from your computer. Try reinstalling the program to fix this problem."
(the missing component varies).
This patch removes the check for UCRT presence. Installer will try to install
UCRT on applicable systems unconditionally. Since the proper outcomes in case
of already present UCRT are either WU_S_ALREADY_INSTALLED or WU_E_NOT_APPLICABLE
and both are treated as success in inst_msu action (see InstallMSU in
setup_native/source/win32/customactions/inst_msu/inst_msu.cxx), this should
only make this part more robust, and not bring new problems (yes, I know that
actually there will be new problems, as usual).
Change-Id: I22a3d357014d31a8e492ff8a15bcb477eeb79735
Reviewed-on: https://gerrit.libreoffice.org/60789
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt')
-rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index 23c2a77c9f5d..46ceccc26c60 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -6,5 +6,3 @@ INSTALLLOCATION installuser_ INSTALLLOCATION installmachine INSTALLLOCATION installmachine_ WIN81S14 win81s14 -UCRT_DETECTED ucrt_detected -UCRT_DETECTED ucrt_on_win10 |