aboutsummaryrefslogtreecommitdiff
path: root/src/ca/cppartsched.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2019-02-04 20:06:58 -0600
committerSean Hall <r.sean.hall@gmail.com>2019-02-04 20:11:32 -0600
commitc239e0cc3a28a50c42c63b086ee62e17cf699104 (patch)
tree5ba3e85a9bb1aef22a9162629b248a8e27e2c43f /src/ca/cppartsched.cpp
parentcbc09b6cd6d0d0b8bf095a88d4d8333616637f71 (diff)
downloadwix-c239e0cc3a28a50c42c63b086ee62e17cf699104.tar.gz
wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.tar.bz2
wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.zip
Integrate into latest v4.
Diffstat (limited to 'src/ca/cppartsched.cpp')
-rw-r--r--src/ca/cppartsched.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ca/cppartsched.cpp b/src/ca/cppartsched.cpp
index 6643a50b..7cd98791 100644
--- a/src/ca/cppartsched.cpp
+++ b/src/ca/cppartsched.cpp
@@ -199,7 +199,7 @@ HRESULT CpiPartitionsVerifyInstall(
199 // get partitions collection 199 // get partitions collection
200 if (!piPartColl) 200 if (!piPartColl)
201 { 201 {
202 hr = CpiGetPartitionsCollection(&piPartColl); 202 hr = CpiSchedGetPartitionsCollection(&piPartColl);
203 ExitOnFailure(hr, "Failed to get partitions collection"); 203 ExitOnFailure(hr, "Failed to get partitions collection");
204 } 204 }
205 205
@@ -336,7 +336,7 @@ HRESULT CpiPartitionsVerifyUninstall(
336 // get partitions collection 336 // get partitions collection
337 if (!piPartColl) 337 if (!piPartColl)
338 { 338 {
339 hr = CpiGetPartitionsCollection(&piPartColl); 339 hr = CpiSchedGetPartitionsCollection(&piPartColl);
340 ExitOnFailure(hr, "Failed to get partitions collection"); 340 ExitOnFailure(hr, "Failed to get partitions collection");
341 } 341 }
342 342
@@ -526,7 +526,7 @@ HRESULT CpiGetApplicationsCollForPartition(
526 if (!pPart->piApplicationsColl) 526 if (!pPart->piApplicationsColl)
527 { 527 {
528 // get partitions collection from catalog 528 // get partitions collection from catalog
529 hr = CpiGetPartitionsCollection(&piPartColl); 529 hr = CpiSchedGetPartitionsCollection(&piPartColl);
530 ExitOnFailure(hr, "Failed to get partitions collection"); 530 ExitOnFailure(hr, "Failed to get partitions collection");
531 531
532 // find application object 532 // find application object
@@ -540,7 +540,7 @@ HRESULT CpiGetApplicationsCollForPartition(
540 } 540 }
541 541
542 // get roles collection 542 // get roles collection
543 hr = CpiGetCatalogCollection(piPartColl, piPartObj, L"Applications", &pPart->piApplicationsColl); 543 hr = CpiSchedGetCatalogCollection(piPartColl, piPartObj, L"Applications", &pPart->piApplicationsColl);
544 ExitOnFailure(hr, "Failed to get applications collection"); 544 ExitOnFailure(hr, "Failed to get applications collection");
545 } 545 }
546 546
@@ -576,7 +576,7 @@ HRESULT CpiGetRolesCollForPartition(
576 if (!pPart->piRolesColl) 576 if (!pPart->piRolesColl)
577 { 577 {
578 // get partitions collection from catalog 578 // get partitions collection from catalog
579 hr = CpiGetPartitionsCollection(&piPartColl); 579 hr = CpiSchedGetPartitionsCollection(&piPartColl);
580 ExitOnFailure(hr, "Failed to get partitions collection"); 580 ExitOnFailure(hr, "Failed to get partitions collection");
581 581
582 // find partition object 582 // find partition object
@@ -587,7 +587,7 @@ HRESULT CpiGetRolesCollForPartition(
587 ExitFunction(); // exit with hr = S_FALSE 587 ExitFunction(); // exit with hr = S_FALSE
588 588
589 // get roles collection 589 // get roles collection
590 hr = CpiGetCatalogCollection(piPartColl, piPartObj, L"RolesForPartition", &pPart->piRolesColl); 590 hr = CpiSchedGetCatalogCollection(piPartColl, piPartObj, L"RolesForPartition", &pPart->piRolesColl);
591 ExitOnFailure(hr, "Failed to get roles collection"); 591 ExitOnFailure(hr, "Failed to get roles collection");
592 } 592 }
593 593