diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-16 10:44:11 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-19 23:12:55 -0500 |
commit | e09a129ee276457d02d19a6444657cf3a2c73905 (patch) | |
tree | 0c12325e67a5e60aadfcfee5e14cda66b9868abe /src/engine/cache.cpp | |
parent | acf86637a6350d269e1ae1aa907e38f5138a0fa9 (diff) | |
download | wix-e09a129ee276457d02d19a6444657cf3a2c73905.tar.gz wix-e09a129ee276457d02d19a6444657cf3a2c73905.tar.bz2 wix-e09a129ee276457d02d19a6444657cf3a2c73905.zip |
UX payloads are never external.
Diffstat (limited to 'src/engine/cache.cpp')
-rw-r--r-- | src/engine/cache.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/engine/cache.cpp b/src/engine/cache.cpp index 84b7f131..2299d26d 100644 --- a/src/engine/cache.cpp +++ b/src/engine/cache.cpp | |||
@@ -776,7 +776,6 @@ extern "C" HRESULT CacheCompleteBundle( | |||
776 | __in BOOL fPerMachine, | 776 | __in BOOL fPerMachine, |
777 | __in_z LPCWSTR wzExecutableName, | 777 | __in_z LPCWSTR wzExecutableName, |
778 | __in_z LPCWSTR wzBundleId, | 778 | __in_z LPCWSTR wzBundleId, |
779 | __in BURN_PAYLOADS* pUxPayloads, | ||
780 | __in_z LPCWSTR wzSourceBundlePath | 779 | __in_z LPCWSTR wzSourceBundlePath |
781 | #ifdef DEBUG | 780 | #ifdef DEBUG |
782 | , __in_z LPCWSTR wzExecutablePath | 781 | , __in_z LPCWSTR wzExecutablePath |
@@ -824,21 +823,6 @@ extern "C" HRESULT CacheCompleteBundle( | |||
824 | hr = PathGetDirectory(wzSourceBundlePath, &sczSourceDirectory); | 823 | hr = PathGetDirectory(wzSourceBundlePath, &sczSourceDirectory); |
825 | ExitOnFailure(hr, "Failed to get directory from engine working path: %ls", wzSourceBundlePath); | 824 | ExitOnFailure(hr, "Failed to get directory from engine working path: %ls", wzSourceBundlePath); |
826 | 825 | ||
827 | // Cache external UX payloads to completed path. | ||
828 | for (DWORD i = 0; i < pUxPayloads->cPayloads; ++i) | ||
829 | { | ||
830 | BURN_PAYLOAD* pPayload = &pUxPayloads->rgPayloads[i]; | ||
831 | |||
832 | if (BURN_PAYLOAD_PACKAGING_EXTERNAL == pPayload->packaging) | ||
833 | { | ||
834 | hr = PathConcat(sczSourceDirectory, pPayload->sczSourcePath, &sczPayloadSourcePath); | ||
835 | ExitOnFailure(hr, "Failed to build payload source path."); | ||
836 | |||
837 | hr = CacheCompletePayload(fPerMachine, pPayload, wzBundleId, sczPayloadSourcePath, FALSE); | ||
838 | ExitOnFailure(hr, "Failed to complete the cache of payload: %ls", pPayload->sczKey); | ||
839 | } | ||
840 | } | ||
841 | |||
842 | LExit: | 826 | LExit: |
843 | ReleaseStr(sczPayloadSourcePath); | 827 | ReleaseStr(sczPayloadSourcePath); |
844 | ReleaseStr(sczSourceDirectory); | 828 | ReleaseStr(sczSourceDirectory); |