summaryrefslogtreecommitdiff
path: root/src/ext/ComPlus/ca/cpexec.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/cpexec.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/cpexec.cpp')
-rw-r--r--src/ext/ComPlus/ca/cpexec.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ext/ComPlus/ca/cpexec.cpp b/src/ext/ComPlus/ca/cpexec.cpp
index 9b1691fc..a915dd34 100644
--- a/src/ext/ComPlus/ca/cpexec.cpp
+++ b/src/ext/ComPlus/ca/cpexec.cpp
@@ -180,7 +180,7 @@ LExit:
180 if (INVALID_HANDLE_VALUE != hRollbackFile) 180 if (INVALID_HANDLE_VALUE != hRollbackFile)
181 ::CloseHandle(hRollbackFile); 181 ::CloseHandle(hRollbackFile);
182 182
183 // unitialize 183 // uninitialize
184 CpiExecFinalize(); 184 CpiExecFinalize();
185 185
186 if (fInitializedCom) 186 if (fInitializedCom)
@@ -258,7 +258,7 @@ LExit:
258 if (INVALID_HANDLE_VALUE != hRollbackFile) 258 if (INVALID_HANDLE_VALUE != hRollbackFile)
259 ::CloseHandle(hRollbackFile); 259 ::CloseHandle(hRollbackFile);
260 260
261 // unitialize 261 // uninitialize
262 CpiExecFinalize(); 262 CpiExecFinalize();
263 263
264 if (fInitializedCom) 264 if (fInitializedCom)
@@ -415,7 +415,7 @@ LExit:
415 if (prdSubscriptions) 415 if (prdSubscriptions)
416 CpiFreeRollbackDataList(prdSubscriptions); 416 CpiFreeRollbackDataList(prdSubscriptions);
417 417
418 // unitialize 418 // uninitialize
419 CpiExecFinalize(); 419 CpiExecFinalize();
420 420
421 if (fInitializedCom) 421 if (fInitializedCom)
@@ -521,7 +521,7 @@ LExit:
521 if (INVALID_HANDLE_VALUE != hRollbackFile) 521 if (INVALID_HANDLE_VALUE != hRollbackFile)
522 ::CloseHandle(hRollbackFile); 522 ::CloseHandle(hRollbackFile);
523 523
524 // unitialize 524 // uninitialize
525 CpiExecFinalize(); 525 CpiExecFinalize();
526 526
527 if (fInitializedCom) 527 if (fInitializedCom)
@@ -670,7 +670,7 @@ LExit:
670 if (prdSubscriptions) 670 if (prdSubscriptions)
671 CpiFreeRollbackDataList(prdSubscriptions); 671 CpiFreeRollbackDataList(prdSubscriptions);
672 672
673 // unitialize 673 // uninitialize
674 CpiExecFinalize(); 674 CpiExecFinalize();
675 675
676 if (fInitializedCom) 676 if (fInitializedCom)