diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-25 21:52:28 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-25 22:58:23 -0500 |
| commit | bf31c11edf14789d22ce6542549a807d5c5ff086 (patch) | |
| tree | 418678fb02026a56cd6d5e5415386177839101cb /src/engine/externalengine.cpp | |
| parent | d291d27f94d0702bcd4ffd6fb72125c8996b3aef (diff) | |
| download | wix-bf31c11edf14789d22ce6542549a807d5c5ff086.tar.gz wix-bf31c11edf14789d22ce6542549a807d5c5ff086.tar.bz2 wix-bf31c11edf14789d22ce6542549a807d5c5ff086.zip | |
Add support for downloading embedded payloads.
#5253
Diffstat (limited to 'src/engine/externalengine.cpp')
| -rw-r--r-- | src/engine/externalengine.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/engine/externalengine.cpp b/src/engine/externalengine.cpp index d6c44736..63177722 100644 --- a/src/engine/externalengine.cpp +++ b/src/engine/externalengine.cpp | |||
| @@ -357,12 +357,6 @@ HRESULT ExternalEngineSetLocalSource( | |||
| 357 | hr = PayloadFindById(&pEngineState->payloads, wzPayloadId, &pPayload); | 357 | hr = PayloadFindById(&pEngineState->payloads, wzPayloadId, &pPayload); |
| 358 | ExitOnFailure(hr, "BA requested unknown payload with id: %ls", wzPayloadId); | 358 | ExitOnFailure(hr, "BA requested unknown payload with id: %ls", wzPayloadId); |
| 359 | 359 | ||
| 360 | if (BURN_PAYLOAD_PACKAGING_EMBEDDED == pPayload->packaging) | ||
| 361 | { | ||
| 362 | hr = HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION); | ||
| 363 | ExitOnFailure(hr, "BA denied while trying to set source on embedded payload: %ls", wzPayloadId); | ||
| 364 | } | ||
| 365 | |||
| 366 | hr = StrAllocString(&pPayload->sczSourcePath, wzPath, 0); | 360 | hr = StrAllocString(&pPayload->sczSourcePath, wzPath, 0); |
| 367 | ExitOnFailure(hr, "Failed to set source path for payload."); | 361 | ExitOnFailure(hr, "Failed to set source path for payload."); |
| 368 | } | 362 | } |
| @@ -408,12 +402,6 @@ HRESULT ExternalEngineSetDownloadSource( | |||
| 408 | hr = PayloadFindById(&pEngineState->payloads, wzPayloadId, &pPayload); | 402 | hr = PayloadFindById(&pEngineState->payloads, wzPayloadId, &pPayload); |
| 409 | ExitOnFailure(hr, "BA requested unknown payload with id: %ls", wzPayloadId); | 403 | ExitOnFailure(hr, "BA requested unknown payload with id: %ls", wzPayloadId); |
| 410 | 404 | ||
| 411 | if (BURN_PAYLOAD_PACKAGING_EMBEDDED == pPayload->packaging) | ||
| 412 | { | ||
| 413 | hr = HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION); | ||
| 414 | ExitOnFailure(hr, "BA denied while trying to set download URL on embedded payload: %ls", wzPayloadId); | ||
| 415 | } | ||
| 416 | |||
| 417 | pDownloadSource = &pPayload->downloadSource; | 405 | pDownloadSource = &pPayload->downloadSource; |
| 418 | } | 406 | } |
| 419 | else if (wzPackageOrContainerId && *wzPackageOrContainerId) | 407 | else if (wzPackageOrContainerId && *wzPackageOrContainerId) |
