ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Resolve source when executing InstallFiles. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-06-06 00:59:21 -05:00 committed by Alexandre Julliard
parent 38747c3234
commit 536a86f21f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/files.c
View File

@ -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) );

5
dlls/msi/tests/install.c
View File

@ -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)
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);
} }