From 8840299c2624649aa05cd10e067af23d3b68acd3 Mon Sep 17 00:00:00 2001
From: K4sum1 <k4sum1@eclipse.cx>
Date: Mon, 24 Mar 2025 19:13:51 -0700
Subject: [PATCH] Fix installer missing dlls

---
 application/basilisk/installer/Makefile.in         | 1 +
 application/basilisk/installer/package-manifest.in | 1 +
 application/palemoon/installer/Makefile.in         | 1 +
 application/palemoon/installer/package-manifest.in | 1 +
 build/win32/moz.build                              | 2 +-
 js/src/old-configure.in                            | 4 +++-
 old-configure.in                                   | 4 +++-
 toolkit/mozapps/installer/upload-files.mk          | 3 +++
 8 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in
index cab18236d3..5a11213e12 100644
--- a/application/basilisk/installer/Makefile.in
+++ b/application/basilisk/installer/Makefile.in
@@ -69,6 +69,7 @@ ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
+DEFINES += -DMSVC_CMP_RUNTIME_DLL=$(MSVC_CMP_RUNTIME_DLL)
 DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
 endif
 ifdef WIN_UCRT_REDIST_DIR
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index f2f44b53e1..0f5ae12fca 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -100,6 +100,7 @@
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #if MOZ_PACKAGE_MSVC_DLLS
 @BINPATH@/@MSVC_C_RUNTIME_DLL@
+@BINPATH@/@MSVC_CMP_RUNTIME_DLL@
 @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
 #endif
 #if MOZ_PACKAGE_WIN_UCRT_DLLS
diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in
index bd765b4e20..4d10ea4701 100644
--- a/application/palemoon/installer/Makefile.in
+++ b/application/palemoon/installer/Makefile.in
@@ -72,6 +72,7 @@ ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
+DEFINES += -DMSVC_CMP_RUNTIME_DLL=$(MSVC_CMP_RUNTIME_DLL)
 DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
 endif
 ifdef WIN_UCRT_REDIST_DIR
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index 87fd7aa6b9..643d5ed7fc 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -84,6 +84,7 @@
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #if MOZ_PACKAGE_MSVC_DLLS
 @BINPATH@/@MSVC_C_RUNTIME_DLL@
+@BINPATH@/@MSVC_CMP_RUNTIME_DLL@
 @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
 #endif
 #if MOZ_PACKAGE_WIN_UCRT_DLLS
diff --git a/build/win32/moz.build b/build/win32/moz.build
index 0586312bef..8b0f8195e5 100644
--- a/build/win32/moz.build
+++ b/build/win32/moz.build
@@ -15,7 +15,7 @@ if CONFIG['ENABLE_TESTS']:
 NO_PGO = True
 
 if CONFIG['WIN32_REDIST_DIR'] and CONFIG['COMPILE_ENVIRONMENT']:
-    for f in ['MSVC_C_RUNTIME_DLL', 'MSVC_CXX_RUNTIME_DLL']:
+    for f in ['MSVC_C_RUNTIME_DLL', 'MSVC_CMP_RUNTIME_DLL', 'MSVC_CXX_RUNTIME_DLL']:
         FINAL_TARGET_FILES += [
             '%%%s/%s' % (CONFIG['WIN32_REDIST_DIR'], CONFIG[f])
         ]
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index f8db1e9a55..bcfa78f0eb 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -193,7 +193,8 @@ case "$target" in
         19*)
             _CC_SUITE=14
             MSVS_VERSION=2015
-            MSVC_C_RUNTIME_DLL=vcruntime140.dll
+            MSVC_C_RUNTIME_DLL=vcruntime*.dll
+            MSVC_CMP_RUNTIME_DLL=vcomp140.dll
             MSVC_CXX_RUNTIME_DLL=msvcp140.dll
 
             # C5026: move constructor was implicitly defined as deleted
@@ -212,6 +213,7 @@ case "$target" in
         esac
         AC_SUBST(MSVS_VERSION)
         AC_SUBST(MSVC_C_RUNTIME_DLL)
+        AC_SUBST(MSVC_CMP_RUNTIME_DLL)
         AC_SUBST(MSVC_CXX_RUNTIME_DLL)
 
         # Check linker version
diff --git a/old-configure.in b/old-configure.in
index b0f4992d22..c460596b3b 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -185,7 +185,8 @@ case "$target" in
         19*)
             _CC_SUITE=14
             MSVS_VERSION=2015
-            MSVC_C_RUNTIME_DLL=vcruntime140.dll
+            MSVC_C_RUNTIME_DLL=vcruntime*.dll
+            MSVC_CMP_RUNTIME_DLL=vcomp140.dll
             MSVC_CXX_RUNTIME_DLL=msvcp140.dll
 
             MOZ_CHECK_HEADER(dia2.h, MSVC_HAS_DIA_SDK=1)
@@ -236,6 +237,7 @@ case "$target" in
         AC_SUBST(MSVS_VERSION)
         AC_SUBST(MSVC_HAS_DIA_SDK)
         AC_SUBST(MSVC_C_RUNTIME_DLL)
+        AC_SUBST(MSVC_CMP_RUNTIME_DLL)
         AC_SUBST(MSVC_CXX_RUNTIME_DLL)
 
         AC_DEFINE(HAVE_SEH_EXCEPTIONS)
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 865d2cf6a6..b6a3dbea6d 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -76,6 +76,9 @@ endif # MOZ_FOLD_LIBS
 ifdef MSVC_C_RUNTIME_DLL
   JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
 endif
+ifdef MSVC_CMP_RUNTIME_DLL
+  JSSHELL_BINS += $(MSVC_CMP_RUNTIME_DLL)
+endif
 ifdef MSVC_CXX_RUNTIME_DLL
   JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
 endif