diff options
author | Bob Arnson <bob@firegiant.com> | 2022-08-31 16:07:08 -0400 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2022-08-31 19:59:16 -0400 |
commit | 914a92d16d7a0245f3cf0b42cc5e320c34d23d30 (patch) | |
tree | f145e999fc4ccefa2e92466a45b602f080a32440 /src/api/burn/balutil | |
parent | f6c86c939af9f8b0036f4b197512f06e861e5fd3 (diff) | |
download | wix-914a92d16d7a0245f3cf0b42cc5e320c34d23d30.tar.gz wix-914a92d16d7a0245f3cf0b42cc5e320c34d23d30.tar.bz2 wix-914a92d16d7a0245f3cf0b42cc5e320c34d23d30.zip |
Supply hashes to BA if present in update feed.
Fixes https://github.com/wixtoolset/issues/issues/6353.
Diffstat (limited to 'src/api/burn/balutil')
4 files changed, 7 insertions, 1 deletions
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index 3f99673d..9a8ac87e 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h | |||
@@ -133,6 +133,8 @@ public: // IBootstrapperApplication | |||
133 | virtual STDMETHODIMP OnDetectUpdate( | 133 | virtual STDMETHODIMP OnDetectUpdate( |
134 | __in_z LPCWSTR /*wzUpdateLocation*/, | 134 | __in_z LPCWSTR /*wzUpdateLocation*/, |
135 | __in DWORD64 /*dw64Size*/, | 135 | __in DWORD64 /*dw64Size*/, |
136 | __in_z_opt LPCWSTR /*wzHash*/, | ||
137 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE /*hashAlgorithm*/, | ||
136 | __in LPCWSTR /*wzVersion*/, | 138 | __in LPCWSTR /*wzVersion*/, |
137 | __in_z LPCWSTR /*wzTitle*/, | 139 | __in_z LPCWSTR /*wzTitle*/, |
138 | __in_z LPCWSTR /*wzSummary*/, | 140 | __in_z LPCWSTR /*wzSummary*/, |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h index c3223bee..58cc0673 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | |||
@@ -132,6 +132,8 @@ public: // IBootstrapperApplication | |||
132 | virtual STDMETHODIMP OnDetectUpdate( | 132 | virtual STDMETHODIMP OnDetectUpdate( |
133 | __in_z LPCWSTR /*wzUpdateLocation*/, | 133 | __in_z LPCWSTR /*wzUpdateLocation*/, |
134 | __in DWORD64 /*dw64Size*/, | 134 | __in DWORD64 /*dw64Size*/, |
135 | __in_z_opt LPCWSTR /*wzHash*/, | ||
136 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE /*hashAlgorithm*/, | ||
135 | __in LPCWSTR /*wzVersion*/, | 137 | __in LPCWSTR /*wzVersion*/, |
136 | __in_z LPCWSTR /*wzTitle*/, | 138 | __in_z LPCWSTR /*wzTitle*/, |
137 | __in_z LPCWSTR /*wzSummary*/, | 139 | __in_z LPCWSTR /*wzSummary*/, |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h index 3054731f..62cb85bc 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h | |||
@@ -87,7 +87,7 @@ static HRESULT BalBaseBAProcOnDetectUpdate( | |||
87 | __inout BA_ONDETECTUPDATE_RESULTS* pResults | 87 | __inout BA_ONDETECTUPDATE_RESULTS* pResults |
88 | ) | 88 | ) |
89 | { | 89 | { |
90 | return pBA->OnDetectUpdate(pArgs->wzUpdateLocation, pArgs->dw64Size, pArgs->wzVersion, pArgs->wzTitle, pArgs->wzSummary, pArgs->wzContentType, pArgs->wzContent, &pResults->fCancel, &pResults->fStopProcessingUpdates); | 90 | return pBA->OnDetectUpdate(pArgs->wzUpdateLocation, pArgs->dw64Size, pArgs->wzHash, pArgs->hashAlgorithm, pArgs->wzVersion, pArgs->wzTitle, pArgs->wzSummary, pArgs->wzContentType, pArgs->wzContent, &pResults->fCancel, &pResults->fStopProcessingUpdates); |
91 | } | 91 | } |
92 | 92 | ||
93 | static HRESULT BalBaseBAProcOnDetectUpdateComplete( | 93 | static HRESULT BalBaseBAProcOnDetectUpdateComplete( |
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h index 0362e171..fba919ea 100644 --- a/src/api/burn/balutil/inc/IBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h | |||
@@ -63,6 +63,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
63 | STDMETHOD(OnDetectUpdate)( | 63 | STDMETHOD(OnDetectUpdate)( |
64 | __in_z_opt LPCWSTR wzUpdateLocation, | 64 | __in_z_opt LPCWSTR wzUpdateLocation, |
65 | __in DWORD64 dw64Size, | 65 | __in DWORD64 dw64Size, |
66 | __in_z_opt LPCWSTR wzHash, | ||
67 | __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashAlgorithm, | ||
66 | __in_z LPCWSTR wzVersion, | 68 | __in_z LPCWSTR wzVersion, |
67 | __in_z_opt LPCWSTR wzTitle, | 69 | __in_z_opt LPCWSTR wzTitle, |
68 | __in_z_opt LPCWSTR wzSummary, | 70 | __in_z_opt LPCWSTR wzSummary, |