commit c13d84fffcd2101ad1446f56b8cc53b82abbe5a1
author Hans Leidekker <hans@codeweavers.com> Tue Mar 02 14:56:51 2010 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 02 16:11:44 2010 +0100
tree 40c86b6755def0c99e2fa8383dcbcd8eae472a40
parent 2d3676d912b1391b2bce58917408f017bad51cd1

msi: Look at the requested action when deleting services, not the action taken.

dlls/msi/action.c

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index b99dce2..278d479 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -5224,6 +5224,7 @@
 {
     MSIPACKAGE *package = param;
     MSICOMPONENT *comp;
+    LPCWSTR component;
     LPWSTR name = NULL;
     DWORD event;
     SC_HANDLE scm = NULL, service = NULL;
@@ -5232,10 +5233,19 @@
     if (!(event & msidbServiceControlEventDelete))
         return ERROR_SUCCESS;
 
-    comp = get_loaded_component( package, MSI_RecordGetString(rec, 6) );
-    if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT)
+    component = MSI_RecordGetString(rec, 6);
+    comp = get_loaded_component(package, component);
+    if (!comp)
         return ERROR_SUCCESS;
 
+    if (comp->ActionRequest != INSTALLSTATE_ABSENT)
+    {
+        TRACE("Component not scheduled for removal: %s\n", debugstr_w(component));
+        comp->Action = comp->Installed;
+        return ERROR_SUCCESS;
+    }
+    comp->Action = INSTALLSTATE_ABSENT;
+
     deformat_string( package, MSI_RecordGetString(rec, 2), &name );
     stop_service( name );