Commit 1104dc08 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

msi: Run the costing actions for both the UI and execute sequences.

parent baad8887
...@@ -1568,9 +1568,6 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) ...@@ -1568,9 +1568,6 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package)
{'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 };
static const WCHAR szZero[] = { '0', 0 }; static const WCHAR szZero[] = { '0', 0 };
if ( 1 == msi_get_property_int( package, szCosting, 0 ) )
return ERROR_SUCCESS;
MSI_SetPropertyW(package, szCosting, szZero); MSI_SetPropertyW(package, szCosting, szZero);
MSI_SetPropertyW(package, cszRootDrive, c_colon); MSI_SetPropertyW(package, cszRootDrive, c_colon);
......
...@@ -1479,12 +1479,8 @@ static void test_setpropertyfolder(void) ...@@ -1479,12 +1479,8 @@ static void test_setpropertyfolder(void)
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
delete_pf("msitest\\maximus", TRUE); /* FIXME: remove when the tests pass */
todo_wine
{
ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); ok(delete_pf("msitest\\added", FALSE), "File not installed\n");
}
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
DeleteFile(msifile); DeleteFile(msifile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment