diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-21 11:54:54 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:25:06 -0600 |
commit | d0d93beac0b79fa9c3d43398813954988afda18f (patch) | |
tree | 5009bb6df65fb5c89ed12a6fbb26b36eafc1f1da /src/engine/mspengine.cpp | |
parent | 837f2e309c8ef0476668c342f612dfe1bb26cb87 (diff) | |
download | wix-d0d93beac0b79fa9c3d43398813954988afda18f.tar.gz wix-d0d93beac0b79fa9c3d43398813954988afda18f.tar.bz2 wix-d0d93beac0b79fa9c3d43398813954988afda18f.zip |
Add logging for patch target products.
Diffstat (limited to 'src/engine/mspengine.cpp')
-rw-r--r-- | src/engine/mspengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/mspengine.cpp b/src/engine/mspengine.cpp index 81e85e4c..14db27a6 100644 --- a/src/engine/mspengine.cpp +++ b/src/engine/mspengine.cpp | |||
@@ -290,7 +290,7 @@ extern "C" HRESULT MspEnginePlanInitializePackage( | |||
290 | { | 290 | { |
291 | BURN_MSPTARGETPRODUCT* pTargetProduct = pPackage->Msp.rgTargetProducts + i; | 291 | BURN_MSPTARGETPRODUCT* pTargetProduct = pPackage->Msp.rgTargetProducts + i; |
292 | 292 | ||
293 | pTargetProduct->requested = pPackage->requested; | 293 | pTargetProduct->defaultRequested = pTargetProduct->requested = pPackage->requested; |
294 | 294 | ||
295 | hr = UserExperienceOnPlanPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &pTargetProduct->requested); | 295 | hr = UserExperienceOnPlanPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &pTargetProduct->requested); |
296 | ExitOnRootFailure(hr, "BA aborted plan patch target."); | 296 | ExitOnRootFailure(hr, "BA aborted plan patch target."); |
@@ -1086,14 +1086,14 @@ static HRESULT PlanTargetProduct( | |||
1086 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pAction->mspTarget.rgOrderedPatches), pAction->mspTarget.cOrderedPatches + 1, sizeof(BURN_ORDERED_PATCHES), 2); | 1086 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pAction->mspTarget.rgOrderedPatches), pAction->mspTarget.cOrderedPatches + 1, sizeof(BURN_ORDERED_PATCHES), 2); |
1087 | ExitOnFailure(hr, "Failed grow array of ordered patches."); | 1087 | ExitOnFailure(hr, "Failed grow array of ordered patches."); |
1088 | 1088 | ||
1089 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].dwOrder = pTargetProduct->dwOrder; | 1089 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pTargetProduct = pTargetProduct; |
1090 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pPackage = pPackage; | 1090 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pPackage = pPackage; |
1091 | ++pAction->mspTarget.cOrderedPatches; | 1091 | ++pAction->mspTarget.cOrderedPatches; |
1092 | 1092 | ||
1093 | // Insertion sort to keep the patches ordered. | 1093 | // Insertion sort to keep the patches ordered. |
1094 | for (DWORD i = pAction->mspTarget.cOrderedPatches - 1; i > 0; --i) | 1094 | for (DWORD i = pAction->mspTarget.cOrderedPatches - 1; i > 0; --i) |
1095 | { | 1095 | { |
1096 | if (pAction->mspTarget.rgOrderedPatches[i].dwOrder < pAction->mspTarget.rgOrderedPatches[i - 1].dwOrder) | 1096 | if (pAction->mspTarget.rgOrderedPatches[i].pTargetProduct->dwOrder < pAction->mspTarget.rgOrderedPatches[i - 1].pTargetProduct->dwOrder) |
1097 | { | 1097 | { |
1098 | BURN_ORDERED_PATCHES temp = pAction->mspTarget.rgOrderedPatches[i - 1]; | 1098 | BURN_ORDERED_PATCHES temp = pAction->mspTarget.rgOrderedPatches[i - 1]; |
1099 | pAction->mspTarget.rgOrderedPatches[i - 1] = pAction->mspTarget.rgOrderedPatches[i]; | 1099 | pAction->mspTarget.rgOrderedPatches[i - 1] = pAction->mspTarget.rgOrderedPatches[i]; |