diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-02-04 20:06:58 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2019-02-04 20:11:32 -0600 |
| commit | c239e0cc3a28a50c42c63b086ee62e17cf699104 (patch) | |
| tree | 5ba3e85a9bb1aef22a9162629b248a8e27e2c43f /src/ca/cpappsched.cpp | |
| parent | cbc09b6cd6d0d0b8bf095a88d4d8333616637f71 (diff) | |
| download | wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.tar.gz wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.tar.bz2 wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.zip | |
Integrate into latest v4.
Diffstat (limited to 'src/ca/cpappsched.cpp')
| -rw-r--r-- | src/ca/cpappsched.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ca/cpappsched.cpp b/src/ca/cpappsched.cpp index cec99794..1fb2203b 100644 --- a/src/ca/cpappsched.cpp +++ b/src/ca/cpappsched.cpp | |||
| @@ -579,7 +579,7 @@ HRESULT CpiGetRolesCollForApplication( | |||
| 579 | if (pApp->pPartition) | 579 | if (pApp->pPartition) |
| 580 | hr = CpiGetApplicationsCollForPartition(pApp->pPartition, &piAppColl); | 580 | hr = CpiGetApplicationsCollForPartition(pApp->pPartition, &piAppColl); |
| 581 | else | 581 | else |
| 582 | hr = CpiGetApplicationsCollection(&piAppColl); | 582 | hr = CpiSchedGetApplicationsCollection(&piAppColl); |
| 583 | ExitOnFailure(hr, "Failed to get applications collection"); | 583 | ExitOnFailure(hr, "Failed to get applications collection"); |
| 584 | 584 | ||
| 585 | if (S_FALSE == hr) | 585 | if (S_FALSE == hr) |
| @@ -593,7 +593,7 @@ HRESULT CpiGetRolesCollForApplication( | |||
| 593 | ExitFunction(); // exit with hr = S_FALSE | 593 | ExitFunction(); // exit with hr = S_FALSE |
| 594 | 594 | ||
| 595 | // get roles collection | 595 | // get roles collection |
| 596 | hr = CpiGetCatalogCollection(piAppColl, piAppObj, L"Roles", &pApp->piRolesColl); | 596 | hr = CpiSchedGetCatalogCollection(piAppColl, piAppObj, L"Roles", &pApp->piRolesColl); |
| 597 | ExitOnFailure(hr, "Failed to get roles collection"); | 597 | ExitOnFailure(hr, "Failed to get roles collection"); |
| 598 | } | 598 | } |
| 599 | 599 | ||
| @@ -632,7 +632,7 @@ HRESULT CpiGetComponentsCollForApplication( | |||
| 632 | if (pApp->pPartition) | 632 | if (pApp->pPartition) |
| 633 | hr = CpiGetApplicationsCollForPartition(pApp->pPartition, &piAppColl); | 633 | hr = CpiGetApplicationsCollForPartition(pApp->pPartition, &piAppColl); |
| 634 | else | 634 | else |
| 635 | hr = CpiGetApplicationsCollection(&piAppColl); | 635 | hr = CpiSchedGetApplicationsCollection(&piAppColl); |
| 636 | ExitOnFailure(hr, "Failed to get applications collection"); | 636 | ExitOnFailure(hr, "Failed to get applications collection"); |
| 637 | 637 | ||
| 638 | if (S_FALSE == hr) | 638 | if (S_FALSE == hr) |
| @@ -646,7 +646,7 @@ HRESULT CpiGetComponentsCollForApplication( | |||
| 646 | ExitFunction(); // exit with hr = S_FALSE | 646 | ExitFunction(); // exit with hr = S_FALSE |
| 647 | 647 | ||
| 648 | // get roles collection | 648 | // get roles collection |
| 649 | hr = CpiGetCatalogCollection(piAppColl, piAppObj, L"Components", &pApp->piCompsColl); | 649 | hr = CpiSchedGetCatalogCollection(piAppColl, piAppObj, L"Components", &pApp->piCompsColl); |
| 650 | ExitOnFailure(hr, "Failed to get components collection"); | 650 | ExitOnFailure(hr, "Failed to get components collection"); |
| 651 | } | 651 | } |
| 652 | 652 | ||
| @@ -695,7 +695,7 @@ static HRESULT FindObjectForApplication( | |||
| 695 | if (pItm->pPartition) | 695 | if (pItm->pPartition) |
| 696 | hr = CpiGetApplicationsCollForPartition(pItm->pPartition, &piAppColl); | 696 | hr = CpiGetApplicationsCollForPartition(pItm->pPartition, &piAppColl); |
| 697 | else | 697 | else |
| 698 | hr = CpiGetApplicationsCollection(&piAppColl); | 698 | hr = CpiSchedGetApplicationsCollection(&piAppColl); |
| 699 | ExitOnFailure(hr, "Failed to get applications collection"); | 699 | ExitOnFailure(hr, "Failed to get applications collection"); |
| 700 | 700 | ||
| 701 | if (S_FALSE == hr) | 701 | if (S_FALSE == hr) |
