From ee41358bb583619ef4fe6707958dc3c6c62cd13f Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Sun, 28 Jul 2024 00:12:25 +1000 Subject: 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 --- src/ext/ComPlus/ca/cppartsched.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/ext/ComPlus/ca/cppartsched.cpp') diff --git a/src/ext/ComPlus/ca/cppartsched.cpp b/src/ext/ComPlus/ca/cppartsched.cpp index d4065d34..b4c1c314 100644 --- a/src/ext/ComPlus/ca/cppartsched.cpp +++ b/src/ext/ComPlus/ca/cppartsched.cpp @@ -13,7 +13,7 @@ LPCWSTR vcsPartitionPropertyQuery = L"SELECT `Name`, `Value` FROM `Wix4ComPlusPartitionProperty` WHERE `Partition_` = ?"; LPCWSTR vcsPartitionUserQuery = - L"SELECT `PartitionUser`, `Partition_`, `ComPlusPartitionUser`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusPartitionUser`, `Wix4User` WHERE `User_` = `User`"; + L"SELECT `PartitionUser`, `Partition_`, `Wix4ComPlusPartitionUser`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusPartitionUser`, `Wix4User` WHERE `User_` = `User`"; enum ePartitionUserQuery { puqPartitionUser = 1, puqPartition, puqComponent, puqDomain, puqName }; @@ -192,7 +192,7 @@ HRESULT CpiPartitionsVerifyInstall( if (!pItm->fReferencedForInstall && !(pItm->fHasComponent && WcaIsInstalling(pItm->isInstalled, pItm->isAction))) continue; - // if the partition is referensed and is not a locater, it must be installed + // if the partition is referenced and is not a locater, it must be installed if (pItm->fReferencedForInstall && pItm->fHasComponent && !CpiWillBeInstalled(pItm->isInstalled, pItm->isAction)) MessageExitOnFailure(hr = E_FAIL, msierrComPlusPartitionDependency, "A partition is used by another entity being installed, but is not installed itself, key: %S", pItm->wzKey); @@ -281,7 +281,7 @@ HRESULT CpiPartitionsVerifyInstall( { case IDCANCEL: case IDABORT: - ExitOnFailure(hr = E_FAIL, "A partition with a conflictiong name or id exists, key: %S", pItm->wzKey); + ExitOnFailure(hr = E_FAIL, "A partition with a conflicting name or id exists, key: %S", pItm->wzKey); break; case IDRETRY: break; @@ -403,7 +403,7 @@ HRESULT CpiPartitionsInstall( int iActionType; // add action text - hr = CpiAddActionTextToActionData(L"CreateComPlusPartitions", ppwzActionData); + hr = CpiAddActionTextToActionData(CUSTOM_ACTION_DECORATION(L"CreateComPlusPartitions"), ppwzActionData); ExitOnFailure(hr, "Failed to add action text to custom action data"); // add partition count to action data @@ -455,7 +455,7 @@ HRESULT CpiPartitionsUninstall( int iActionType; // add action text - hr = CpiAddActionTextToActionData(L"RemoveComPlusPartitions", ppwzActionData); + hr = CpiAddActionTextToActionData(CUSTOM_ACTION_DECORATION(L"RemoveComPlusPartitions"), ppwzActionData); ExitOnFailure(hr, "Failed to add action text to custom action data"); // add partition count to action data @@ -735,7 +735,7 @@ HRESULT CpiPartitionUsersInstall( int iActionType; // add action text - hr = CpiAddActionTextToActionData(L"AddComPlusPartitionUsers", ppwzActionData); + hr = CpiAddActionTextToActionData(CUSTOM_ACTION_DECORATION(L"AddComPlusPartitionUsers"), ppwzActionData); ExitOnFailure(hr, "Failed to add action text to custom action data"); // add partition count to action data @@ -787,7 +787,7 @@ HRESULT CpiPartitionUsersUninstall( int iActionType; // add action text - hr = CpiAddActionTextToActionData(L"RemoveComPlusPartitionUsers", ppwzActionData); + hr = CpiAddActionTextToActionData(CUSTOM_ACTION_DECORATION(L"RemoveComPlusPartitionUsers"), ppwzActionData); ExitOnFailure(hr, "Failed to add action text to custom action data"); // add partition count to action data -- cgit v1.2.3-55-g6feb