Hans Leidekker : msi: Return the right error when a cabinet cannot be extracted.
Alexandre Julliard
julliard at winehq.org
Fri Mar 26 12:11:52 CDT 2010
Module: wine
Branch: master
Commit: 1407f1ee36b23975330283992aade954c597d468
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1407f1ee36b23975330283992aade954c597d468
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Mar 26 12:11:44 2010 +0100
msi: Return the right error when a cabinet cannot be extracted.
---
dlls/msi/files.c | 2 +-
dlls/msi/tests/install.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index bb5b197..e2f399d 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -292,7 +292,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
!msi_cabextract(package, mi, &data))
{
ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet));
- rc = ERROR_FUNCTION_FAILED;
+ rc = ERROR_INSTALL_FAILURE;
break;
}
}
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 0631a5e..6672de2 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3670,9 +3670,9 @@ static void test_caborder(void)
r = MsiInstallProductA(msifile, NULL);
ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n");
+ 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\\augustus", TRUE), "File is installed\n");
ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n");
ok(!delete_pf("msitest", FALSE), "File is installed\n");
More information about the wine-cvs
mailing list