diff options
Diffstat (limited to 'src/burn/engine/pseudobundle.cpp')
| -rw-r--r-- | src/burn/engine/pseudobundle.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/burn/engine/pseudobundle.cpp b/src/burn/engine/pseudobundle.cpp index f0d67068..ff7f185c 100644 --- a/src/burn/engine/pseudobundle.cpp +++ b/src/burn/engine/pseudobundle.cpp | |||
| @@ -127,8 +127,8 @@ extern "C" HRESULT PseudoBundleInitializePassthrough( | |||
| 127 | ExitOnFailure(hr, "Failed to copy cache id for passthrough pseudo bundle."); | 127 | ExitOnFailure(hr, "Failed to copy cache id for passthrough pseudo bundle."); |
| 128 | 128 | ||
| 129 | // Log variables - best effort | 129 | // Log variables - best effort |
| 130 | StrAllocFormatted(&pPackage->sczLogPathVariable, L"WixBundleLog_%ls", pPackage->sczId); | 130 | StrAllocFormatted(&pPassthroughPackage->sczLogPathVariable, L"WixBundleLog_%ls", pPackage->sczId); |
| 131 | StrAllocFormatted(&pPackage->sczRollbackLogPathVariable, L"WixBundleRollbackLog_%ls", pPackage->sczId); | 131 | StrAllocFormatted(&pPassthroughPackage->sczRollbackLogPathVariable, L"WixBundleRollbackLog_%ls", pPackage->sczId); |
| 132 | 132 | ||
| 133 | hr = CoreCreatePassthroughBundleCommandLine(&sczArguments, pInternalCommand, pCommand); | 133 | hr = CoreCreatePassthroughBundleCommandLine(&sczArguments, pInternalCommand, pCommand); |
| 134 | ExitOnFailure(hr, "Failed to create command-line arguments."); | 134 | ExitOnFailure(hr, "Failed to create command-line arguments."); |
| @@ -155,6 +155,8 @@ extern "C" HRESULT PseudoBundleInitializeUpdateBundle( | |||
| 155 | { | 155 | { |
| 156 | HRESULT hr = S_OK; | 156 | HRESULT hr = S_OK; |
| 157 | BURN_PAYLOAD* pPayload = NULL; | 157 | BURN_PAYLOAD* pPayload = NULL; |
| 158 | BYTE* rgbHash = NULL; | ||
| 159 | DWORD cbHash = 0; | ||
| 158 | 160 | ||
| 159 | // Initialize the single payload, and fill out all the necessary fields | 161 | // Initialize the single payload, and fill out all the necessary fields |
| 160 | pPackage->payloads.rgItems = (BURN_PAYLOAD_GROUP_ITEM*)MemAlloc(sizeof(BURN_PAYLOAD_GROUP_ITEM), TRUE); | 162 | pPackage->payloads.rgItems = (BURN_PAYLOAD_GROUP_ITEM*)MemAlloc(sizeof(BURN_PAYLOAD_GROUP_ITEM), TRUE); |
| @@ -185,9 +187,6 @@ extern "C" HRESULT PseudoBundleInitializeUpdateBundle( | |||
| 185 | 187 | ||
| 186 | if (wzHash && *wzHash) | 188 | if (wzHash && *wzHash) |
| 187 | { | 189 | { |
| 188 | BYTE* rgbHash = NULL; | ||
| 189 | DWORD cbHash = 0; | ||
| 190 | |||
| 191 | hr = StrAllocHexDecode(wzHash, &rgbHash, &cbHash); | 190 | hr = StrAllocHexDecode(wzHash, &rgbHash, &cbHash); |
| 192 | ExitOnFailure(hr, "Failed to decode hash string: %ls.", wzHash); | 191 | ExitOnFailure(hr, "Failed to decode hash string: %ls.", wzHash); |
| 193 | 192 | ||
| @@ -223,5 +222,7 @@ extern "C" HRESULT PseudoBundleInitializeUpdateBundle( | |||
| 223 | ExitOnFailure(hr, "Failed to copy install arguments for update bundle package"); | 222 | ExitOnFailure(hr, "Failed to copy install arguments for update bundle package"); |
| 224 | 223 | ||
| 225 | LExit: | 224 | LExit: |
| 225 | ReleaseStr(rgbHash); | ||
| 226 | |||
| 226 | return hr; | 227 | return hr; |
| 227 | } | 228 | } |
