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

This commit is contained in:
Hans Leidekker 2010-10-13 14:23:51 +02:00 committed by Alexandre Julliard
parent 59d6dcfddd
commit 7404e64373
1 changed files with 5 additions and 11 deletions

View File

@ -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);