From 78b6fcffa839883d04c004b53d3a3e5e1446fae9 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 24 Jan 2024 13:12:34 +1100 Subject: [PATCH] Added msi-cabinet patchset --- ...y-process-cabinet-files-if-it-exists.patch | 25 +++++++++++++++++++ patches/msi-cabinet/definition | 1 + 2 files changed, 26 insertions(+) create mode 100644 patches/msi-cabinet/0001-msi-Only-process-cabinet-files-if-it-exists.patch create mode 100644 patches/msi-cabinet/definition diff --git a/patches/msi-cabinet/0001-msi-Only-process-cabinet-files-if-it-exists.patch b/patches/msi-cabinet/0001-msi-Only-process-cabinet-files-if-it-exists.patch new file mode 100644 index 00000000..35632368 --- /dev/null +++ b/patches/msi-cabinet/0001-msi-Only-process-cabinet-files-if-it-exists.patch @@ -0,0 +1,25 @@ +From cbfeb2a5abed1c5c532280290f70f5299894cc8f Mon Sep 17 00:00:00 2001 +From: Czcibor Bohusz-Dobosz +Date: Sun, 14 Jan 2024 17:50:49 +1100 +Subject: [PATCH] msi: Only process cabinet files if it exists + +--- + dlls/msi/files.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/msi/files.c b/dlls/msi/files.c +index 96c6c5eaa4b..c85c66ae53e 100644 +--- a/dlls/msi/files.c ++++ b/dlls/msi/files.c +@@ -819,7 +819,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) + data.cb = patchfiles_cb; + data.user = &cursor; + +- if (!msi_cabextract( package, mi, &data )) ++ if (mi->cabinet && !msi_cabextract( package, mi, &data )) + { + ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); + rc = ERROR_INSTALL_FAILURE; +-- +2.43.0 + diff --git a/patches/msi-cabinet/definition b/patches/msi-cabinet/definition new file mode 100644 index 00000000..8b4fef36 --- /dev/null +++ b/patches/msi-cabinet/definition @@ -0,0 +1 @@ +Fixes: [50148] msi: Process cabinet files only when one is supplied.