aboutsummaryrefslogtreecommitdiff
path: root/src/ext/NetFx/ca
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2023-02-01 20:22:50 -0500
committerBob Arnson <github@bobs.org>2023-02-01 21:27:12 -0500
commit77b1f6715534192ab143dd9109aacc50fc78e52a (patch)
treebffa59d3206d56f683274be3ad6bad30f0731097 /src/ext/NetFx/ca
parent92d6c3255a72d14f40b25b4c94fa88e563a7092d (diff)
downloadwix-77b1f6715534192ab143dd9109aacc50fc78e52a.tar.gz
wix-77b1f6715534192ab143dd9109aacc50fc78e52a.tar.bz2
wix-77b1f6715534192ab143dd9109aacc50fc78e52a.zip
Fix CustomActionData names.
Fixes https://github.com/wixtoolset/issues/issues/7189. Also: - Clean up duplicate caDecor.h. - Clean up use of CUSTOM_ACTION_DECORATION.
Diffstat (limited to 'src/ext/NetFx/ca')
-rw-r--r--src/ext/NetFx/ca/caDecor.h13
-rw-r--r--src/ext/NetFx/ca/netfxca.cpp9
-rw-r--r--src/ext/NetFx/ca/precomp.h2
3 files changed, 5 insertions, 19 deletions
diff --git a/src/ext/NetFx/ca/caDecor.h b/src/ext/NetFx/ca/caDecor.h
deleted file mode 100644
index da274650..00000000
--- a/src/ext/NetFx/ca/caDecor.h
+++ /dev/null
@@ -1,13 +0,0 @@
1#pragma once
2// 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.
3
4
5#if defined(_M_ARM64)
6#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"
7#elif defined(_M_AMD64)
8#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"
9#elif defined(_M_ARM)
10#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"
11#else
12#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"
13#endif
diff --git a/src/ext/NetFx/ca/netfxca.cpp b/src/ext/NetFx/ca/netfxca.cpp
index cd086c53..57eb96b1 100644
--- a/src/ext/NetFx/ca/netfxca.cpp
+++ b/src/ext/NetFx/ca/netfxca.cpp
@@ -795,24 +795,23 @@ extern "C" UINT __stdcall SchedNetFx(
795 // Schedule the install custom action 795 // Schedule the install custom action
796 if (pwzInstallCustomActionData && *pwzInstallCustomActionData) 796 if (pwzInstallCustomActionData && *pwzInstallCustomActionData)
797 { 797 {
798 hr = WcaSetProperty(L"NetFxExecuteNativeImageInstall", pwzInstallCustomActionData); 798 hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageInstall"), pwzInstallCustomActionData);
799 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageInstall action"); 799 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageInstall action");
800 800
801 hr = WcaSetProperty(L"NetFxExecuteNativeImageCommitInstall", pwzInstallCustomActionData); 801 hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageCommitInstall"), pwzInstallCustomActionData);
802 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitInstall action"); 802 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitInstall action");
803 } 803 }
804 804
805 // Schedule the uninstall custom action 805 // Schedule the uninstall custom action
806 if (pwzUninstallCustomActionData && *pwzUninstallCustomActionData) 806 if (pwzUninstallCustomActionData && *pwzUninstallCustomActionData)
807 { 807 {
808 hr = WcaSetProperty(L"NetFxExecuteNativeImageUninstall", pwzUninstallCustomActionData); 808 hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageUninstall"), pwzUninstallCustomActionData);
809 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageUninstall action"); 809 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageUninstall action");
810 810
811 hr = WcaSetProperty(L"NetFxExecuteNativeImageCommitUninstall", pwzUninstallCustomActionData); 811 hr = WcaSetProperty(CUSTOM_ACTION_DECORATION(L"NetFxExecuteNativeImageCommitUninstall"), pwzUninstallCustomActionData);
812 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitUninstall action"); 812 ExitOnFailure(hr, "failed to schedule NetFxExecuteNativeImageCommitUninstall action");
813 } 813 }
814 814
815
816LExit: 815LExit:
817 ReleaseStr(pwzInstallCustomActionData); 816 ReleaseStr(pwzInstallCustomActionData);
818 ReleaseStr(pwzUninstallCustomActionData); 817 ReleaseStr(pwzUninstallCustomActionData);
diff --git a/src/ext/NetFx/ca/precomp.h b/src/ext/NetFx/ca/precomp.h
index db618bce..aa90be4f 100644
--- a/src/ext/NetFx/ca/precomp.h
+++ b/src/ext/NetFx/ca/precomp.h
@@ -14,5 +14,5 @@
14#include "dirutil.h" 14#include "dirutil.h"
15#include "guidutil.h" 15#include "guidutil.h"
16 16
17#include "caDecor.h" 17#include "..\..\caDecor.h"
18#include "cost.h" 18#include "cost.h"