diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 26248c5..842a72d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -750,11 +750,6 @@ static UINT copy_install_file(MSIFILE *file) gle = copy_file(file); TRACE("Overwriting existing file: %d\n", gle); } - else if (!(file->Attributes & msidbFileAttributesVital)) - { - TRACE("Ignoring error for nonvital\n"); - gle = ERROR_SUCCESS; - } return gle; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e81e3a5..881bb5c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4411,22 +4411,22 @@ static void test_sourcefolder(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, 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"); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, - "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest", FALSE), "File installed\n"); } RemoveDirectoryA("msitest"); 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"); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, - "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest", FALSE), "File installed\n"); } -- 1.5.4.3