diff options
Diffstat (limited to 'src/ext/NetFx/ca/netfxca.cpp')
-rw-r--r-- | src/ext/NetFx/ca/netfxca.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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 | |||
816 | LExit: | 815 | LExit: |
817 | ReleaseStr(pwzInstallCustomActionData); | 816 | ReleaseStr(pwzInstallCustomActionData); |
818 | ReleaseStr(pwzUninstallCustomActionData); | 817 | ReleaseStr(pwzUninstallCustomActionData); |