From 1407f1ee36b23975330283992aade954c597d468 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Fri, 26 Mar 2010 12:11:44 +0100 Subject: [PATCH] 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 bb5b197462a..e2f399da88e 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 0631a5e1f59..6672de20c13 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");