From ecb774445b177c739864cbd0f6ad441c7864e3be Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sat, 4 Jul 2020 19:02:15 -0400 Subject: Add per-platform custom action support. --- src/ca/wixhttpca.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/ca/wixhttpca.cpp') 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( if (WCA_TODO_INSTALL == todoSched) { - hr = WcaDoDeferredAction(L"WixRollbackHttpUrlReservationsInstall", sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpUrlReservationsInstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); ExitOnFailure(hr, "Failed to schedule install URL reservations rollback."); - hr = WcaDoDeferredAction(L"WixExecHttpUrlReservationsInstall", sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpUrlReservationsInstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); ExitOnFailure(hr, "Failed to schedule install URL reservations execution."); } else { - hr = WcaDoDeferredAction(L"WixRollbackHttpUrlReservationsUninstall", sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpUrlReservationsUninstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); ExitOnFailure(hr, "Failed to schedule uninstall URL reservations rollback."); - hr = WcaDoDeferredAction(L"WixExecHttpUrlReservationsUninstall", sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); + hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpUrlReservationsUninstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL); ExitOnFailure(hr, "Failed to schedule uninstall URL reservations execution."); } } @@ -210,6 +210,7 @@ static UINT SchedHttpUrlReservations( { WcaLog(LOGMSG_STANDARD, "No URL reservations scheduled."); } + LExit: ReleaseStr(sczSDDL); ReleaseStr(sczExistingSDDL); -- cgit v1.2.3-55-g6feb