instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt | 1 + instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt | 1 + scp2/source/ooo/vc_redist.scp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit b254c0be9f7c5b35161ba47e50e77e63cb3775c2 Author: Andras Timar <[email protected]> AuthorDate: Mon Mar 2 14:31:24 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Tue Mar 3 07:28:51 2026 +0100 MSI: skip VC++ runtime merge module if already installed Use AppSearch/RegLocator to check for the VC++ 14.x runtime at HKLM\SOFTWARE\Microsoft\VisualStudio .0\VC\Runtimes\x64. If the Installed value is present, skip the x64 merge module to avoid msvcp140.dll file-in-use conflicts during silent installation. Change-Id: I9fca6be86f56406527f7f1b2f2725a3c52492875 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200828 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index 0a5b68ed4186..63f28527bf24 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -3,3 +3,4 @@ s72 s72 AppSearch Property Signature_ WIN81S14 win81s14 WINMAJORVER WinMajorVer +VCRUNTIMEINSTALLED VCRuntimex64 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt index 59aed91a014d..0fff53ba1e81 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt @@ -2,3 +2,4 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ WinMajorVer 2 Software\Microsoft\Windows NT\CurrentVersion CurrentMajorVersionNumber 2 +VCRuntimex64 2 SOFTWARE\Microsoft\VisualStudio .0\VC\Runtimes\x64 Installed 2 diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 3fe7af2b978b..31d055a5bfcf 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -61,7 +61,7 @@ MergeModule WINDOWS_X64_MERGEMODULE Feature = gm_Root; Name = WINDOWS_X64_MERGEMODULE_FILE; RootDir = "TARGETDIR"; - ComponentCondition = "VC_REDIST=1"; + ComponentCondition = "VC_REDIST=1 AND NOT VCRUNTIMEINSTALLED"; Attributes_Add = "0x10"; End
