diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-07-04 18:36:13 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-07-04 18:58:45 -0400 |
| commit | e6510bc49ebe47d37790a1930587f6405249def7 (patch) | |
| tree | 30bdff91ad25db96e085b577a632306b8f703fbb /src/ca/firewall.cpp | |
| parent | 8181317ba1b9f718b6e54ce13cba04351e464c01 (diff) | |
| download | wix-e6510bc49ebe47d37790a1930587f6405249def7.tar.gz wix-e6510bc49ebe47d37790a1930587f6405249def7.tar.bz2 wix-e6510bc49ebe47d37790a1930587f6405249def7.zip | |
Fix deferred custom action invocations.
Diffstat (limited to 'src/ca/firewall.cpp')
| -rw-r--r-- | src/ca/firewall.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ca/firewall.cpp b/src/ca/firewall.cpp index bf40ce77..038f4ea5 100644 --- a/src/ca/firewall.cpp +++ b/src/ca/firewall.cpp | |||
| @@ -150,16 +150,16 @@ static UINT SchedFirewallExceptions( | |||
| 150 | 150 | ||
| 151 | if (WCA_TODO_INSTALL == todoSched) | 151 | if (WCA_TODO_INSTALL == todoSched) |
| 152 | { | 152 | { |
| 153 | hr = WcaDoDeferredAction(L"WixRollbackFirewallExceptionsInstall", pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); | 153 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackFirewallExceptionsInstall"), pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); |
| 154 | ExitOnFailure(hr, "failed to schedule firewall install exceptions rollback"); | 154 | ExitOnFailure(hr, "failed to schedule firewall install exceptions rollback"); |
| 155 | hr = WcaDoDeferredAction(L"WixExecFirewallExceptionsInstall", pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); | 155 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecFirewallExceptionsInstall"), pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); |
| 156 | ExitOnFailure(hr, "failed to schedule firewall install exceptions execution"); | 156 | ExitOnFailure(hr, "failed to schedule firewall install exceptions execution"); |
| 157 | } | 157 | } |
| 158 | else | 158 | else |
| 159 | { | 159 | { |
| 160 | hr = WcaDoDeferredAction(L"WixRollbackFirewallExceptionsUninstall", pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); | 160 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackFirewallExceptionsUninstall"), pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); |
| 161 | ExitOnFailure(hr, "failed to schedule firewall uninstall exceptions rollback"); | 161 | ExitOnFailure(hr, "failed to schedule firewall uninstall exceptions rollback"); |
| 162 | hr = WcaDoDeferredAction(L"WixExecFirewallExceptionsUninstall", pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); | 162 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecFirewallExceptionsUninstall"), pwzCustomActionData, cFirewallExceptions * COST_FIREWALL_EXCEPTION); |
| 163 | ExitOnFailure(hr, "failed to schedule firewall uninstall exceptions execution"); | 163 | ExitOnFailure(hr, "failed to schedule firewall uninstall exceptions execution"); |
| 164 | } | 164 | } |
| 165 | } | 165 | } |