[3/5] msi: A commit or rollback custom action can be a deferred action at the same time.
Hans Leidekker
hans at codeweavers.com
Wed Oct 13 07:23:51 CDT 2010
---
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);
--
1.7.1
More information about the wine-patches
mailing list