msi: Return the right error when a cabinet cannot be extracted.

This commit is contained in:
Hans Leidekker 2010-03-26 12:11:44 +01:00 committed by Alexandre Julliard
parent 129161fec5
commit 1407f1ee36
2 changed files with 2 additions and 2 deletions

View File

@ -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;
}
}

View File

@ -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");