aboutsummaryrefslogtreecommitdiff
path: root/src/ext/ComPlus/ca/cpsubsexec.cpp
diff options
context:
space:
mode:
authorBevan Weiss <bevan.weiss@gmail.com>2024-07-28 00:12:25 +1000
committerRob Mensching <rob@firegiant.com>2024-12-26 08:26:26 -0800
commitee41358bb583619ef4fe6707958dc3c6c62cd13f (patch)
tree04d702b39cd37be9b6c66c897f6c774a7dd1c0a6 /src/ext/ComPlus/ca/cpsubsexec.cpp
parent85745284cd76858f8699190c53719607e0058712 (diff)
downloadwix-ee41358bb583619ef4fe6707958dc3c6c62cd13f.tar.gz
wix-ee41358bb583619ef4fe6707958dc3c6c62cd13f.tar.bz2
wix-ee41358bb583619ef4fe6707958dc3c6c62cd13f.zip
Fix up COM+ to be back in working order under Wix4+
Table names updated for Wix4 prefix. Custom action names similarly updated. Table names Wix4ComPlusUserInApplicationRole, Wix4ComPlusGroupInApplicationRole and Wix4ComPlusApplicationRoleProperty had to be shortened to fit within MSI 31 character table name limit. Migrated from fixed GUID for RegistrationHelper to use CLSIDFromProgID in an attempt to fix behaviour under .NET 4+ DLLs. Added setting of Partition enable if a Partition is configured in authoring, new Windows config has Partitions disabled by default, and they don't work at all under Windows workstation (non-server) versions. Added a new Runtime condition for `RequireWindowsServer` which will skip execution of Runtime test on workstation/desktop OSes, since COM+ Partitions only work correctly under Windows Server. Quite a lot of basic typos fixed also. Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src/ext/ComPlus/ca/cpsubsexec.cpp')
-rw-r--r--src/ext/ComPlus/ca/cpsubsexec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/ComPlus/ca/cpsubsexec.cpp b/src/ext/ComPlus/ca/cpsubsexec.cpp
index bbcf9853..ab32b856 100644
--- a/src/ext/ComPlus/ca/cpsubsexec.cpp
+++ b/src/ext/ComPlus/ca/cpsubsexec.cpp
@@ -54,7 +54,7 @@ HRESULT CpiConfigureSubscriptions(
54 hr = CpiActionStartMessage(ppwzData, FALSE); 54 hr = CpiActionStartMessage(ppwzData, FALSE);
55 ExitOnFailure(hr, "Failed to send action start message"); 55 ExitOnFailure(hr, "Failed to send action start message");
56 56
57 // ger count 57 // get count
58 int iCnt = 0; 58 int iCnt = 0;
59 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt); 59 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt);
60 ExitOnFailure(hr, "Failed to read count"); 60 ExitOnFailure(hr, "Failed to read count");
@@ -127,7 +127,7 @@ HRESULT CpiRollbackConfigureSubscriptions(
127 hr = CpiActionStartMessage(ppwzData, NULL == pRollbackDataList); 127 hr = CpiActionStartMessage(ppwzData, NULL == pRollbackDataList);
128 ExitOnFailure(hr, "Failed to send action start message"); 128 ExitOnFailure(hr, "Failed to send action start message");
129 129
130 // ger count 130 // get count
131 int iCnt = 0; 131 int iCnt = 0;
132 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt); 132 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt);
133 ExitOnFailure(hr, "Failed to read count"); 133 ExitOnFailure(hr, "Failed to read count");