James Hawkins : msi: msidbFileAttributesVital has no effect on the installation of files.
Alexandre Julliard
julliard at winehq.org
Tue Jul 22 09:35:47 CDT 2008
Module: wine
Branch: master
Commit: 64a9e0f750f34ee5f34f31a0d46ea1484314115a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a9e0f750f34ee5f34f31a0d46ea1484314115a
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Tue Jul 22 00:53:03 2008 -0500
msi: msidbFileAttributesVital has no effect on the installation of files.
---
dlls/msi/files.c | 5 -----
dlls/msi/tests/install.c | 8 ++++----
2 files changed, 4 insertions(+), 9 deletions(-)
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");
}
More information about the wine-cvs
mailing list