James Hawkins : msi: Don't ignore the error returned by ready_media.
Alexandre Julliard
julliard at winehq.org
Thu Nov 15 07:45:05 CST 2007
Module: wine
Branch: master
Commit: 4e9940990b4e5e5e58777b546e34328a0874756b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9940990b4e5e5e58777b546e34328a0874756b
Author: James Hawkins <truiken at gmail.com>
Date: Thu Nov 15 03:01:58 2007 -0600
msi: Don't ignore the error returned by ready_media.
---
dlls/msi/files.c | 1 -
dlls/msi/tests/install.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 812f2b0..8dbc765 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -782,7 +782,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
if (rc != ERROR_SUCCESS)
{
ERR("Failed to ready media\n");
- rc = ERROR_FUNCTION_FAILED;
break;
}
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index a11ef21..3e48233 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3548,9 +3548,9 @@ static void test_missingcab(void)
create_pf("msitest\\gaius", TRUE);
r = MsiInstallProductA(msifile, "GAIUS=1");
+ ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
todo_wine
{
- ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n");
ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n");
}
More information about the wine-cvs
mailing list