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

msi: msidbFileAttributesVital has no effect on the installation of files.

This commit is contained in:
James Hawkins 2008-07-22 00:53:03 -05:00 committed by Alexandre Julliard
parent 4e467ad729
commit 64a9e0f750
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msi/files.c
View File

@ -750,11 +750,6 @@ static UINT copy_install_file(MSIFILE *file)
gle = copy_file(file); gle = copy_file(file);
TRACE("Overwriting existing file: %d\n", gle); TRACE("Overwriting existing file: %d\n", gle);
} }
else if (!(file->Attributes & msidbFileAttributesVital))
{
TRACE("Ignoring error for nonvital\n");
gle = ERROR_SUCCESS;
}
return gle; return gle;
} }

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

@ -4411,22 +4411,22 @@ static void test_sourcefolder(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_FAILURE,
"Expected ERROR_INSTALL_FAILURE, got %u\n", r);
ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n");
todo_wine todo_wine
{ {
ok(r == ERROR_INSTALL_FAILURE,
"Expected ERROR_INSTALL_FAILURE, got %u\n", r);
ok(!delete_pf("msitest", FALSE), "File installed\n"); ok(!delete_pf("msitest", FALSE), "File installed\n");
} }
RemoveDirectoryA("msitest"); RemoveDirectoryA("msitest");
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_FAILURE,
"Expected ERROR_INSTALL_FAILURE, got %u\n", r);
ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n");
todo_wine todo_wine
{ {
ok(r == ERROR_INSTALL_FAILURE,
"Expected ERROR_INSTALL_FAILURE, got %u\n", r);
ok(!delete_pf("msitest", FALSE), "File installed\n"); ok(!delete_pf("msitest", FALSE), "File installed\n");
} }