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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1104dc088df7f0f492c1bc6b48258d8a2ce9a956
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1104dc088df7f0f492c1bc6b48...

Author: James Hawkins 
Date:   Tue May  1 03:21:22 2007 -0500

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

---

dlls/msi/action.c        |    3 ---
 dlls/msi/tests/install.c |    8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 804a1e5..8ff889b 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -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 };
     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, cszRootDrive, c_colon);

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index b1cb4b8..d349371 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -1479,12 +1479,8 @@ static void test_setpropertyfolder(void)

r = MsiInstallProductA(msifile, NULL);
     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", FALSE), "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", FALSE), "File not installed\n");

DeleteFile(msifile);