Skip to content

Commit 19863c8

Browse files
winesynclearn-more
authored andcommitted
[WINESYNC] msi: Resolve source when executing InstallFiles.
Signed-off-by: Zebediah Figura <[email protected]> Signed-off-by: Hans Leidekker <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 536a86f21ff0f8432309225b61695138be95cb3a by Zebediah Figura <[email protected]>
1 parent 88888f8 commit 19863c8

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

dll/win32/msi/files.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
357357
UINT rc = ERROR_SUCCESS;
358358
MSIFILE *file;
359359

360+
msi_set_sourcedir_props(package, FALSE);
361+
360362
schedule_install_files(package);
361363
mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) );
362364

modules/rostests/winetests/msi/install.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,7 @@ static const CHAR sr_install_exec_seq_dat[] =
13281328
"sourcedir_unset\tSourceDir\t700\n"
13291329
"ResolveSource\tRESOLVE_SOURCE\t800\n"
13301330
"ProcessComponents\tPROCESS_COMPONENTS\t800\n"
1331+
"InstallFiles\tINSTALL_FILES\t800\n"
13311332
"sourcedir_set\tNOT SourceDir\t900\n"
13321333
"InstallFinalize\t\t1000\n";
13331334

@@ -6166,6 +6167,10 @@ static void test_source_resolution(void)
61666167
r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1");
61676168
ok(r == ERROR_SUCCESS, "got %u\n", r);
61686169

6170+
r = MsiInstallProductA(msifile, "INSTALL_FILES=1");
6171+
ok(r == ERROR_SUCCESS, "got %u\n", r);
6172+
6173+
delete_pf_files();
61696174
delete_test_files();
61706175
DeleteFileA(msifile);
61716176
}

0 commit comments

Comments
 (0)