James Hawkins : msi: Actions should be run even if the installed state is the same as the requested state .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a9ba8f73f921a244421566eaac5ece6d0f30328
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8a9ba8f73f921a244421566eaa...

Author: James Hawkins 
Date:   Mon Sep  8 00:56:24 2008 -0500

msi: Actions should be run even if the installed state is the same as the requested state.

---

dlls/msi/helpers.c       |    3 ---
 dlls/msi/tests/install.c |    5 +----
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c
index 2364536..b1d6d73 100644
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -793,9 +793,6 @@ BOOL ACTION_VerifyComponentForAction( const MSICOMPONENT* comp, INSTALLSTATE che
     if (!comp)
         return FALSE;

-    if (comp->Installed == check)
-        return FALSE;
-
     if (comp->ActionRequest == check)
         return TRUE;
     else
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 3ff3420..adfe28e 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3511,10 +3511,7 @@ static void test_publish(void)
     /* complete install */
     r = MsiInstallProductA(msifile, "FULL=1");
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    todo_wine
-    {
-        ok(pf_exists("msitest\maximus"), "File not installed\n");
-    }
+    ok(pf_exists("msitest\maximus"), "File not installed\n");
     ok(pf_exists("msitest"), "File not installed\n");

state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");