diff options
Diffstat (limited to 'src/ca/wixhttpca.cpp')
-rw-r--r-- | src/ca/wixhttpca.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ca/wixhttpca.cpp b/src/ca/wixhttpca.cpp index 58b46c0f..3c091192 100644 --- a/src/ca/wixhttpca.cpp +++ b/src/ca/wixhttpca.cpp | |||
@@ -193,16 +193,16 @@ static UINT SchedHttpUrlReservations( | |||
193 | 193 | ||
194 | if (WCA_TODO_INSTALL == todoSched) | 194 | if (WCA_TODO_INSTALL == todoSched) |
195 | { | 195 | { |
196 | hr = WcaDoDeferredAction(L"WixRollbackHttpUrlReservationsInstall", sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); | 196 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpUrlReservationsInstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); |
197 | ExitOnFailure(hr, "Failed to schedule install URL reservations rollback."); | 197 | ExitOnFailure(hr, "Failed to schedule install URL reservations rollback."); |
198 | hr = WcaDoDeferredAction(L"WixExecHttpUrlReservationsInstall", sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); | 198 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpUrlReservationsInstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); |
199 | ExitOnFailure(hr, "Failed to schedule install URL reservations execution."); | 199 | ExitOnFailure(hr, "Failed to schedule install URL reservations execution."); |
200 | } | 200 | } |
201 | else | 201 | else |
202 | { | 202 | { |
203 | hr = WcaDoDeferredAction(L"WixRollbackHttpUrlReservationsUninstall", sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); | 203 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpUrlReservationsUninstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); |
204 | ExitOnFailure(hr, "Failed to schedule uninstall URL reservations rollback."); | 204 | ExitOnFailure(hr, "Failed to schedule uninstall URL reservations rollback."); |
205 | hr = WcaDoDeferredAction(L"WixExecHttpUrlReservationsUninstall", sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); | 205 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpUrlReservationsUninstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); |
206 | ExitOnFailure(hr, "Failed to schedule uninstall URL reservations execution."); | 206 | ExitOnFailure(hr, "Failed to schedule uninstall URL reservations execution."); |
207 | } | 207 | } |
208 | } | 208 | } |
@@ -210,6 +210,7 @@ static UINT SchedHttpUrlReservations( | |||
210 | { | 210 | { |
211 | WcaLog(LOGMSG_STANDARD, "No URL reservations scheduled."); | 211 | WcaLog(LOGMSG_STANDARD, "No URL reservations scheduled."); |
212 | } | 212 | } |
213 | |||
213 | LExit: | 214 | LExit: |
214 | ReleaseStr(sczSDDL); | 215 | ReleaseStr(sczSDDL); |
215 | ReleaseStr(sczExistingSDDL); | 216 | ReleaseStr(sczExistingSDDL); |