aboutsummaryrefslogtreecommitdiff
path: root/src/ext/ComPlus/ca/cpapproleexec.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/cpapproleexec.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 '')
-rw-r--r--src/ext/ComPlus/ca/cpapproleexec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/ComPlus/ca/cpapproleexec.cpp b/src/ext/ComPlus/ca/cpapproleexec.cpp
index e3b71e93..4b38b23c 100644
--- a/src/ext/ComPlus/ca/cpapproleexec.cpp
+++ b/src/ext/ComPlus/ca/cpapproleexec.cpp
@@ -74,7 +74,7 @@ HRESULT CpiConfigureApplicationRoles(
74 hr = CpiActionStartMessage(ppwzData, FALSE); 74 hr = CpiActionStartMessage(ppwzData, FALSE);
75 ExitOnFailure(hr, "Failed to send action start message"); 75 ExitOnFailure(hr, "Failed to send action start message");
76 76
77 // ger count 77 // get count
78 int iCnt = 0; 78 int iCnt = 0;
79 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt); 79 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt);
80 ExitOnFailure(hr, "Failed to read count"); 80 ExitOnFailure(hr, "Failed to read count");
@@ -218,7 +218,7 @@ HRESULT CpiConfigureUsersInApplicationRoles(
218 hr = CpiActionStartMessage(ppwzData, FALSE); 218 hr = CpiActionStartMessage(ppwzData, FALSE);
219 ExitOnFailure(hr, "Failed to send action start message"); 219 ExitOnFailure(hr, "Failed to send action start message");
220 220
221 // ger count 221 // get count
222 int iCnt = 0; 222 int iCnt = 0;
223 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt); 223 hr = WcaReadIntegerFromCaData(ppwzData, &iCnt);
224 ExitOnFailure(hr, "Failed to read count"); 224 ExitOnFailure(hr, "Failed to read count");