1 files changed, 26 insertions, 26 deletions
diff --git a/src/ext/ComPlus/ca/cputilsched.cpp b/src/ext/ComPlus/ca/cputilsched.cpp
index 4a2fdfc6..760b5ec9 100644
--- a/src/ext/ComPlus/ca/cputilsched.cpp
+++ b/src/ext/ComPlus/ca/cputilsched.cpp
@@ -53,31 +53,31 @@ void CpiSchedInitialize()
    // tables
    giTables = 0;
-    if (S_OK == WcaTableExists(L"ComPlusPartition"))               giTables |= cptComPlusPartition;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusPartition"))               giTables |= cptComPlusPartition;
-    if (S_OK == WcaTableExists(L"ComPlusPartitionProperty"))       giTables |= cptComPlusPartitionProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusPartitionProperty"))       giTables |= cptComPlusPartitionProperty;
-    if (S_OK == WcaTableExists(L"ComPlusPartitionRole"))           giTables |= cptComPlusPartitionRole;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusPartitionRole"))           giTables |= cptComPlusPartitionRole;
-    if (S_OK == WcaTableExists(L"ComPlusUserInPartitionRole"))     giTables |= cptComPlusUserInPartitionRole;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusUserInPartitionRole"))     giTables |= cptComPlusUserInPartitionRole;
-    if (S_OK == WcaTableExists(L"ComPlusGroupInPartitionRole"))    giTables |= cptComPlusGroupInPartitionRole;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusGroupInPartitionRole"))    giTables |= cptComPlusGroupInPartitionRole;
-    if (S_OK == WcaTableExists(L"ComPlusPartitionUser"))           giTables |= cptComPlusPartitionUser;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusPartitionUser"))           giTables |= cptComPlusPartitionUser;
-    if (S_OK == WcaTableExists(L"ComPlusApplication"))             giTables |= cptComPlusApplication;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusApplication"))             giTables |= cptComPlusApplication;
-    if (S_OK == WcaTableExists(L"ComPlusApplicationProperty"))     giTables |= cptComPlusApplicationProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusApplicationProperty"))     giTables |= cptComPlusApplicationProperty;
-    if (S_OK == WcaTableExists(L"ComPlusApplicationRole"))         giTables |= cptComPlusApplicationRole;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusApplicationRole"))         giTables |= cptComPlusApplicationRole;
-    if (S_OK == WcaTableExists(L"ComPlusApplicationRoleProperty")) giTables |= cptComPlusApplicationRoleProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusAppRoleProperty"))         giTables |= cptComPlusApplicationRoleProperty;
-    if (S_OK == WcaTableExists(L"ComPlusUserInApplicationRole"))   giTables |= cptComPlusUserInApplicationRole;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusUserInAppRole"))           giTables |= cptComPlusUserInApplicationRole;
-    if (S_OK == WcaTableExists(L"ComPlusGroupInApplicationRole"))  giTables |= cptComPlusGroupInApplicationRole;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusGroupInAppRole"))          giTables |= cptComPlusGroupInApplicationRole;
-    if (S_OK == WcaTableExists(L"ComPlusAssembly"))                giTables |= cptComPlusAssembly;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusAssembly"))                giTables |= cptComPlusAssembly;
-    if (S_OK == WcaTableExists(L"ComPlusAssemblyDependency"))      giTables |= cptComPlusAssemblyDependency;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusAssemblyDependency"))      giTables |= cptComPlusAssemblyDependency;
-    if (S_OK == WcaTableExists(L"ComPlusComponent"))               giTables |= cptComPlusComponent;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusComponent"))               giTables |= cptComPlusComponent;
-    if (S_OK == WcaTableExists(L"ComPlusComponentProperty"))       giTables |= cptComPlusComponentProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusComponentProperty"))       giTables |= cptComPlusComponentProperty;
-    if (S_OK == WcaTableExists(L"ComPlusRoleForComponent"))        giTables |= cptComPlusRoleForComponent;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusRoleForComponent"))        giTables |= cptComPlusRoleForComponent;
-    if (S_OK == WcaTableExists(L"ComPlusInterface"))               giTables |= cptComPlusInterface;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusInterface"))               giTables |= cptComPlusInterface;
-    if (S_OK == WcaTableExists(L"ComPlusInterfaceProperty"))       giTables |= cptComPlusInterfaceProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusInterfaceProperty"))       giTables |= cptComPlusInterfaceProperty;
-    if (S_OK == WcaTableExists(L"ComPlusRoleForInterface"))        giTables |= cptComPlusRoleForInterface;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusRoleForInterface"))        giTables |= cptComPlusRoleForInterface;
-    if (S_OK == WcaTableExists(L"ComPlusMethod"))                  giTables |= cptComPlusMethod;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusMethod"))                  giTables |= cptComPlusMethod;
-    if (S_OK == WcaTableExists(L"ComPlusMethodProperty"))          giTables |= cptComPlusMethodProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusMethodProperty"))          giTables |= cptComPlusMethodProperty;
-    if (S_OK == WcaTableExists(L"ComPlusRoleForMethod"))           giTables |= cptComPlusRoleForMethod;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusRoleForMethod"))           giTables |= cptComPlusRoleForMethod;
-    if (S_OK == WcaTableExists(L"ComPlusSubscription"))            giTables |= cptComPlusSubscription;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusSubscription"))            giTables |= cptComPlusSubscription;
-    if (S_OK == WcaTableExists(L"ComPlusSubscriptionProperty"))    giTables |= cptComPlusSubscriptionProperty;
+    if (S_OK == WcaTableExists(L"Wix4ComPlusSubscriptionProperty"))    giTables |= cptComPlusSubscriptionProperty;
 }
 void CpiSchedFinalize()
