diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-14 15:09:49 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-14 21:51:14 -0500 |
commit | dea657295df261bb0e3e4d620eeae321531e3a11 (patch) | |
tree | 718a4b3c9697a2b6e926ad74404dc22f2cc4d22b /src/ext | |
parent | 6f6e4ced9f398ff37a44b91fdba62479cde29d06 (diff) | |
download | wix-dea657295df261bb0e3e4d620eeae321531e3a11.tar.gz wix-dea657295df261bb0e3e4d620eeae321531e3a11.tar.bz2 wix-dea657295df261bb0e3e4d620eeae321531e3a11.zip |
Add ability for non-vital cache package action.
Diffstat (limited to 'src/ext')
-rw-r--r-- | src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index 9c0f9576..9aa58a28 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | |||
@@ -655,6 +655,7 @@ public: // IBootstrapperApplication | |||
655 | __in_z LPCWSTR wzPackageId, | 655 | __in_z LPCWSTR wzPackageId, |
656 | __in DWORD cCachePayloads, | 656 | __in DWORD cCachePayloads, |
657 | __in DWORD64 dw64PackageCacheSize, | 657 | __in DWORD64 dw64PackageCacheSize, |
658 | __in BOOL fVital, | ||
658 | __inout BOOL* pfCancel | 659 | __inout BOOL* pfCancel |
659 | ) | 660 | ) |
660 | { | 661 | { |
@@ -673,7 +674,7 @@ public: // IBootstrapperApplication | |||
673 | } | 674 | } |
674 | } | 675 | } |
675 | 676 | ||
676 | return __super::OnCachePackageBegin(wzPackageId, cCachePayloads, dw64PackageCacheSize, pfCancel); | 677 | return __super::OnCachePackageBegin(wzPackageId, cCachePayloads, dw64PackageCacheSize, fVital, pfCancel); |
677 | } | 678 | } |
678 | 679 | ||
679 | 680 | ||
@@ -1488,6 +1489,9 @@ public: // IBootstrapperApplication | |||
1488 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE: | 1489 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE: |
1489 | OnDetectRelatedBundlePackageFallback(reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS*>(pvResults)); | 1490 | OnDetectRelatedBundlePackageFallback(reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS*>(pvResults)); |
1490 | break; | 1491 | break; |
1492 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE: | ||
1493 | OnCachePackageNonVitalValidationFailureFallback(reinterpret_cast<BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS*>(pvArgs), reinterpret_cast<BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_RESULTS*>(pvResults)); | ||
1494 | break; | ||
1491 | default: | 1495 | default: |
1492 | #ifdef DEBUG | 1496 | #ifdef DEBUG |
1493 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); | 1497 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); |
@@ -2177,6 +2181,14 @@ private: // privates | |||
2177 | m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); | 2181 | m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); |
2178 | } | 2182 | } |
2179 | 2183 | ||
2184 | void OnCachePackageNonVitalValidationFailureFallback( | ||
2185 | __in BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS* pArgs, | ||
2186 | __inout BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_RESULTS* pResults | ||
2187 | ) | ||
2188 | { | ||
2189 | m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE, pArgs, pResults, m_pvBAFunctionsProcContext); | ||
2190 | } | ||
2191 | |||
2180 | 2192 | ||
2181 | public: //CBalBaseBootstrapperApplication | 2193 | public: //CBalBaseBootstrapperApplication |
2182 | virtual STDMETHODIMP Initialize( | 2194 | virtual STDMETHODIMP Initialize( |