From d0d93beac0b79fa9c3d43398813954988afda18f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 21 Feb 2021 11:54:54 -0600 Subject: Add logging for patch target products. --- src/engine/mspengine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/mspengine.cpp') 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( { BURN_MSPTARGETPRODUCT* pTargetProduct = pPackage->Msp.rgTargetProducts + i; - pTargetProduct->requested = pPackage->requested; + pTargetProduct->defaultRequested = pTargetProduct->requested = pPackage->requested; hr = UserExperienceOnPlanPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &pTargetProduct->requested); ExitOnRootFailure(hr, "BA aborted plan patch target."); @@ -1086,14 +1086,14 @@ static HRESULT PlanTargetProduct( hr = MemEnsureArraySize(reinterpret_cast(&pAction->mspTarget.rgOrderedPatches), pAction->mspTarget.cOrderedPatches + 1, sizeof(BURN_ORDERED_PATCHES), 2); ExitOnFailure(hr, "Failed grow array of ordered patches."); - pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].dwOrder = pTargetProduct->dwOrder; + pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pTargetProduct = pTargetProduct; pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pPackage = pPackage; ++pAction->mspTarget.cOrderedPatches; // Insertion sort to keep the patches ordered. for (DWORD i = pAction->mspTarget.cOrderedPatches - 1; i > 0; --i) { - if (pAction->mspTarget.rgOrderedPatches[i].dwOrder < pAction->mspTarget.rgOrderedPatches[i - 1].dwOrder) + if (pAction->mspTarget.rgOrderedPatches[i].pTargetProduct->dwOrder < pAction->mspTarget.rgOrderedPatches[i - 1].pTargetProduct->dwOrder) { BURN_ORDERED_PATCHES temp = pAction->mspTarget.rgOrderedPatches[i - 1]; pAction->mspTarget.rgOrderedPatches[i - 1] = pAction->mspTarget.rgOrderedPatches[i]; -- cgit v1.2.3-55-g6feb