ComPlus CUSTOM_ACTION_DECORATION

Signed-off-by: Bevan Weiss <[email protected]>
wixtoolset · Jul 15, 2024 · 4496c46 · 4496c46
1 parent 733886e
commit 4496c46
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/src/ext/ComPlus/ca/cpsched.cpp b/src/ext/ComPlus/ca/cpsched.cpp
@@ -3,31 +3,17 @@
 #include "precomp.h"
 
 
-#ifdef _WIN64
-#define CP_COMPLUSROLLBACKINSTALLPREPARE    L"ComPlusRollbackInstallPrepare_64"
-#define CP_COMPLUSINSTALLPREPARE            L"ComPlusInstallPrepare_64"
-#define CP_COMPLUSROLLBACKINSTALLEXECUTE    L"ComPlusRollbackInstallExecute_64"
-#define CP_COMPLUSINSTALLEXECUTE            L"ComPlusInstallExecute_64"
-#define CP_COMPLUSINSTALLEXECUTECOMMIT      L"ComPlusInstallExecuteCommit_64"
-#define CP_COMPLUSINSTALLCOMMIT             L"ComPlusInstallCommit_64"
-#define CP_COMPLUSROLLBACKINSTALLPREPARE    L"ComPlusRollbackInstallPrepare_64"
-#define CP_COMPLUSINSTALLPREPARE            L"ComPlusInstallPrepare_64"
-#define CP_COMPLUSROLLBACKUNINSTALLEXECUTE  L"ComPlusRollbackUninstallExecute_64"
-#define CP_COMPLUSUNINSTALLEXECUTE          L"ComPlusUninstallExecute_64"
-#define CP_COMPLUSINSTALLCOMMIT             L"ComPlusInstallCommit_64"
-#else
-#define CP_COMPLUSROLLBACKINSTALLPREPARE    L"ComPlusRollbackInstallPrepare"
-#define CP_COMPLUSINSTALLPREPARE            L"ComPlusInstallPrepare"
-#define CP_COMPLUSROLLBACKINSTALLEXECUTE    L"ComPlusRollbackInstallExecute"
-#define CP_COMPLUSINSTALLEXECUTE            L"ComPlusInstallExecute"
-#define CP_COMPLUSINSTALLEXECUTECOMMIT      L"ComPlusInstallExecuteCommit"
-#define CP_COMPLUSINSTALLCOMMIT             L"ComPlusInstallCommit"
-#define CP_COMPLUSROLLBACKINSTALLPREPARE    L"ComPlusRollbackInstallPrepare"
-#define CP_COMPLUSINSTALLPREPARE            L"ComPlusInstallPrepare"
-#define CP_COMPLUSROLLBACKUNINSTALLEXECUTE  L"ComPlusRollbackUninstallExecute"
-#define CP_COMPLUSUNINSTALLEXECUTE          L"ComPlusUninstallExecute"
-#define CP_COMPLUSINSTALLCOMMIT             L"ComPlusInstallCommit"
-#endif
+#define CP_COMPLUSROLLBACKINSTALLPREPARE    CUSTOM_ACTION_DECORATION(L"ComPlusRollbackInstallPrepare")
+#define CP_COMPLUSINSTALLPREPARE            CUSTOM_ACTION_DECORATION(L"ComPlusInstallPrepare")
+#define CP_COMPLUSROLLBACKINSTALLEXECUTE    CUSTOM_ACTION_DECORATION(L"ComPlusRollbackInstallExecute")
+#define CP_COMPLUSINSTALLEXECUTE            CUSTOM_ACTION_DECORATION(L"ComPlusInstallExecute")
+#define CP_COMPLUSINSTALLEXECUTECOMMIT      CUSTOM_ACTION_DECORATION(L"ComPlusInstallExecuteCommit")
+#define CP_COMPLUSINSTALLCOMMIT             CUSTOM_ACTION_DECORATION(L"ComPlusInstallCommit")
+#define CP_COMPLUSROLLBACKINSTALLPREPARE    CUSTOM_ACTION_DECORATION(L"ComPlusRollbackInstallPrepare")
+#define CP_COMPLUSINSTALLPREPARE            CUSTOM_ACTION_DECORATION(L"ComPlusInstallPrepare")
+#define CP_COMPLUSROLLBACKUNINSTALLEXECUTE  CUSTOM_ACTION_DECORATION(L"ComPlusRollbackUninstallExecute")
+#define CP_COMPLUSUNINSTALLEXECUTE          CUSTOM_ACTION_DECORATION(L"ComPlusUninstallExecute")
+#define CP_COMPLUSINSTALLCOMMIT             CUSTOM_ACTION_DECORATION(L"ComPlusInstallCommit")
 
 /********************************************************************
  ConfigureComPlusInstall - CUSTOM ACTION ENTRY POINT for installing COM+ components

diff --git a/src/ext/ComPlus/ca/precomp.h b/src/ext/ComPlus/ca/precomp.h
@@ -31,3 +31,5 @@
 #include "cpapprolesched.h"
 #include "cpasmsched.h"
 #include "cpsubssched.h"
+
+#include "..\..\caDecor.h"