diff options
-rw-r--r-- | src/burn/engine/mspengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/burn/engine/mspengine.cpp b/src/burn/engine/mspengine.cpp index 81b7b651..089262e1 100644 --- a/src/burn/engine/mspengine.cpp +++ b/src/burn/engine/mspengine.cpp | |||
@@ -623,7 +623,7 @@ extern "C" HRESULT MspEngineExecutePackage( | |||
623 | wzAppend = pMspPackage->Msp.sczPatchCode; | 623 | wzAppend = pMspPackage->Msp.sczPatchCode; |
624 | } | 624 | } |
625 | 625 | ||
626 | if (NULL != sczPatches) | 626 | if (sczPatches) |
627 | { | 627 | { |
628 | hr = StrAllocConcat(&sczPatches, L";", 0); | 628 | hr = StrAllocConcat(&sczPatches, L";", 0); |
629 | ExitOnFailure(hr, "Failed to semi-colon delimit patches."); | 629 | ExitOnFailure(hr, "Failed to semi-colon delimit patches."); |
@@ -1049,6 +1049,7 @@ static HRESULT AddMsiChainedPatch( | |||
1049 | 1049 | ||
1050 | *pdwChainedPatchIndex = pPackage->Msi.cChainedPatches; | 1050 | *pdwChainedPatchIndex = pPackage->Msi.cChainedPatches; |
1051 | ++pPackage->Msi.cChainedPatches; | 1051 | ++pPackage->Msi.cChainedPatches; |
1052 | |||
1052 | LExit: | 1053 | LExit: |
1053 | return hr; | 1054 | return hr; |
1054 | } | 1055 | } |
@@ -1186,7 +1187,7 @@ static HRESULT PlanTargetProduct( | |||
1186 | 1187 | ||
1187 | // Add our target product to the array and sort based on their order determined during detection. | 1188 | // Add our target product to the array and sort based on their order determined during detection. |
1188 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pAction->mspTarget.rgOrderedPatches), pAction->mspTarget.cOrderedPatches + 1, sizeof(BURN_ORDERED_PATCHES), 2); | 1189 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pAction->mspTarget.rgOrderedPatches), pAction->mspTarget.cOrderedPatches + 1, sizeof(BURN_ORDERED_PATCHES), 2); |
1189 | ExitOnFailure(hr, "Failed grow array of ordered patches."); | 1190 | ExitOnFailure(hr, "Failed to grow array of ordered patches."); |
1190 | 1191 | ||
1191 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pTargetProduct = pTargetProduct; | 1192 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pTargetProduct = pTargetProduct; |
1192 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pPackage = pPackage; | 1193 | pAction->mspTarget.rgOrderedPatches[pAction->mspTarget.cOrderedPatches].pPackage = pPackage; |