Hans Leidekker : msi: A commit or rollback custom action can be a deferred action at the same time .

[Alexandre Julliard]

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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Oct 13 14:23:51 2010 +0200

msi: A commit or rollback custom action can be a deferred action at the same time.

---

 dlls/msi/custom.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 5a1787f..e3a2b44 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -258,20 +258,14 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL
         {
             LPWSTR actiondata = msi_dup_property( package->db, action );
 
-            switch (script)
-            {
-            case INSTALL_SCRIPT:
+            if (type & msidbCustomActionTypeInScript)
                 package->scheduled_action_running = TRUE;
-                break;
-            case COMMIT_SCRIPT:
+
+            if (type & msidbCustomActionTypeCommit)
                 package->commit_action_running = TRUE;
-                break;
-            case ROLLBACK_SCRIPT:
+
+            if (type & msidbCustomActionTypeRollback)
                 package->rollback_action_running = TRUE;
-                break;
-            default:
-                break;
-            }
 
             if (deferred_data)
                 set_deferred_action_props(package, deferred_data);