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/Util/ca/OsInfo.cpp     |  1 +
 src/ext/Util/ca/caDecor.h      | 13 -------------
 src/ext/Util/ca/precomp.h      |  2 +-
 src/ext/Util/ca/utilca.vcxproj |  1 -
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 src/ext/Util/ca/caDecor.h

(limited to 'src/ext/Util')

diff --git a/src/ext/Util/ca/OsInfo.cpp b/src/ext/Util/ca/OsInfo.cpp
index 005407af..593e3b0c 100644
--- a/src/ext/Util/ca/OsInfo.cpp
+++ b/src/ext/Util/ca/OsInfo.cpp
@@ -330,6 +330,7 @@ LExit:
     {
         ::LocalFree(psid);
     }
+    
     ReleaseStr(pwzPropertyValue);
     return hr;
 }
diff --git a/src/ext/Util/ca/caDecor.h b/src/ext/Util/ca/caDecor.h
deleted file mode 100644
index da274650..00000000
--- a/src/ext/Util/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/Util/ca/precomp.h b/src/ext/Util/ca/precomp.h
index 98e61e1a..efde32a6 100644
--- a/src/ext/Util/ca/precomp.h
+++ b/src/ext/Util/ca/precomp.h
@@ -51,4 +51,4 @@
 #include "scasmb.h"
 #include "scasmbexec.h"
 
-#include "caDecor.h"
+#include "..\..\caDecor.h"
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj
index 8fe26942..758f075c 100644
--- a/src/ext/Util/ca/utilca.vcxproj
+++ b/src/ext/Util/ca/utilca.vcxproj
@@ -79,7 +79,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ClInclude Include="caDecor.h" />
     <ClInclude Include="cost.h" />
     <ClInclude Include="CustomMsiErrors.h" />
     <ClInclude Include="precomp.h" />
-- 
cgit v1.2.3-55-g6feb