Commit 536a86f2 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

msi: Resolve source when executing InstallFiles.

parent 38747c32
...@@ -357,6 +357,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ...@@ -357,6 +357,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
UINT rc = ERROR_SUCCESS; UINT rc = ERROR_SUCCESS;
MSIFILE *file; MSIFILE *file;
msi_set_sourcedir_props(package, FALSE);
schedule_install_files(package); schedule_install_files(package);
mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) );
......
...@@ -1328,6 +1328,7 @@ static const CHAR sr_install_exec_seq_dat[] = ...@@ -1328,6 +1328,7 @@ static const CHAR sr_install_exec_seq_dat[] =
"sourcedir_unset\tSourceDir\t700\n" "sourcedir_unset\tSourceDir\t700\n"
"ResolveSource\tRESOLVE_SOURCE\t800\n" "ResolveSource\tRESOLVE_SOURCE\t800\n"
"ProcessComponents\tPROCESS_COMPONENTS\t800\n" "ProcessComponents\tPROCESS_COMPONENTS\t800\n"
"InstallFiles\tINSTALL_FILES\t800\n"
"sourcedir_set\tNOT SourceDir\t900\n" "sourcedir_set\tNOT SourceDir\t900\n"
"InstallFinalize\t\t1000\n"; "InstallFinalize\t\t1000\n";
...@@ -6166,6 +6167,10 @@ static void test_source_resolution(void) ...@@ -6166,6 +6167,10 @@ static void test_source_resolution(void)
r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1");
ok(r == ERROR_SUCCESS, "got %u\n", r); 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(); delete_test_files();
DeleteFileA(msifile); DeleteFileA(msifile);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment