From 77b1f6715534192ab143dd9109aacc50fc78e52a Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 1 Feb 2023 20:22:50 -0500
Subject: Fix CustomActionData names.

Fixes https://github.com/wixtoolset/issues/issues/7189.

Also:

- Clean up duplicate caDecor.h.
- Clean up use of CUSTOM_ACTION_DECORATION.
---
 src/ext/Http/ca/caDecor.h      | 13 -------------
 src/ext/Http/ca/precomp.h      |  2 +-
 src/ext/Http/ca/snisslcert.cpp |  8 ++++----
 src/ext/Http/ca/wixhttpca.cpp  |  8 ++++----
 4 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 src/ext/Http/ca/caDecor.h

(limited to 'src/ext/Http')

diff --git a/src/ext/Http/ca/caDecor.h b/src/ext/Http/ca/caDecor.h
deleted file mode 100644
index da274650..00000000
--- a/src/ext/Http/ca/caDecor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-
-#if defined(_M_ARM64)
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"
-#elif defined(_M_AMD64)
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"
-#elif defined(_M_ARM)
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"
-#else
-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"
-#endif
diff --git a/src/ext/Http/ca/precomp.h b/src/ext/Http/ca/precomp.h
index c78d78c1..42287cb2 100644
--- a/src/ext/Http/ca/precomp.h
+++ b/src/ext/Http/ca/precomp.h
@@ -15,7 +15,7 @@
 
 #include "cost.h"
 
-#include "caDecor.h"
+#include "..\..\caDecor.h"
 
 enum eHandleExisting
 {
diff --git a/src/ext/Http/ca/snisslcert.cpp b/src/ext/Http/ca/snisslcert.cpp
index e9cafd66..81cd5298 100644
--- a/src/ext/Http/ca/snisslcert.cpp
+++ b/src/ext/Http/ca/snisslcert.cpp
@@ -420,16 +420,16 @@ static UINT SchedHttpSniSslCerts(
 
         if (WCA_TODO_INSTALL == todoSched)
         {
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpSniSslCertsInstall"), sczRollbackCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackHttpSniSslCertsInstall"), sczRollbackCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
             ExitOnFailure(hr, "Failed to schedule install SNI SSL certificate rollback");
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpSniSslCertsInstall"), sczCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecHttpSniSslCertsInstall"), sczCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
             ExitOnFailure(hr, "Failed to schedule install SNI SSL certificate execution");
         }
         else
         {
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpSniSslCertsUninstall"), sczRollbackCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackHttpSniSslCertsUninstall"), sczRollbackCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
             ExitOnFailure(hr, "Failed to schedule uninstall SNI SSL certificate rollback");
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpSniSslCertsUninstall"), sczCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecHttpSniSslCertsUninstall"), sczCustomActionData, cCertificates * COST_HTTP_SNI_SSL);
             ExitOnFailure(hr, "Failed to schedule uninstall SNI SSL certificate execution");
         }
     }
diff --git a/src/ext/Http/ca/wixhttpca.cpp b/src/ext/Http/ca/wixhttpca.cpp
index e24096bb..be2db913 100644
--- a/src/ext/Http/ca/wixhttpca.cpp
+++ b/src/ext/Http/ca/wixhttpca.cpp
@@ -191,16 +191,16 @@ static UINT SchedHttpUrlReservations(
 
         if (WCA_TODO_INSTALL == todoSched)
         {
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpUrlReservationsInstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackHttpUrlReservationsInstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
             ExitOnFailure(hr, "Failed to schedule install URL reservations rollback.");
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpUrlReservationsInstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecHttpUrlReservationsInstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
             ExitOnFailure(hr, "Failed to schedule install URL reservations execution.");
         }
         else
         {
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixRollbackHttpUrlReservationsUninstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackHttpUrlReservationsUninstall"), sczRollbackCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
             ExitOnFailure(hr, "Failed to schedule uninstall URL reservations rollback.");
-            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"WixExecHttpUrlReservationsUninstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
+            hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecHttpUrlReservationsUninstall"), sczCustomActionData, cUrlReservations * COST_HTTP_URL_ACL);
             ExitOnFailure(hr, "Failed to schedule uninstall URL reservations execution.");
         }
     }
-- 
cgit v1.2.3-55-g6feb