diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-04 21:19:55 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-04 22:35:09 -0600 |
commit | e619546617d6266645561428fbbe7a05d257eeba (patch) | |
tree | 0f6b9f06436f8ae9340694dbda244db998361664 /src/balutil | |
parent | ae1f24b7bbb9c47fb773ecbd7b12632782bd1618 (diff) | |
download | wix-e619546617d6266645561428fbbe7a05d257eeba.tar.gz wix-e619546617d6266645561428fbbe7a05d257eeba.tar.bz2 wix-e619546617d6266645561428fbbe7a05d257eeba.zip |
Update to latest Burn headers.
Diffstat (limited to 'src/balutil')
-rw-r--r-- | src/balutil/balutil.vcxproj | 4 | ||||
-rw-r--r-- | src/balutil/inc/BAFunctions.h | 3 | ||||
-rw-r--r-- | src/balutil/inc/BalBaseBAFunctions.h | 38 | ||||
-rw-r--r-- | src/balutil/inc/BalBaseBAFunctionsProc.h | 3 | ||||
-rw-r--r-- | src/balutil/inc/BalBaseBootstrapperApplication.h | 40 | ||||
-rw-r--r-- | src/balutil/inc/BalBaseBootstrapperApplicationProc.h | 38 | ||||
-rw-r--r-- | src/balutil/inc/IBootstrapperApplication.h | 33 | ||||
-rw-r--r-- | src/balutil/packages.config | 2 |
8 files changed, 10 insertions, 151 deletions
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj index 2a6f4053..702a25c0 100644 --- a/src/balutil/balutil.vcxproj +++ b/src/balutil/balutil.vcxproj | |||
@@ -2,7 +2,7 @@ | |||
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" /> |
7 | 7 | ||
8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
@@ -98,7 +98,7 @@ | |||
98 | <PropertyGroup> | 98 | <PropertyGroup> |
99 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 99 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
100 | </PropertyGroup> | 100 | </PropertyGroup> |
101 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" /> | 101 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" /> |
102 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" /> | 102 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" /> |
103 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | 103 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> |
104 | </Target> | 104 | </Target> |
diff --git a/src/balutil/inc/BAFunctions.h b/src/balutil/inc/BAFunctions.h index a95b7a03..eb6d96d8 100644 --- a/src/balutil/inc/BAFunctions.h +++ b/src/balutil/inc/BAFunctions.h | |||
@@ -22,15 +22,12 @@ enum BA_FUNCTIONS_MESSAGE | |||
22 | BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE, | 22 | BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE, |
23 | BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE, | 23 | BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE, |
24 | BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN, | 24 | BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN, |
25 | BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE, | ||
26 | BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE, | 25 | BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE, |
27 | BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE, | 26 | BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE, |
28 | BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE, | 27 | BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE, |
29 | BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE, | 28 | BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE, |
30 | BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE, | 29 | BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE, |
31 | BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN, | 30 | BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN, |
32 | BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN, | ||
33 | BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, | ||
34 | BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE, | 31 | BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE, |
35 | BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE, | 32 | BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE, |
36 | BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE, | 33 | BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE, |
diff --git a/src/balutil/inc/BalBaseBAFunctions.h b/src/balutil/inc/BalBaseBAFunctions.h index 39934128..10334a18 100644 --- a/src/balutil/inc/BalBaseBAFunctions.h +++ b/src/balutil/inc/BalBaseBAFunctions.h | |||
@@ -164,16 +164,6 @@ public: // IBootstrapperApplication | |||
164 | return S_OK; | 164 | return S_OK; |
165 | } | 165 | } |
166 | 166 | ||
167 | virtual STDMETHODIMP OnDetectCompatibleMsiPackage( | ||
168 | __in_z LPCWSTR /*wzPackageId*/, | ||
169 | __in_z LPCWSTR /*wzCompatiblePackageId*/, | ||
170 | __in LPCWSTR /*wzCompatiblePackageVersion*/, | ||
171 | __inout BOOL* /*pfCancel*/ | ||
172 | ) | ||
173 | { | ||
174 | return S_OK; | ||
175 | } | ||
176 | |||
177 | virtual STDMETHODIMP OnDetectRelatedMsiPackage( | 167 | virtual STDMETHODIMP OnDetectRelatedMsiPackage( |
178 | __in_z LPCWSTR /*wzPackageId*/, | 168 | __in_z LPCWSTR /*wzPackageId*/, |
179 | __in_z LPCWSTR /*wzUpgradeCode*/, | 169 | __in_z LPCWSTR /*wzUpgradeCode*/, |
@@ -217,7 +207,8 @@ public: // IBootstrapperApplication | |||
217 | } | 207 | } |
218 | 208 | ||
219 | virtual STDMETHODIMP OnDetectComplete( | 209 | virtual STDMETHODIMP OnDetectComplete( |
220 | __in HRESULT /*hrStatus*/ | 210 | __in HRESULT /*hrStatus*/, |
211 | __in BOOL /*fEligibleForCleanup*/ | ||
221 | ) | 212 | ) |
222 | { | 213 | { |
223 | return S_OK; | 214 | return S_OK; |
@@ -251,31 +242,6 @@ public: // IBootstrapperApplication | |||
251 | return S_OK; | 242 | return S_OK; |
252 | } | 243 | } |
253 | 244 | ||
254 | virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin( | ||
255 | __in_z LPCWSTR /*wzPackageId*/, | ||
256 | __in_z LPCWSTR /*wzCompatiblePackageId*/, | ||
257 | __in LPCWSTR /*wzCompatiblePackageVersion*/, | ||
258 | __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/, | ||
259 | __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/, | ||
260 | __inout BOOL* /*pfCancel*/ | ||
261 | ) | ||
262 | { | ||
263 | return S_OK; | ||
264 | } | ||
265 | |||
266 | virtual STDMETHODIMP OnPlanCompatibleMsiPackageComplete( | ||
267 | __in_z LPCWSTR /*wzPackageId*/, | ||
268 | __in_z LPCWSTR /*wzCompatiblePackageId*/, | ||
269 | __in HRESULT /*hrStatus*/, | ||
270 | __in BOOTSTRAPPER_PACKAGE_STATE /*state*/, | ||
271 | __in BOOTSTRAPPER_REQUEST_STATE /*requested*/, | ||
272 | __in BOOTSTRAPPER_ACTION_STATE /*execute*/, | ||
273 | __in BOOTSTRAPPER_ACTION_STATE /*rollback*/ | ||
274 | ) | ||
275 | { | ||
276 | return S_OK; | ||
277 | } | ||
278 | |||
279 | virtual STDMETHODIMP OnPlanTargetMsiPackage( | 245 | virtual STDMETHODIMP OnPlanTargetMsiPackage( |
280 | __in_z LPCWSTR /*wzPackageId*/, | 246 | __in_z LPCWSTR /*wzPackageId*/, |
281 | __in_z LPCWSTR /*wzProductCode*/, | 247 | __in_z LPCWSTR /*wzProductCode*/, |
diff --git a/src/balutil/inc/BalBaseBAFunctionsProc.h b/src/balutil/inc/BalBaseBAFunctionsProc.h index 69843301..4f0906d2 100644 --- a/src/balutil/inc/BalBaseBAFunctionsProc.h +++ b/src/balutil/inc/BalBaseBAFunctionsProc.h | |||
@@ -57,15 +57,12 @@ static HRESULT WINAPI BalBaseBAFunctionsProc( | |||
57 | case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE: | 57 | case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE: |
58 | case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE: | 58 | case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE: |
59 | case BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN: | 59 | case BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN: |
60 | case BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE: | ||
61 | case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE: | 60 | case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE: |
62 | case BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE: | 61 | case BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE: |
63 | case BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE: | 62 | case BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE: |
64 | case BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE: | 63 | case BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE: |
65 | case BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE: | 64 | case BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE: |
66 | case BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN: | 65 | case BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN: |
67 | case BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN: | ||
68 | case BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE: | ||
69 | case BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE: | 66 | case BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE: |
70 | case BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE: | 67 | case BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE: |
71 | case BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE: | 68 | case BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE: |
diff --git a/src/balutil/inc/BalBaseBootstrapperApplication.h b/src/balutil/inc/BalBaseBootstrapperApplication.h index ad0c60e5..1b0230de 100644 --- a/src/balutil/inc/BalBaseBootstrapperApplication.h +++ b/src/balutil/inc/BalBaseBootstrapperApplication.h | |||
@@ -167,17 +167,6 @@ public: // IBootstrapperApplication | |||
167 | return S_OK; | 167 | return S_OK; |
168 | } | 168 | } |
169 | 169 | ||
170 | virtual STDMETHODIMP OnDetectCompatibleMsiPackage( | ||
171 | __in_z LPCWSTR /*wzPackageId*/, | ||
172 | __in_z LPCWSTR /*wzCompatiblePackageId*/, | ||
173 | __in LPCWSTR /*wzCompatiblePackageVersion*/, | ||
174 | __inout BOOL* pfCancel | ||
175 | ) | ||
176 | { | ||
177 | *pfCancel |= CheckCanceled(); | ||
178 | return S_OK; | ||
179 | } | ||
180 | |||
181 | virtual STDMETHODIMP OnDetectRelatedMsiPackage( | 170 | virtual STDMETHODIMP OnDetectRelatedMsiPackage( |
182 | __in_z LPCWSTR /*wzPackageId*/, | 171 | __in_z LPCWSTR /*wzPackageId*/, |
183 | __in_z LPCWSTR /*wzUpgradeCode*/, | 172 | __in_z LPCWSTR /*wzUpgradeCode*/, |
@@ -224,7 +213,8 @@ public: // IBootstrapperApplication | |||
224 | } | 213 | } |
225 | 214 | ||
226 | virtual STDMETHODIMP OnDetectComplete( | 215 | virtual STDMETHODIMP OnDetectComplete( |
227 | __in HRESULT /*hrStatus*/ | 216 | __in HRESULT /*hrStatus*/, |
217 | __in BOOL /*fEligibleForCleanup*/ | ||
228 | ) | 218 | ) |
229 | { | 219 | { |
230 | return S_OK; | 220 | return S_OK; |
@@ -261,32 +251,6 @@ public: // IBootstrapperApplication | |||
261 | return S_OK; | 251 | return S_OK; |
262 | } | 252 | } |
263 | 253 | ||
264 | virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin( | ||
265 | __in_z LPCWSTR /*wzPackageId*/, | ||
266 | __in_z LPCWSTR /*wzCompatiblePackageId*/, | ||
267 | __in LPCWSTR /*wzCompatiblePackageVersion*/, | ||
268 | __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/, | ||
269 | __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/, | ||
270 | __inout BOOL* pfCancel | ||
271 | ) | ||
272 | { | ||
273 | *pfCancel |= CheckCanceled(); | ||
274 | return S_OK; | ||
275 | } | ||
276 | |||
277 | virtual STDMETHODIMP OnPlanCompatibleMsiPackageComplete( | ||
278 | __in_z LPCWSTR /*wzPackageId*/, | ||
279 | __in_z LPCWSTR /*wzCompatiblePackageId*/, | ||
280 | __in HRESULT /*hrStatus*/, | ||
281 | __in BOOTSTRAPPER_PACKAGE_STATE /*state*/, | ||
282 | __in BOOTSTRAPPER_REQUEST_STATE /*requested*/, | ||
283 | __in BOOTSTRAPPER_ACTION_STATE /*execute*/, | ||
284 | __in BOOTSTRAPPER_ACTION_STATE /*rollback*/ | ||
285 | ) | ||
286 | { | ||
287 | return S_OK; | ||
288 | } | ||
289 | |||
290 | virtual STDMETHODIMP OnPlanTargetMsiPackage( | 254 | virtual STDMETHODIMP OnPlanTargetMsiPackage( |
291 | __in_z LPCWSTR /*wzPackageId*/, | 255 | __in_z LPCWSTR /*wzPackageId*/, |
292 | __in_z LPCWSTR /*wzProductCode*/, | 256 | __in_z LPCWSTR /*wzProductCode*/, |
diff --git a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h index 648252b5..e16640e5 100644 --- a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h +++ b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h | |||
@@ -24,7 +24,7 @@ static HRESULT BalBaseBAProcOnDetectComplete( | |||
24 | __inout BA_ONDETECTCOMPLETE_RESULTS* /*pResults*/ | 24 | __inout BA_ONDETECTCOMPLETE_RESULTS* /*pResults*/ |
25 | ) | 25 | ) |
26 | { | 26 | { |
27 | return pBA->OnDetectComplete(pArgs->hrStatus); | 27 | return pBA->OnDetectComplete(pArgs->hrStatus, pArgs->fEligibleForCleanup); |
28 | } | 28 | } |
29 | 29 | ||
30 | static HRESULT BalBaseBAProcOnPlanBegin( | 30 | static HRESULT BalBaseBAProcOnPlanBegin( |
@@ -126,15 +126,6 @@ static HRESULT BalBaseBAProcOnDetectPackageBegin( | |||
126 | return pBA->OnDetectPackageBegin(pArgs->wzPackageId, &pResults->fCancel); | 126 | return pBA->OnDetectPackageBegin(pArgs->wzPackageId, &pResults->fCancel); |
127 | } | 127 | } |
128 | 128 | ||
129 | static HRESULT BalBaseBAProcOnDetectCompatiblePackage( | ||
130 | __in IBootstrapperApplication* pBA, | ||
131 | __in BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS* pArgs, | ||
132 | __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults | ||
133 | ) | ||
134 | { | ||
135 | return pBA->OnDetectCompatibleMsiPackage(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->wzCompatiblePackageVersion, &pResults->fCancel); | ||
136 | } | ||
137 | |||
138 | static HRESULT BalBaseBAProcOnDetectRelatedMsiPackage( | 129 | static HRESULT BalBaseBAProcOnDetectRelatedMsiPackage( |
139 | __in IBootstrapperApplication* pBA, | 130 | __in IBootstrapperApplication* pBA, |
140 | __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, | 131 | __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, |
@@ -189,24 +180,6 @@ static HRESULT BalBaseBAProcOnPlanPackageBegin( | |||
189 | return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel); | 180 | return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel); |
190 | } | 181 | } |
191 | 182 | ||
192 | static HRESULT BalBaseBAProcOnPlanCompatibleMsiPackageBegin( | ||
193 | __in IBootstrapperApplication* pBA, | ||
194 | __in BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS* pArgs, | ||
195 | __inout BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS* pResults | ||
196 | ) | ||
197 | { | ||
198 | return pBA->OnPlanCompatibleMsiPackageBegin(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->wzCompatiblePackageVersion, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel); | ||
199 | } | ||
200 | |||
201 | static HRESULT BalBaseBAProcOnPlanCompatibleMsiPackageComplete( | ||
202 | __in IBootstrapperApplication* pBA, | ||
203 | __in BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS* pArgs, | ||
204 | __inout BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS* /*pResults*/ | ||
205 | ) | ||
206 | { | ||
207 | return pBA->OnPlanCompatibleMsiPackageComplete(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->hrStatus, pArgs->state, pArgs->requested, pArgs->execute, pArgs->rollback); | ||
208 | } | ||
209 | |||
210 | static HRESULT BalBaseBAProcOnPlanTargetMsiPackage( | 183 | static HRESULT BalBaseBAProcOnPlanTargetMsiPackage( |
211 | __in IBootstrapperApplication* pBA, | 184 | __in IBootstrapperApplication* pBA, |
212 | __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs, | 185 | __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs, |
@@ -662,9 +635,6 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc( | |||
662 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: | 635 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: |
663 | hr = BalBaseBAProcOnDetectPackageBegin(pBA, reinterpret_cast<BA_ONDETECTPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTPACKAGEBEGIN_RESULTS*>(pvResults)); | 636 | hr = BalBaseBAProcOnDetectPackageBegin(pBA, reinterpret_cast<BA_ONDETECTPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTPACKAGEBEGIN_RESULTS*>(pvResults)); |
664 | break; | 637 | break; |
665 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE: | ||
666 | hr = BalBaseBAProcOnDetectCompatiblePackage(pBA, reinterpret_cast<BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS*>(pvResults)); | ||
667 | break; | ||
668 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: | 638 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: |
669 | hr = BalBaseBAProcOnDetectRelatedMsiPackage(pBA, reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_RESULTS*>(pvResults)); | 639 | hr = BalBaseBAProcOnDetectRelatedMsiPackage(pBA, reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_RESULTS*>(pvResults)); |
670 | break; | 640 | break; |
@@ -683,12 +653,6 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc( | |||
683 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: | 653 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: |
684 | hr = BalBaseBAProcOnPlanPackageBegin(pBA, reinterpret_cast<BA_ONPLANPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANPACKAGEBEGIN_RESULTS*>(pvResults)); | 654 | hr = BalBaseBAProcOnPlanPackageBegin(pBA, reinterpret_cast<BA_ONPLANPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANPACKAGEBEGIN_RESULTS*>(pvResults)); |
685 | break; | 655 | break; |
686 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN: | ||
687 | hr = BalBaseBAProcOnPlanCompatibleMsiPackageBegin(pBA, reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS*>(pvResults)); | ||
688 | break; | ||
689 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE: | ||
690 | hr = BalBaseBAProcOnPlanCompatibleMsiPackageComplete(pBA, reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS*>(pvResults)); | ||
691 | break; | ||
692 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE: | 656 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE: |
693 | hr = BalBaseBAProcOnPlanTargetMsiPackage(pBA, reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_RESULTS*>(pvResults)); | 657 | hr = BalBaseBAProcOnPlanTargetMsiPackage(pBA, reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_RESULTS*>(pvResults)); |
694 | break; | 658 | break; |
diff --git a/src/balutil/inc/IBootstrapperApplication.h b/src/balutil/inc/IBootstrapperApplication.h index dd8f8024..4569cdab 100644 --- a/src/balutil/inc/IBootstrapperApplication.h +++ b/src/balutil/inc/IBootstrapperApplication.h | |||
@@ -80,14 +80,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
80 | __inout BOOL* pfCancel | 80 | __inout BOOL* pfCancel |
81 | ) = 0; | 81 | ) = 0; |
82 | 82 | ||
83 | // OnDetectCompatibleMsiPackage - called when the engine detects that a package is not installed but a newer package using the same provider key is. | ||
84 | STDMETHOD(OnDetectCompatibleMsiPackage)( | ||
85 | __in_z LPCWSTR wzPackageId, | ||
86 | __in_z LPCWSTR wzCompatiblePackageId, | ||
87 | __in_z LPCWSTR wzCompatiblePackageVersion, | ||
88 | __inout BOOL* pfCancel | ||
89 | ) = 0; | ||
90 | |||
91 | // OnDetectRelatedMsiPackage - called when the engine begins detects a related package. | 83 | // OnDetectRelatedMsiPackage - called when the engine begins detects a related package. |
92 | STDMETHOD(OnDetectRelatedMsiPackage)( | 84 | STDMETHOD(OnDetectRelatedMsiPackage)( |
93 | __in_z LPCWSTR wzPackageId, | 85 | __in_z LPCWSTR wzPackageId, |
@@ -127,7 +119,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
127 | // OnDetectPackageComplete - called after the engine completes detection. | 119 | // OnDetectPackageComplete - called after the engine completes detection. |
128 | // | 120 | // |
129 | STDMETHOD(OnDetectComplete)( | 121 | STDMETHOD(OnDetectComplete)( |
130 | __in HRESULT hrStatus | 122 | __in HRESULT hrStatus, |
123 | __in BOOL fEligibleForCleanup | ||
131 | ) = 0; | 124 | ) = 0; |
132 | 125 | ||
133 | // OnPlanBegin - called when the engine begins planning. | 126 | // OnPlanBegin - called when the engine begins planning. |
@@ -152,28 +145,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
152 | __inout BOOL* pfCancel | 145 | __inout BOOL* pfCancel |
153 | ) = 0; | 146 | ) = 0; |
154 | 147 | ||
155 | // OnPlanCompatibleMsiPackageBegin - called when the engine plans a newer, compatible package using the same provider key. | ||
156 | STDMETHOD(OnPlanCompatibleMsiPackageBegin)( | ||
157 | __in_z LPCWSTR wzPackageId, | ||
158 | __in_z LPCWSTR wzCompatiblePackageId, | ||
159 | __in_z LPCWSTR wzCompatiblePackageVersion, | ||
160 | __in BOOTSTRAPPER_REQUEST_STATE recommendedState, | ||
161 | __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState, | ||
162 | __inout BOOL* pfCancel | ||
163 | ) = 0; | ||
164 | |||
165 | // OnPlanCompatibleMsiPackageComplete - called after the engine plans the package. | ||
166 | // | ||
167 | STDMETHOD(OnPlanCompatibleMsiPackageComplete)( | ||
168 | __in_z LPCWSTR wzPackageId, | ||
169 | __in_z LPCWSTR wzCompatiblePackageId, | ||
170 | __in HRESULT hrStatus, | ||
171 | __in BOOTSTRAPPER_PACKAGE_STATE state, | ||
172 | __in BOOTSTRAPPER_REQUEST_STATE requested, | ||
173 | __in BOOTSTRAPPER_ACTION_STATE execute, | ||
174 | __in BOOTSTRAPPER_ACTION_STATE rollback | ||
175 | ) = 0; | ||
176 | |||
177 | // OnPlanTargetMsiPackage - called when the engine plans an MSP package | 148 | // OnPlanTargetMsiPackage - called when the engine plans an MSP package |
178 | // to apply to an MSI package. | 149 | // to apply to an MSI package. |
179 | STDMETHOD(OnPlanTargetMsiPackage)( | 150 | STDMETHOD(OnPlanTargetMsiPackage)( |
diff --git a/src/balutil/packages.config b/src/balutil/packages.config index 15e2e31f..9a928742 100644 --- a/src/balutil/packages.config +++ b/src/balutil/packages.config | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" /> |
5 | <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" /> | 5 | <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" /> |
6 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |