[ros-diffs] [reactos] 105/360: [WINESYNC] msi: Resolve source when executing InstallFiles.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19863c800244ca9ca4939…

commit 19863c800244ca9ca4939395ff63b2da51b35425
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 16:34:05 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:27:54 2022 +0100

    [WINESYNC] msi: Resolve source when executing InstallFiles.
    
    Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 536a86f21ff0f8432309225b61695138be95cb3a by Zebediah Figura
<z.figura12(a)gmail.com>
---
 dll/win32/msi/files.c                    | 2 ++
 modules/rostests/winetests/msi/install.c | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/dll/win32/msi/files.c b/dll/win32/msi/files.c
index adffcafb587..f6cf3e7a8cc 100644
--- a/dll/win32/msi/files.c
+++ b/dll/win32/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/modules/rostests/winetests/msi/install.c
b/modules/rostests/winetests/msi/install.c
index af37d93c425..3eb6c804221 100644
--- a/modules/rostests/winetests/msi/install.c
+++ b/modules/rostests/winetests/msi/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);
 }