@@ -137,7 +137,7 @@ HRESULT CpiSchedGetCatalogCollection(
    hr = CpiSchedGetAdminCatalog(&piCatalog);
    ExitOnFailure(hr, "Failed to get COM+ admin catalog");
-    // get collecton from catalog
+    // get collection from catalog
    hr = piCatalog->GetCollection(bstrName, &piDisp);
    ExitOnFailure(hr, "Failed to get collection");

diff --git a/src/ext/ComPlus/ca/cputilsched.cpp b/src/ext/ComPlus/ca/cputilsched.cpp index 4a2fdfc6..760b5ec9 100644 --- a/src/ext/ComPlus/ca/cputilsched.cpp +++ b/src/ext/ComPlus/ca/cputilsched.cpp
@@ -53,31 +53,31 @@ void CpiSchedInitialize()
53	// tables	53	// tables
54	giTables = 0;	54	giTables = 0;
55		55
56	if (S_OK == WcaTableExists(L"ComPlusPartition")) giTables \|= cptComPlusPartition;	56	if (S_OK == WcaTableExists(L"Wix4ComPlusPartition")) giTables \|= cptComPlusPartition;
57	if (S_OK == WcaTableExists(L"ComPlusPartitionProperty")) giTables \|= cptComPlusPartitionProperty;	57	if (S_OK == WcaTableExists(L"Wix4ComPlusPartitionProperty")) giTables \|= cptComPlusPartitionProperty;
58	if (S_OK == WcaTableExists(L"ComPlusPartitionRole")) giTables \|= cptComPlusPartitionRole;	58	if (S_OK == WcaTableExists(L"Wix4ComPlusPartitionRole")) giTables \|= cptComPlusPartitionRole;
59	if (S_OK == WcaTableExists(L"ComPlusUserInPartitionRole")) giTables \|= cptComPlusUserInPartitionRole;	59	if (S_OK == WcaTableExists(L"Wix4ComPlusUserInPartitionRole")) giTables \|= cptComPlusUserInPartitionRole;
60	if (S_OK == WcaTableExists(L"ComPlusGroupInPartitionRole")) giTables \|= cptComPlusGroupInPartitionRole;	60	if (S_OK == WcaTableExists(L"Wix4ComPlusGroupInPartitionRole")) giTables \|= cptComPlusGroupInPartitionRole;
61	if (S_OK == WcaTableExists(L"ComPlusPartitionUser")) giTables \|= cptComPlusPartitionUser;	61	if (S_OK == WcaTableExists(L"Wix4ComPlusPartitionUser")) giTables \|= cptComPlusPartitionUser;
62	if (S_OK == WcaTableExists(L"ComPlusApplication")) giTables \|= cptComPlusApplication;	62	if (S_OK == WcaTableExists(L"Wix4ComPlusApplication")) giTables \|= cptComPlusApplication;
63	if (S_OK == WcaTableExists(L"ComPlusApplicationProperty")) giTables \|= cptComPlusApplicationProperty;	63	if (S_OK == WcaTableExists(L"Wix4ComPlusApplicationProperty")) giTables \|= cptComPlusApplicationProperty;
64	if (S_OK == WcaTableExists(L"ComPlusApplicationRole")) giTables \|= cptComPlusApplicationRole;	64	if (S_OK == WcaTableExists(L"Wix4ComPlusApplicationRole")) giTables \|= cptComPlusApplicationRole;
65	if (S_OK == WcaTableExists(L"ComPlusApplicationRoleProperty")) giTables \|= cptComPlusApplicationRoleProperty;	65	if (S_OK == WcaTableExists(L"Wix4ComPlusAppRoleProperty")) giTables \|= cptComPlusApplicationRoleProperty;
66	if (S_OK == WcaTableExists(L"ComPlusUserInApplicationRole")) giTables \|= cptComPlusUserInApplicationRole;	66	if (S_OK == WcaTableExists(L"Wix4ComPlusUserInAppRole")) giTables \|= cptComPlusUserInApplicationRole;
67	if (S_OK == WcaTableExists(L"ComPlusGroupInApplicationRole")) giTables \|= cptComPlusGroupInApplicationRole;	67	if (S_OK == WcaTableExists(L"Wix4ComPlusGroupInAppRole")) giTables \|= cptComPlusGroupInApplicationRole;
68	if (S_OK == WcaTableExists(L"ComPlusAssembly")) giTables \|= cptComPlusAssembly;	68	if (S_OK == WcaTableExists(L"Wix4ComPlusAssembly")) giTables \|= cptComPlusAssembly;
69	if (S_OK == WcaTableExists(L"ComPlusAssemblyDependency")) giTables \|= cptComPlusAssemblyDependency;	69	if (S_OK == WcaTableExists(L"Wix4ComPlusAssemblyDependency")) giTables \|= cptComPlusAssemblyDependency;
70	if (S_OK == WcaTableExists(L"ComPlusComponent")) giTables \|= cptComPlusComponent;	70	if (S_OK == WcaTableExists(L"Wix4ComPlusComponent")) giTables \|= cptComPlusComponent;
71	if (S_OK == WcaTableExists(L"ComPlusComponentProperty")) giTables \|= cptComPlusComponentProperty;	71	if (S_OK == WcaTableExists(L"Wix4ComPlusComponentProperty")) giTables \|= cptComPlusComponentProperty;
72	if (S_OK == WcaTableExists(L"ComPlusRoleForComponent")) giTables \|= cptComPlusRoleForComponent;	72	if (S_OK == WcaTableExists(L"Wix4ComPlusRoleForComponent")) giTables \|= cptComPlusRoleForComponent;
73	if (S_OK == WcaTableExists(L"ComPlusInterface")) giTables \|= cptComPlusInterface;	73	if (S_OK == WcaTableExists(L"Wix4ComPlusInterface")) giTables \|= cptComPlusInterface;
74	if (S_OK == WcaTableExists(L"ComPlusInterfaceProperty")) giTables \|= cptComPlusInterfaceProperty;	74	if (S_OK == WcaTableExists(L"Wix4ComPlusInterfaceProperty")) giTables \|= cptComPlusInterfaceProperty;
75	if (S_OK == WcaTableExists(L"ComPlusRoleForInterface")) giTables \|= cptComPlusRoleForInterface;	75	if (S_OK == WcaTableExists(L"Wix4ComPlusRoleForInterface")) giTables \|= cptComPlusRoleForInterface;
76	if (S_OK == WcaTableExists(L"ComPlusMethod")) giTables \|= cptComPlusMethod;	76	if (S_OK == WcaTableExists(L"Wix4ComPlusMethod")) giTables \|= cptComPlusMethod;
77	if (S_OK == WcaTableExists(L"ComPlusMethodProperty")) giTables \|= cptComPlusMethodProperty;	77	if (S_OK == WcaTableExists(L"Wix4ComPlusMethodProperty")) giTables \|= cptComPlusMethodProperty;
78	if (S_OK == WcaTableExists(L"ComPlusRoleForMethod")) giTables \|= cptComPlusRoleForMethod;	78	if (S_OK == WcaTableExists(L"Wix4ComPlusRoleForMethod")) giTables \|= cptComPlusRoleForMethod;
79	if (S_OK == WcaTableExists(L"ComPlusSubscription")) giTables \|= cptComPlusSubscription;	79	if (S_OK == WcaTableExists(L"Wix4ComPlusSubscription")) giTables \|= cptComPlusSubscription;
80	if (S_OK == WcaTableExists(L"ComPlusSubscriptionProperty")) giTables \|= cptComPlusSubscriptionProperty;	80	if (S_OK == WcaTableExists(L"Wix4ComPlusSubscriptionProperty")) giTables \|= cptComPlusSubscriptionProperty;
81	}	81	}
82		82
83	void CpiSchedFinalize()	83	void CpiSchedFinalize()
@@ -137,7 +137,7 @@ HRESULT CpiSchedGetCatalogCollection(
137	hr = CpiSchedGetAdminCatalog(&piCatalog);	137	hr = CpiSchedGetAdminCatalog(&piCatalog);
138	ExitOnFailure(hr, "Failed to get COM+ admin catalog");	138	ExitOnFailure(hr, "Failed to get COM+ admin catalog");
139		139
140	// get collecton from catalog	140	// get collection from catalog
141	hr = piCatalog->GetCollection(bstrName, &piDisp);	141	hr = piCatalog->GetCollection(bstrName, &piDisp);
142	ExitOnFailure(hr, "Failed to get collection");	142	ExitOnFailure(hr, "Failed to get collection");
143		143