diff options
Diffstat (limited to 'src/ca/cpasmsched.cpp')
-rw-r--r-- | src/ca/cpasmsched.cpp | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/ca/cpasmsched.cpp b/src/ca/cpasmsched.cpp index 97ecff61..2d0573a5 100644 --- a/src/ca/cpasmsched.cpp +++ b/src/ca/cpasmsched.cpp | |||
@@ -169,19 +169,19 @@ static HRESULT InterfacesRead( | |||
169 | LPCWSTR pwzCompKey, | 169 | LPCWSTR pwzCompKey, |
170 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, | 170 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, |
171 | CPI_ASSEMBLY* pAsm, | 171 | CPI_ASSEMBLY* pAsm, |
172 | CPI_COMPONENT* pComp | 172 | CPISCHED_COMPONENT* pComp |
173 | ); | 173 | ); |
174 | static HRESULT MethodsRead( | 174 | static HRESULT MethodsRead( |
175 | LPCWSTR pwzIntfKey, | 175 | LPCWSTR pwzIntfKey, |
176 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, | 176 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, |
177 | CPI_ASSEMBLY* pAsm, | 177 | CPI_ASSEMBLY* pAsm, |
178 | CPI_INTERFACE* pIntf | 178 | CPISCHED_INTERFACE* pIntf |
179 | ); | 179 | ); |
180 | static HRESULT RoleAssignmentsRead( | 180 | static HRESULT RoleAssignmentsRead( |
181 | LPCWSTR pwzQuery, | 181 | LPCWSTR pwzQuery, |
182 | LPCWSTR pwzKey, | 182 | LPCWSTR pwzKey, |
183 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, | 183 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, |
184 | CPI_ROLE_ASSIGNMENT** ppRoleList, | 184 | CPISCHED_ROLE_ASSIGNMENT** ppRoleList, |
185 | int* piInstallCount, | 185 | int* piInstallCount, |
186 | int* piUninstallCount | 186 | int* piUninstallCount |
187 | ); | 187 | ); |
@@ -238,21 +238,21 @@ static HRESULT AddRoleAssignmentsToActionData( | |||
238 | LPWSTR* ppwzActionData | 238 | LPWSTR* ppwzActionData |
239 | ); | 239 | ); |
240 | static HRESULT AddComponentToActionData( | 240 | static HRESULT AddComponentToActionData( |
241 | CPI_COMPONENT* pItm, | 241 | CPISCHED_COMPONENT* pItm, |
242 | BOOL fInstall, | 242 | BOOL fInstall, |
243 | BOOL fProps, | 243 | BOOL fProps, |
244 | BOOL fRoles, | 244 | BOOL fRoles, |
245 | LPWSTR* ppwzActionData | 245 | LPWSTR* ppwzActionData |
246 | ); | 246 | ); |
247 | static HRESULT AddInterfaceToActionData( | 247 | static HRESULT AddInterfaceToActionData( |
248 | CPI_INTERFACE* pItm, | 248 | CPISCHED_INTERFACE* pItm, |
249 | BOOL fInstall, | 249 | BOOL fInstall, |
250 | BOOL fProps, | 250 | BOOL fProps, |
251 | BOOL fRoles, | 251 | BOOL fRoles, |
252 | LPWSTR* ppwzActionData | 252 | LPWSTR* ppwzActionData |
253 | ); | 253 | ); |
254 | static HRESULT AddMethodToActionData( | 254 | static HRESULT AddMethodToActionData( |
255 | CPI_METHOD* pItm, | 255 | CPISCHED_METHOD* pItm, |
256 | BOOL fInstall, | 256 | BOOL fInstall, |
257 | BOOL fProps, | 257 | BOOL fProps, |
258 | BOOL fRoles, | 258 | BOOL fRoles, |
@@ -261,7 +261,7 @@ static HRESULT AddMethodToActionData( | |||
261 | static HRESULT AddRolesToActionData( | 261 | static HRESULT AddRolesToActionData( |
262 | int iRoleInstallCount, | 262 | int iRoleInstallCount, |
263 | int iRoleUninstallCount, | 263 | int iRoleUninstallCount, |
264 | CPI_ROLE_ASSIGNMENT* pRoleList, | 264 | CPISCHED_ROLE_ASSIGNMENT* pRoleList, |
265 | BOOL fInstall, | 265 | BOOL fInstall, |
266 | BOOL fRoles, | 266 | BOOL fRoles, |
267 | LPWSTR* ppwzActionData | 267 | LPWSTR* ppwzActionData |
@@ -284,16 +284,16 @@ static void ModuleFree( | |||
284 | CPI_MODULE* pItm | 284 | CPI_MODULE* pItm |
285 | ); | 285 | ); |
286 | static void ComponentsFreeList( | 286 | static void ComponentsFreeList( |
287 | CPI_COMPONENT* pList | 287 | CPISCHED_COMPONENT* pList |
288 | ); | 288 | ); |
289 | static void InterfacesFreeList( | 289 | static void InterfacesFreeList( |
290 | CPI_INTERFACE* pList | 290 | CPISCHED_INTERFACE* pList |
291 | ); | 291 | ); |
292 | static void MethodsFreeList( | 292 | static void MethodsFreeList( |
293 | CPI_METHOD* pList | 293 | CPISCHED_METHOD* pList |
294 | ); | 294 | ); |
295 | static void RoleAssignmentsFreeList( | 295 | static void RoleAssignmentsFreeList( |
296 | CPI_ROLE_ASSIGNMENT* pList | 296 | CPISCHED_ROLE_ASSIGNMENT* pList |
297 | ); | 297 | ); |
298 | 298 | ||
299 | 299 | ||
@@ -686,7 +686,7 @@ LExit: | |||
686 | 686 | ||
687 | HRESULT CpiGetSubscriptionsCollForComponent( | 687 | HRESULT CpiGetSubscriptionsCollForComponent( |
688 | CPI_ASSEMBLY* pAsm, | 688 | CPI_ASSEMBLY* pAsm, |
689 | CPI_COMPONENT* pComp, | 689 | CPISCHED_COMPONENT* pComp, |
690 | ICatalogCollection** ppiSubsColl | 690 | ICatalogCollection** ppiSubsColl |
691 | ) | 691 | ) |
692 | { | 692 | { |
@@ -713,7 +713,7 @@ HRESULT CpiGetSubscriptionsCollForComponent( | |||
713 | ExitFunction(); // exit with hr = S_FALSE | 713 | ExitFunction(); // exit with hr = S_FALSE |
714 | 714 | ||
715 | // get roles collection | 715 | // get roles collection |
716 | hr = CpiGetCatalogCollection(piCompColl, piCompObj, L"SubscriptionsForComponent", &pComp->piSubsColl); | 716 | hr = CpiSchedGetCatalogCollection(piCompColl, piCompObj, L"SubscriptionsForComponent", &pComp->piSubsColl); |
717 | ExitOnFailure(hr, "Failed to get subscriptions collection"); | 717 | ExitOnFailure(hr, "Failed to get subscriptions collection"); |
718 | } | 718 | } |
719 | 719 | ||
@@ -1372,7 +1372,7 @@ static HRESULT ComponentsRead( | |||
1372 | PMSIHANDLE hView; | 1372 | PMSIHANDLE hView; |
1373 | PMSIHANDLE hRec; | 1373 | PMSIHANDLE hRec; |
1374 | PMSIHANDLE hRecKey; | 1374 | PMSIHANDLE hRecKey; |
1375 | CPI_COMPONENT* pItm = NULL; | 1375 | CPISCHED_COMPONENT* pItm = NULL; |
1376 | LPWSTR pwzData = NULL; | 1376 | LPWSTR pwzData = NULL; |
1377 | 1377 | ||
1378 | // create parameter record | 1378 | // create parameter record |
@@ -1390,7 +1390,7 @@ static HRESULT ComponentsRead( | |||
1390 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) | 1390 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) |
1391 | { | 1391 | { |
1392 | // create entry | 1392 | // create entry |
1393 | pItm = (CPI_COMPONENT*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPI_COMPONENT)); | 1393 | pItm = (CPISCHED_COMPONENT*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPISCHED_COMPONENT)); |
1394 | if (!pItm) | 1394 | if (!pItm) |
1395 | ExitFunction1(hr = E_OUTOFMEMORY); | 1395 | ExitFunction1(hr = E_OUTOFMEMORY); |
1396 | 1396 | ||
@@ -1455,14 +1455,14 @@ static HRESULT InterfacesRead( | |||
1455 | LPCWSTR pwzCompKey, | 1455 | LPCWSTR pwzCompKey, |
1456 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, | 1456 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, |
1457 | CPI_ASSEMBLY* pAsm, | 1457 | CPI_ASSEMBLY* pAsm, |
1458 | CPI_COMPONENT* pComp | 1458 | CPISCHED_COMPONENT* pComp |
1459 | ) | 1459 | ) |
1460 | { | 1460 | { |
1461 | HRESULT hr = S_OK; | 1461 | HRESULT hr = S_OK; |
1462 | PMSIHANDLE hView; | 1462 | PMSIHANDLE hView; |
1463 | PMSIHANDLE hRec; | 1463 | PMSIHANDLE hRec; |
1464 | PMSIHANDLE hRecKey; | 1464 | PMSIHANDLE hRecKey; |
1465 | CPI_INTERFACE* pItm = NULL; | 1465 | CPISCHED_INTERFACE* pItm = NULL; |
1466 | LPWSTR pwzData = NULL; | 1466 | LPWSTR pwzData = NULL; |
1467 | 1467 | ||
1468 | // create parameter record | 1468 | // create parameter record |
@@ -1480,7 +1480,7 @@ static HRESULT InterfacesRead( | |||
1480 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) | 1480 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) |
1481 | { | 1481 | { |
1482 | // create entry | 1482 | // create entry |
1483 | pItm = (CPI_INTERFACE*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPI_INTERFACE)); | 1483 | pItm = (CPISCHED_INTERFACE*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPISCHED_INTERFACE)); |
1484 | if (!pItm) | 1484 | if (!pItm) |
1485 | ExitFunction1(hr = E_OUTOFMEMORY); | 1485 | ExitFunction1(hr = E_OUTOFMEMORY); |
1486 | 1486 | ||
@@ -1545,12 +1545,12 @@ static HRESULT MethodsRead( | |||
1545 | LPCWSTR pwzIntfKey, | 1545 | LPCWSTR pwzIntfKey, |
1546 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, | 1546 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, |
1547 | CPI_ASSEMBLY* pAsm, | 1547 | CPI_ASSEMBLY* pAsm, |
1548 | CPI_INTERFACE* pIntf | 1548 | CPISCHED_INTERFACE* pIntf |
1549 | ) | 1549 | ) |
1550 | { | 1550 | { |
1551 | HRESULT hr = S_OK; | 1551 | HRESULT hr = S_OK; |
1552 | PMSIHANDLE hView, hRec, hRecKey; | 1552 | PMSIHANDLE hView, hRec, hRecKey; |
1553 | CPI_METHOD* pItm = NULL; | 1553 | CPISCHED_METHOD* pItm = NULL; |
1554 | LPWSTR pwzData = NULL; | 1554 | LPWSTR pwzData = NULL; |
1555 | 1555 | ||
1556 | // create parameter record | 1556 | // create parameter record |
@@ -1568,7 +1568,7 @@ static HRESULT MethodsRead( | |||
1568 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) | 1568 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) |
1569 | { | 1569 | { |
1570 | // create entry | 1570 | // create entry |
1571 | pItm = (CPI_METHOD*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPI_METHOD)); | 1571 | pItm = (CPISCHED_METHOD*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPISCHED_METHOD)); |
1572 | if (!pItm) | 1572 | if (!pItm) |
1573 | ExitFunction1(hr = E_OUTOFMEMORY); | 1573 | ExitFunction1(hr = E_OUTOFMEMORY); |
1574 | 1574 | ||
@@ -1635,7 +1635,7 @@ static HRESULT RoleAssignmentsRead( | |||
1635 | LPCWSTR pwzQuery, | 1635 | LPCWSTR pwzQuery, |
1636 | LPCWSTR pwzKey, | 1636 | LPCWSTR pwzKey, |
1637 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, | 1637 | CPI_APPLICATION_ROLE_LIST* pAppRoleList, |
1638 | CPI_ROLE_ASSIGNMENT** ppRoleList, | 1638 | CPISCHED_ROLE_ASSIGNMENT** ppRoleList, |
1639 | int* piInstallCount, | 1639 | int* piInstallCount, |
1640 | int* piUninstallCount | 1640 | int* piUninstallCount |
1641 | ) | 1641 | ) |
@@ -1645,7 +1645,7 @@ static HRESULT RoleAssignmentsRead( | |||
1645 | 1645 | ||
1646 | PMSIHANDLE hView, hRec, hRecKey; | 1646 | PMSIHANDLE hView, hRec, hRecKey; |
1647 | 1647 | ||
1648 | CPI_ROLE_ASSIGNMENT* pItm = NULL; | 1648 | CPISCHED_ROLE_ASSIGNMENT* pItm = NULL; |
1649 | LPWSTR pwzData = NULL; | 1649 | LPWSTR pwzData = NULL; |
1650 | BOOL fMatchingArchitecture = FALSE; | 1650 | BOOL fMatchingArchitecture = FALSE; |
1651 | 1651 | ||
@@ -1677,7 +1677,7 @@ static HRESULT RoleAssignmentsRead( | |||
1677 | } | 1677 | } |
1678 | 1678 | ||
1679 | // create entry | 1679 | // create entry |
1680 | pItm = (CPI_ROLE_ASSIGNMENT*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPI_ROLE_ASSIGNMENT)); | 1680 | pItm = (CPISCHED_ROLE_ASSIGNMENT*)::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CPISCHED_ROLE_ASSIGNMENT)); |
1681 | if (!pItm) | 1681 | if (!pItm) |
1682 | ExitFunction1(hr = E_OUTOFMEMORY); | 1682 | ExitFunction1(hr = E_OUTOFMEMORY); |
1683 | 1683 | ||
@@ -1786,7 +1786,7 @@ static HRESULT AddAssemblyToActionData( | |||
1786 | 1786 | ||
1787 | if (iCompCount) | 1787 | if (iCompCount) |
1788 | { | 1788 | { |
1789 | for (CPI_COMPONENT* pComp = pItm->pComponents; pComp; pComp = pComp->pNext) | 1789 | for (CPISCHED_COMPONENT* pComp = pItm->pComponents; pComp; pComp = pComp->pNext) |
1790 | { | 1790 | { |
1791 | hr = AddComponentToActionData(pComp, fInstall, atCreate == iActionType, FALSE, ppwzActionData); | 1791 | hr = AddComponentToActionData(pComp, fInstall, atCreate == iActionType, FALSE, ppwzActionData); |
1792 | ExitOnFailure(hr, "Failed to add component to custom action data, component: %S", pComp->wzKey); | 1792 | ExitOnFailure(hr, "Failed to add component to custom action data, component: %S", pComp->wzKey); |
@@ -1834,7 +1834,7 @@ static HRESULT AddRoleAssignmentsToActionData( | |||
1834 | hr = WcaWriteIntegerToCaData(pItm->iComponentCount, ppwzActionData); | 1834 | hr = WcaWriteIntegerToCaData(pItm->iComponentCount, ppwzActionData); |
1835 | ExitOnFailure(hr, "Failed to add component count to custom action data"); | 1835 | ExitOnFailure(hr, "Failed to add component count to custom action data"); |
1836 | 1836 | ||
1837 | for (CPI_COMPONENT* pComp = pItm->pComponents; pComp; pComp = pComp->pNext) | 1837 | for (CPISCHED_COMPONENT* pComp = pItm->pComponents; pComp; pComp = pComp->pNext) |
1838 | { | 1838 | { |
1839 | hr = AddComponentToActionData(pComp, fInstall, FALSE, TRUE, ppwzActionData); | 1839 | hr = AddComponentToActionData(pComp, fInstall, FALSE, TRUE, ppwzActionData); |
1840 | ExitOnFailure(hr, "Failed to add component to custom action data, component: %S", pComp->wzKey); | 1840 | ExitOnFailure(hr, "Failed to add component to custom action data, component: %S", pComp->wzKey); |
@@ -1847,7 +1847,7 @@ LExit: | |||
1847 | } | 1847 | } |
1848 | 1848 | ||
1849 | static HRESULT AddComponentToActionData( | 1849 | static HRESULT AddComponentToActionData( |
1850 | CPI_COMPONENT* pItm, | 1850 | CPISCHED_COMPONENT* pItm, |
1851 | BOOL fInstall, | 1851 | BOOL fInstall, |
1852 | BOOL fProps, | 1852 | BOOL fProps, |
1853 | BOOL fRoles, | 1853 | BOOL fRoles, |
@@ -1875,7 +1875,7 @@ static HRESULT AddComponentToActionData( | |||
1875 | 1875 | ||
1876 | if (iIntfCount) | 1876 | if (iIntfCount) |
1877 | { | 1877 | { |
1878 | for (CPI_INTERFACE* pIntf = pItm->pInterfaces; pIntf; pIntf = pIntf->pNext) | 1878 | for (CPISCHED_INTERFACE* pIntf = pItm->pInterfaces; pIntf; pIntf = pIntf->pNext) |
1879 | { | 1879 | { |
1880 | hr = AddInterfaceToActionData(pIntf, fInstall, fProps, fRoles, ppwzActionData); | 1880 | hr = AddInterfaceToActionData(pIntf, fInstall, fProps, fRoles, ppwzActionData); |
1881 | ExitOnFailure(hr, "Failed to add interface custom action data, interface: %S", pIntf->wzKey); | 1881 | ExitOnFailure(hr, "Failed to add interface custom action data, interface: %S", pIntf->wzKey); |
@@ -1889,7 +1889,7 @@ LExit: | |||
1889 | } | 1889 | } |
1890 | 1890 | ||
1891 | static HRESULT AddInterfaceToActionData( | 1891 | static HRESULT AddInterfaceToActionData( |
1892 | CPI_INTERFACE* pItm, | 1892 | CPISCHED_INTERFACE* pItm, |
1893 | BOOL fInstall, | 1893 | BOOL fInstall, |
1894 | BOOL fProps, | 1894 | BOOL fProps, |
1895 | BOOL fRoles, | 1895 | BOOL fRoles, |
@@ -1914,7 +1914,7 @@ static HRESULT AddInterfaceToActionData( | |||
1914 | hr = WcaWriteIntegerToCaData(pItm->iMethodCount, ppwzActionData); | 1914 | hr = WcaWriteIntegerToCaData(pItm->iMethodCount, ppwzActionData); |
1915 | ExitOnFailure(hr, "Failed to add method count to custom action data"); | 1915 | ExitOnFailure(hr, "Failed to add method count to custom action data"); |
1916 | 1916 | ||
1917 | for (CPI_METHOD* pMeth = pItm->pMethods; pMeth; pMeth = pMeth->pNext) | 1917 | for (CPISCHED_METHOD* pMeth = pItm->pMethods; pMeth; pMeth = pMeth->pNext) |
1918 | { | 1918 | { |
1919 | hr = AddMethodToActionData(pMeth, fInstall, fProps, fRoles, ppwzActionData); | 1919 | hr = AddMethodToActionData(pMeth, fInstall, fProps, fRoles, ppwzActionData); |
1920 | ExitOnFailure(hr, "Failed to add method custom action data, method: %S", pMeth->wzKey); | 1920 | ExitOnFailure(hr, "Failed to add method custom action data, method: %S", pMeth->wzKey); |
@@ -1927,7 +1927,7 @@ LExit: | |||
1927 | } | 1927 | } |
1928 | 1928 | ||
1929 | static HRESULT AddMethodToActionData( | 1929 | static HRESULT AddMethodToActionData( |
1930 | CPI_METHOD* pItm, | 1930 | CPISCHED_METHOD* pItm, |
1931 | BOOL fInstall, | 1931 | BOOL fInstall, |
1932 | BOOL fProps, | 1932 | BOOL fProps, |
1933 | BOOL fRoles, | 1933 | BOOL fRoles, |
@@ -1960,7 +1960,7 @@ LExit: | |||
1960 | static HRESULT AddRolesToActionData( | 1960 | static HRESULT AddRolesToActionData( |
1961 | int iRoleInstallCount, | 1961 | int iRoleInstallCount, |
1962 | int iRoleUninstallCount, | 1962 | int iRoleUninstallCount, |
1963 | CPI_ROLE_ASSIGNMENT* pRoleList, | 1963 | CPISCHED_ROLE_ASSIGNMENT* pRoleList, |
1964 | BOOL fInstall, | 1964 | BOOL fInstall, |
1965 | BOOL fRoles, | 1965 | BOOL fRoles, |
1966 | LPWSTR* ppwzActionData | 1966 | LPWSTR* ppwzActionData |
@@ -1974,7 +1974,7 @@ static HRESULT AddRolesToActionData( | |||
1974 | 1974 | ||
1975 | if (iRoleCount) | 1975 | if (iRoleCount) |
1976 | { | 1976 | { |
1977 | for (CPI_ROLE_ASSIGNMENT* pRole = pRoleList; pRole; pRole = pRole->pNext) | 1977 | for (CPISCHED_ROLE_ASSIGNMENT* pRole = pRoleList; pRole; pRole = pRole->pNext) |
1978 | { | 1978 | { |
1979 | // make sure the install state matches the create flag | 1979 | // make sure the install state matches the create flag |
1980 | if (fInstall ? !WcaIsInstalling(pRole->isInstalled, pRole->isAction) : !WcaIsUninstalling(pRole->isInstalled, pRole->isAction)) | 1980 | if (fInstall ? !WcaIsInstalling(pRole->isInstalled, pRole->isAction) : !WcaIsUninstalling(pRole->isInstalled, pRole->isAction)) |
@@ -2061,7 +2061,7 @@ static void ModuleFree( | |||
2061 | } | 2061 | } |
2062 | 2062 | ||
2063 | static void ComponentsFreeList( | 2063 | static void ComponentsFreeList( |
2064 | CPI_COMPONENT* pList | 2064 | CPISCHED_COMPONENT* pList |
2065 | ) | 2065 | ) |
2066 | { | 2066 | { |
2067 | while (pList) | 2067 | while (pList) |
@@ -2077,14 +2077,14 @@ static void ComponentsFreeList( | |||
2077 | 2077 | ||
2078 | ReleaseObject(pList->piSubsColl); | 2078 | ReleaseObject(pList->piSubsColl); |
2079 | 2079 | ||
2080 | CPI_COMPONENT* pDelete = pList; | 2080 | CPISCHED_COMPONENT* pDelete = pList; |
2081 | pList = pList->pNext; | 2081 | pList = pList->pNext; |
2082 | ::HeapFree(::GetProcessHeap(), 0, pDelete); | 2082 | ::HeapFree(::GetProcessHeap(), 0, pDelete); |
2083 | } | 2083 | } |
2084 | } | 2084 | } |
2085 | 2085 | ||
2086 | static void InterfacesFreeList( | 2086 | static void InterfacesFreeList( |
2087 | CPI_INTERFACE* pList | 2087 | CPISCHED_INTERFACE* pList |
2088 | ) | 2088 | ) |
2089 | { | 2089 | { |
2090 | while (pList) | 2090 | while (pList) |
@@ -2098,14 +2098,14 @@ static void InterfacesFreeList( | |||
2098 | if (pList->pMethods) | 2098 | if (pList->pMethods) |
2099 | MethodsFreeList(pList->pMethods); | 2099 | MethodsFreeList(pList->pMethods); |
2100 | 2100 | ||
2101 | CPI_INTERFACE* pDelete = pList; | 2101 | CPISCHED_INTERFACE* pDelete = pList; |
2102 | pList = pList->pNext; | 2102 | pList = pList->pNext; |
2103 | ::HeapFree(::GetProcessHeap(), 0, pDelete); | 2103 | ::HeapFree(::GetProcessHeap(), 0, pDelete); |
2104 | } | 2104 | } |
2105 | } | 2105 | } |
2106 | 2106 | ||
2107 | static void MethodsFreeList( | 2107 | static void MethodsFreeList( |
2108 | CPI_METHOD* pList | 2108 | CPISCHED_METHOD* pList |
2109 | ) | 2109 | ) |
2110 | { | 2110 | { |
2111 | while (pList) | 2111 | while (pList) |
@@ -2116,19 +2116,19 @@ static void MethodsFreeList( | |||
2116 | if (pList->pRoles) | 2116 | if (pList->pRoles) |
2117 | RoleAssignmentsFreeList(pList->pRoles); | 2117 | RoleAssignmentsFreeList(pList->pRoles); |
2118 | 2118 | ||
2119 | CPI_METHOD* pDelete = pList; | 2119 | CPISCHED_METHOD* pDelete = pList; |
2120 | pList = pList->pNext; | 2120 | pList = pList->pNext; |
2121 | ::HeapFree(::GetProcessHeap(), 0, pDelete); | 2121 | ::HeapFree(::GetProcessHeap(), 0, pDelete); |
2122 | } | 2122 | } |
2123 | } | 2123 | } |
2124 | 2124 | ||
2125 | static void RoleAssignmentsFreeList( | 2125 | static void RoleAssignmentsFreeList( |
2126 | CPI_ROLE_ASSIGNMENT* pList | 2126 | CPISCHED_ROLE_ASSIGNMENT* pList |
2127 | ) | 2127 | ) |
2128 | { | 2128 | { |
2129 | while (pList) | 2129 | while (pList) |
2130 | { | 2130 | { |
2131 | CPI_ROLE_ASSIGNMENT* pDelete = pList; | 2131 | CPISCHED_ROLE_ASSIGNMENT* pDelete = pList; |
2132 | pList = pList->pNext; | 2132 | pList = pList->pNext; |
2133 | ::HeapFree(::GetProcessHeap(), 0, pDelete); | 2133 | ::HeapFree(::GetProcessHeap(), 0, pDelete); |
2134 | } | 2134 | } |