diff options
Diffstat (limited to 'src/engine/pseudobundle.cpp')
| -rw-r--r-- | src/engine/pseudobundle.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/engine/pseudobundle.cpp b/src/engine/pseudobundle.cpp index db25096b..180cc621 100644 --- a/src/engine/pseudobundle.cpp +++ b/src/engine/pseudobundle.cpp | |||
| @@ -35,13 +35,13 @@ extern "C" HRESULT PseudoBundleInitialize( | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | // Initialize the single payload, and fill out all the necessary fields | 37 | // Initialize the single payload, and fill out all the necessary fields |
| 38 | pPackage->payloads.rgpPayloads = (BURN_PAYLOAD**)MemAlloc(sizeof(BURN_PAYLOAD*), TRUE); | 38 | pPackage->payloads.rgItems = (BURN_PAYLOAD_GROUP_ITEM*)MemAlloc(sizeof(BURN_PAYLOAD_GROUP_ITEM), TRUE); |
| 39 | ExitOnNull(pPackage->payloads.rgpPayloads, hr, E_OUTOFMEMORY, "Failed to allocate space for burn payload group inside of related bundle struct"); | 39 | ExitOnNull(pPackage->payloads.rgItems, hr, E_OUTOFMEMORY, "Failed to allocate space for burn payload group inside of related bundle struct"); |
| 40 | pPackage->payloads.cPayloads = 1; | 40 | pPackage->payloads.cItems = 1; |
| 41 | 41 | ||
| 42 | pPayload = (BURN_PAYLOAD*)MemAlloc(sizeof(BURN_PAYLOAD), TRUE); | 42 | pPayload = (BURN_PAYLOAD*)MemAlloc(sizeof(BURN_PAYLOAD), TRUE); |
| 43 | ExitOnNull(pPayload, hr, E_OUTOFMEMORY, "Failed to allocate space for burn payload inside of related bundle struct"); | 43 | ExitOnNull(pPayload, hr, E_OUTOFMEMORY, "Failed to allocate space for burn payload inside of related bundle struct"); |
| 44 | pPackage->payloads.rgpPayloads[0] = pPayload; | 44 | pPackage->payloads.rgItems[0].pPayload = pPayload; |
| 45 | pPayload->packaging = BURN_PAYLOAD_PACKAGING_EXTERNAL; | 45 | pPayload->packaging = BURN_PAYLOAD_PACKAGING_EXTERNAL; |
| 46 | pPayload->qwFileSize = qwSize; | 46 | pPayload->qwFileSize = qwSize; |
| 47 | 47 | ||
| @@ -171,13 +171,13 @@ extern "C" HRESULT PseudoBundleInitializePassthrough( | |||
| 171 | LPWSTR sczArguments = NULL; | 171 | LPWSTR sczArguments = NULL; |
| 172 | 172 | ||
| 173 | // Initialize the payloads, and copy the necessary fields. | 173 | // Initialize the payloads, and copy the necessary fields. |
| 174 | pPassthroughPackage->payloads.rgpPayloads = (BURN_PAYLOAD**)MemAlloc(sizeof(BURN_PAYLOAD*) * pPackage->payloads.cPayloads, TRUE); | 174 | pPassthroughPackage->payloads.rgItems = (BURN_PAYLOAD_GROUP_ITEM*)MemAlloc(sizeof(BURN_PAYLOAD_GROUP_ITEM) * pPackage->payloads.cItems, TRUE); |
| 175 | ExitOnNull(pPassthroughPackage->payloads.rgpPayloads, hr, E_OUTOFMEMORY, "Failed to allocate space for burn package payload inside of passthrough bundle."); | 175 | ExitOnNull(pPassthroughPackage->payloads.rgItems, hr, E_OUTOFMEMORY, "Failed to allocate space for burn package payload inside of passthrough bundle."); |
| 176 | pPassthroughPackage->payloads.cPayloads = pPackage->payloads.cPayloads; | 176 | pPassthroughPackage->payloads.cItems = pPackage->payloads.cItems; |
| 177 | 177 | ||
| 178 | for (DWORD iPayload = 0; iPayload < pPackage->payloads.cPayloads; ++iPayload) | 178 | for (DWORD iPayload = 0; iPayload < pPackage->payloads.cItems; ++iPayload) |
| 179 | { | 179 | { |
| 180 | pPassthroughPackage->payloads.rgpPayloads[iPayload] = pPackage->payloads.rgpPayloads[iPayload]; | 180 | pPassthroughPackage->payloads.rgItems[iPayload].pPayload = pPackage->payloads.rgItems[iPayload].pPayload; |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | pPassthroughPackage->Exe.fPseudoBundle = TRUE; | 183 | pPassthroughPackage->Exe.fPseudoBundle = TRUE; |
