From 536a86f21ff0f8432309225b61695138be95cb3a Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 6 Jun 2018 00:59:21 -0500 Subject: [PATCH] msi: Resolve source when executing InstallFiles. Signed-off-by: Zebediah Figura Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard --- dlls/msi/files.c | 2 ++ dlls/msi/tests/install.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index adffcafb587..f6cf3e7a8cc 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -357,6 +357,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) UINT rc = ERROR_SUCCESS; MSIFILE *file; + msi_set_sourcedir_props(package, FALSE); + schedule_install_files(package); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index af37d93c425..3eb6c804221 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1328,6 +1328,7 @@ static const CHAR sr_install_exec_seq_dat[] = "sourcedir_unset\tSourceDir\t700\n" "ResolveSource\tRESOLVE_SOURCE\t800\n" "ProcessComponents\tPROCESS_COMPONENTS\t800\n" + "InstallFiles\tINSTALL_FILES\t800\n" "sourcedir_set\tNOT SourceDir\t900\n" "InstallFinalize\t\t1000\n"; @@ -6166,6 +6167,10 @@ static void test_source_resolution(void) r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); ok(r == ERROR_SUCCESS, "got %u\n", r); + r = MsiInstallProductA(msifile, "INSTALL_FILES=1"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + delete_pf_files(); delete_test_files(); DeleteFileA(msifile); }