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/api | |
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/api')
11 files changed, 159 insertions, 14 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h index ea3be214..ad3ef8a3 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h | |||
@@ -226,6 +226,7 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE | |||
226 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYDOWNGRADE, | 226 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYDOWNGRADE, |
227 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROCESSCANCEL, | 227 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROCESSCANCEL, |
228 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, | 228 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, |
229 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE, | ||
229 | }; | 230 | }; |
230 | 231 | ||
231 | enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION | 232 | enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION |
@@ -257,6 +258,14 @@ enum BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION | |||
257 | BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION_RETRY, | 258 | BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION_RETRY, |
258 | }; | 259 | }; |
259 | 260 | ||
261 | enum BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION | ||
262 | { | ||
263 | BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION_NONE, | ||
264 | // Instructs the engine to try to acquire the package so execution can use it. | ||
265 | // Most of the time this is used for installing the package during rollback. | ||
266 | BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION_ACQUIRE, | ||
267 | }; | ||
268 | |||
260 | enum BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION | 269 | enum BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION |
261 | { | 270 | { |
262 | BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION_NONE, | 271 | BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION_NONE, |
@@ -546,6 +555,8 @@ struct BA_ONCACHEPACKAGEBEGIN_ARGS | |||
546 | LPCWSTR wzPackageId; | 555 | LPCWSTR wzPackageId; |
547 | DWORD cCachePayloads; | 556 | DWORD cCachePayloads; |
548 | DWORD64 dw64PackageCacheSize; | 557 | DWORD64 dw64PackageCacheSize; |
558 | // If caching a package is not vital, then acquisition will be skipped unless the BA opts in through OnCachePackageNonVitalValidationFailure. | ||
559 | BOOL fVital; | ||
549 | }; | 560 | }; |
550 | 561 | ||
551 | struct BA_ONCACHEPACKAGEBEGIN_RESULTS | 562 | struct BA_ONCACHEPACKAGEBEGIN_RESULTS |
@@ -568,6 +579,20 @@ struct BA_ONCACHEPACKAGECOMPLETE_RESULTS | |||
568 | BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION action; | 579 | BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION action; |
569 | }; | 580 | }; |
570 | 581 | ||
582 | struct BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS | ||
583 | { | ||
584 | DWORD cbSize; | ||
585 | LPCWSTR wzPackageId; | ||
586 | HRESULT hrStatus; | ||
587 | BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION recommendation; | ||
588 | }; | ||
589 | |||
590 | struct BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_RESULTS | ||
591 | { | ||
592 | DWORD cbSize; | ||
593 | BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION action; | ||
594 | }; | ||
595 | |||
571 | struct BA_ONCACHEPAYLOADEXTRACTBEGIN_ARGS | 596 | struct BA_ONCACHEPAYLOADEXTRACTBEGIN_ARGS |
572 | { | 597 | { |
573 | DWORD cbSize; | 598 | DWORD cbSize; |
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs index bb34a33e..fe9322ce 100644 --- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs +++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs | |||
@@ -280,6 +280,9 @@ namespace WixToolset.Mba.Core | |||
280 | /// <inheritdoc/> | 280 | /// <inheritdoc/> |
281 | public event EventHandler<DetectRelatedBundlePackageEventArgs> DetectRelatedBundlePackage; | 281 | public event EventHandler<DetectRelatedBundlePackageEventArgs> DetectRelatedBundlePackage; |
282 | 282 | ||
283 | /// <inheritdoc/> | ||
284 | public event EventHandler<CachePackageNonVitalValidationFailureEventArgs> CachePackageNonVitalValidationFailure; | ||
285 | |||
283 | /// <summary> | 286 | /// <summary> |
284 | /// Entry point that is called when the bootstrapper application is ready to run. | 287 | /// Entry point that is called when the bootstrapper application is ready to run. |
285 | /// </summary> | 288 | /// </summary> |
@@ -1376,6 +1379,18 @@ namespace WixToolset.Mba.Core | |||
1376 | } | 1379 | } |
1377 | } | 1380 | } |
1378 | 1381 | ||
1382 | /// <summary> | ||
1383 | /// Called by the engine, raises the <see cref="CachePackageNonVitalValidationFailure"/> event. | ||
1384 | /// </summary> | ||
1385 | protected virtual void OnCachePackageNonVitalValidationFailure(CachePackageNonVitalValidationFailureEventArgs args) | ||
1386 | { | ||
1387 | EventHandler<CachePackageNonVitalValidationFailureEventArgs> handler = this.CachePackageNonVitalValidationFailure; | ||
1388 | if (null != handler) | ||
1389 | { | ||
1390 | handler(this, args); | ||
1391 | } | ||
1392 | } | ||
1393 | |||
1379 | #region IBootstrapperApplication Members | 1394 | #region IBootstrapperApplication Members |
1380 | 1395 | ||
1381 | int IBootstrapperApplication.BAProc(int message, IntPtr pvArgs, IntPtr pvResults, IntPtr pvContext) | 1396 | int IBootstrapperApplication.BAProc(int message, IntPtr pvArgs, IntPtr pvResults, IntPtr pvContext) |
@@ -1570,6 +1585,7 @@ namespace WixToolset.Mba.Core | |||
1570 | this.OnPlanPackageBegin(args); | 1585 | this.OnPlanPackageBegin(args); |
1571 | 1586 | ||
1572 | pRequestedState = args.State; | 1587 | pRequestedState = args.State; |
1588 | pRequestedCacheType = args.CacheType; | ||
1573 | fCancel = args.Cancel; | 1589 | fCancel = args.Cancel; |
1574 | return args.HResult; | 1590 | return args.HResult; |
1575 | } | 1591 | } |
@@ -1728,9 +1744,9 @@ namespace WixToolset.Mba.Core | |||
1728 | return args.HResult; | 1744 | return args.HResult; |
1729 | } | 1745 | } |
1730 | 1746 | ||
1731 | int IBootstrapperApplication.OnCachePackageBegin(string wzPackageId, int cCachePayloads, long dw64PackageCacheSize, ref bool fCancel) | 1747 | int IBootstrapperApplication.OnCachePackageBegin(string wzPackageId, int cCachePayloads, long dw64PackageCacheSize, bool fVital, ref bool fCancel) |
1732 | { | 1748 | { |
1733 | CachePackageBeginEventArgs args = new CachePackageBeginEventArgs(wzPackageId, cCachePayloads, dw64PackageCacheSize, fCancel); | 1749 | CachePackageBeginEventArgs args = new CachePackageBeginEventArgs(wzPackageId, cCachePayloads, dw64PackageCacheSize, fVital, fCancel); |
1734 | this.OnCachePackageBegin(args); | 1750 | this.OnCachePackageBegin(args); |
1735 | 1751 | ||
1736 | fCancel = args.Cancel; | 1752 | fCancel = args.Cancel; |
@@ -2131,6 +2147,15 @@ namespace WixToolset.Mba.Core | |||
2131 | return args.HResult; | 2147 | return args.HResult; |
2132 | } | 2148 | } |
2133 | 2149 | ||
2150 | int IBootstrapperApplication.OnCachePackageNonVitalValidationFailure(string wzPackageId, int hrStatus, BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION recommendation, ref BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION action) | ||
2151 | { | ||
2152 | CachePackageNonVitalValidationFailureEventArgs args = new CachePackageNonVitalValidationFailureEventArgs(wzPackageId, hrStatus, recommendation, action); | ||
2153 | this.OnCachePackageNonVitalValidationFailure(args); | ||
2154 | |||
2155 | action = args.Action; | ||
2156 | return args.HResult; | ||
2157 | } | ||
2158 | |||
2134 | #endregion | 2159 | #endregion |
2135 | } | 2160 | } |
2136 | } | 2161 | } |
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs index be113700..2b414d91 100644 --- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs +++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs | |||
@@ -1930,12 +1930,13 @@ namespace WixToolset.Mba.Core | |||
1930 | public class CachePackageBeginEventArgs : CancellableHResultEventArgs | 1930 | public class CachePackageBeginEventArgs : CancellableHResultEventArgs |
1931 | { | 1931 | { |
1932 | /// <summary /> | 1932 | /// <summary /> |
1933 | public CachePackageBeginEventArgs(string packageId, int cachePayloads, long packageCacheSize, bool cancelRecommendation) | 1933 | public CachePackageBeginEventArgs(string packageId, int cachePayloads, long packageCacheSize, bool vital, bool cancelRecommendation) |
1934 | : base(cancelRecommendation) | 1934 | : base(cancelRecommendation) |
1935 | { | 1935 | { |
1936 | this.PackageId = packageId; | 1936 | this.PackageId = packageId; |
1937 | this.CachePayloads = cachePayloads; | 1937 | this.CachePayloads = cachePayloads; |
1938 | this.PackageCacheSize = packageCacheSize; | 1938 | this.PackageCacheSize = packageCacheSize; |
1939 | this.Vital = vital; | ||
1939 | } | 1940 | } |
1940 | 1941 | ||
1941 | /// <summary> | 1942 | /// <summary> |
@@ -1952,6 +1953,11 @@ namespace WixToolset.Mba.Core | |||
1952 | /// Gets the size on disk required by the specific package. | 1953 | /// Gets the size on disk required by the specific package. |
1953 | /// </summary> | 1954 | /// </summary> |
1954 | public long PackageCacheSize { get; private set; } | 1955 | public long PackageCacheSize { get; private set; } |
1956 | |||
1957 | /// <summary> | ||
1958 | /// If caching a package is not vital, then acquisition will be skipped unless the BA opts in through <see cref="IDefaultBootstrapperApplication.CachePackageNonVitalValidationFailure"/>. | ||
1959 | /// </summary> | ||
1960 | public bool Vital { get; private set; } | ||
1955 | } | 1961 | } |
1956 | 1962 | ||
1957 | /// <summary> | 1963 | /// <summary> |
@@ -2482,4 +2488,23 @@ namespace WixToolset.Mba.Core | |||
2482 | /// </summary> | 2488 | /// </summary> |
2483 | public string Version { get; private set; } | 2489 | public string Version { get; private set; } |
2484 | } | 2490 | } |
2491 | |||
2492 | /// <summary> | ||
2493 | /// Event arguments for <see cref="IDefaultBootstrapperApplication.CachePackageNonVitalValidationFailure"/> | ||
2494 | /// </summary> | ||
2495 | [Serializable] | ||
2496 | public class CachePackageNonVitalValidationFailureEventArgs : ActionEventArgs<BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION> | ||
2497 | { | ||
2498 | /// <summary /> | ||
2499 | public CachePackageNonVitalValidationFailureEventArgs(string packageId, int hrStatus, BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION recommendation, BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION action) | ||
2500 | : base(hrStatus, recommendation, action) | ||
2501 | { | ||
2502 | this.PackageId = packageId; | ||
2503 | } | ||
2504 | |||
2505 | /// <summary> | ||
2506 | /// Gets the identity of the package that was being validated. | ||
2507 | /// </summary> | ||
2508 | public string PackageId { get; private set; } | ||
2509 | } | ||
2485 | } | 2510 | } |
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs index 8ce99808..87da2191 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs | |||
@@ -553,17 +553,13 @@ namespace WixToolset.Mba.Core | |||
553 | /// <summary> | 553 | /// <summary> |
554 | /// See <see cref="IDefaultBootstrapperApplication.CachePackageBegin"/>. | 554 | /// See <see cref="IDefaultBootstrapperApplication.CachePackageBegin"/>. |
555 | /// </summary> | 555 | /// </summary> |
556 | /// <param name="wzPackageId"></param> | ||
557 | /// <param name="cCachePayloads"></param> | ||
558 | /// <param name="dw64PackageCacheSize"></param> | ||
559 | /// <param name="fCancel"></param> | ||
560 | /// <returns></returns> | ||
561 | [PreserveSig] | 556 | [PreserveSig] |
562 | [return: MarshalAs(UnmanagedType.I4)] | 557 | [return: MarshalAs(UnmanagedType.I4)] |
563 | int OnCachePackageBegin( | 558 | int OnCachePackageBegin( |
564 | [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, | 559 | [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, |
565 | [MarshalAs(UnmanagedType.U4)] int cCachePayloads, | 560 | [MarshalAs(UnmanagedType.U4)] int cCachePayloads, |
566 | [MarshalAs(UnmanagedType.U8)] long dw64PackageCacheSize, | 561 | [MarshalAs(UnmanagedType.U8)] long dw64PackageCacheSize, |
562 | [MarshalAs(UnmanagedType.Bool)] bool fVital, | ||
567 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel | 563 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel |
568 | ); | 564 | ); |
569 | 565 | ||
@@ -672,11 +668,6 @@ namespace WixToolset.Mba.Core | |||
672 | /// <summary> | 668 | /// <summary> |
673 | /// See <see cref="IDefaultBootstrapperApplication.CachePackageComplete"/>. | 669 | /// See <see cref="IDefaultBootstrapperApplication.CachePackageComplete"/>. |
674 | /// </summary> | 670 | /// </summary> |
675 | /// <param name="wzPackageId"></param> | ||
676 | /// <param name="hrStatus"></param> | ||
677 | /// <param name="recommendation"></param> | ||
678 | /// <param name="action"></param> | ||
679 | /// <returns></returns> | ||
680 | [PreserveSig] | 671 | [PreserveSig] |
681 | [return: MarshalAs(UnmanagedType.I4)] | 672 | [return: MarshalAs(UnmanagedType.I4)] |
682 | int OnCachePackageComplete( | 673 | int OnCachePackageComplete( |
@@ -1184,6 +1175,18 @@ namespace WixToolset.Mba.Core | |||
1184 | [MarshalAs(UnmanagedType.LPWStr)] string wzVersion, | 1175 | [MarshalAs(UnmanagedType.LPWStr)] string wzVersion, |
1185 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel | 1176 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel |
1186 | ); | 1177 | ); |
1178 | |||
1179 | /// <summary> | ||
1180 | /// See <see cref="IDefaultBootstrapperApplication.CachePackageNonVitalValidationFailure"/>. | ||
1181 | /// </summary> | ||
1182 | [PreserveSig] | ||
1183 | [return: MarshalAs(UnmanagedType.I4)] | ||
1184 | int OnCachePackageNonVitalValidationFailure( | ||
1185 | [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, | ||
1186 | int hrStatus, | ||
1187 | BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION recommendation, | ||
1188 | ref BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION action | ||
1189 | ); | ||
1187 | } | 1190 | } |
1188 | 1191 | ||
1189 | /// <summary> | 1192 | /// <summary> |
@@ -1871,6 +1874,23 @@ namespace WixToolset.Mba.Core | |||
1871 | } | 1874 | } |
1872 | 1875 | ||
1873 | /// <summary> | 1876 | /// <summary> |
1877 | /// The available actions for <see cref="IDefaultBootstrapperApplication.CachePackageNonVitalValidationFailure"/> | ||
1878 | /// </summary> | ||
1879 | public enum BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION | ||
1880 | { | ||
1881 | /// <summary> | ||
1882 | /// | ||
1883 | /// </summary> | ||
1884 | None, | ||
1885 | |||
1886 | /// <summary> | ||
1887 | /// Instructs the engine to try to acquire the package so execution can use it. | ||
1888 | /// Most of the time this is used for installing the package during rollback. | ||
1889 | /// </summary> | ||
1890 | Acquire, | ||
1891 | } | ||
1892 | |||
1893 | /// <summary> | ||
1874 | /// The available actions for <see cref="IDefaultBootstrapperApplication.CacheVerifyComplete"/>. | 1894 | /// The available actions for <see cref="IDefaultBootstrapperApplication.CacheVerifyComplete"/>. |
1875 | /// </summary> | 1895 | /// </summary> |
1876 | public enum BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION | 1896 | public enum BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION |
diff --git a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs index 2535f756..2fa88bdb 100644 --- a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs +++ b/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs | |||
@@ -94,6 +94,11 @@ namespace WixToolset.Mba.Core | |||
94 | event EventHandler<CachePackageCompleteEventArgs> CachePackageComplete; | 94 | event EventHandler<CachePackageCompleteEventArgs> CachePackageComplete; |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
97 | /// Fired when the engine failed validating a package in the package cache that is non-vital to execution. | ||
98 | /// </summary> | ||
99 | event EventHandler<CachePackageNonVitalValidationFailureEventArgs> CachePackageNonVitalValidationFailure; | ||
100 | |||
101 | /// <summary> | ||
97 | /// Fired when the engine begins the extraction of the payload from the container. | 102 | /// Fired when the engine begins the extraction of the payload from the container. |
98 | /// </summary> | 103 | /// </summary> |
99 | event EventHandler<CachePayloadExtractBeginEventArgs> CachePayloadExtractBegin; | 104 | event EventHandler<CachePayloadExtractBeginEventArgs> CachePayloadExtractBegin; |
diff --git a/src/api/burn/balutil/inc/BAFunctions.h b/src/api/burn/balutil/inc/BAFunctions.h index b23dd02e..8ecc04ff 100644 --- a/src/api/burn/balutil/inc/BAFunctions.h +++ b/src/api/burn/balutil/inc/BAFunctions.h | |||
@@ -92,6 +92,7 @@ enum BA_FUNCTIONS_MESSAGE | |||
92 | BA_FUNCTIONS_MESSAGE_ONAPPLYDOWNGRADE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYDOWNGRADE, | 92 | BA_FUNCTIONS_MESSAGE_ONAPPLYDOWNGRADE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYDOWNGRADE, |
93 | BA_FUNCTIONS_MESSAGE_ONEXECUTEPROCESSCANCEL = BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROCESSCANCEL, | 93 | BA_FUNCTIONS_MESSAGE_ONEXECUTEPROCESSCANCEL = BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROCESSCANCEL, |
94 | BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, | 94 | BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, |
95 | BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE, | ||
95 | 96 | ||
96 | BA_FUNCTIONS_MESSAGE_ONTHEMELOADED = 1024, | 97 | BA_FUNCTIONS_MESSAGE_ONTHEMELOADED = 1024, |
97 | BA_FUNCTIONS_MESSAGE_WNDPROC, | 98 | BA_FUNCTIONS_MESSAGE_WNDPROC, |
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index ca070553..49e97815 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h | |||
@@ -447,6 +447,7 @@ public: // IBootstrapperApplication | |||
447 | __in_z LPCWSTR /*wzPackageId*/, | 447 | __in_z LPCWSTR /*wzPackageId*/, |
448 | __in DWORD /*cCachePayloads*/, | 448 | __in DWORD /*cCachePayloads*/, |
449 | __in DWORD64 /*dw64PackageCacheSize*/, | 449 | __in DWORD64 /*dw64PackageCacheSize*/, |
450 | __in BOOL /*fVital*/, | ||
450 | __inout BOOL* /*pfCancel*/ | 451 | __inout BOOL* /*pfCancel*/ |
451 | ) | 452 | ) |
452 | { | 453 | { |
@@ -892,6 +893,16 @@ public: // IBootstrapperApplication | |||
892 | return S_OK; | 893 | return S_OK; |
893 | } | 894 | } |
894 | 895 | ||
896 | virtual STDMETHODIMP OnCachePackageNonVitalValidationFailure( | ||
897 | __in_z LPCWSTR /*wzPackageId*/, | ||
898 | __in HRESULT /*hrStatus*/, | ||
899 | __in BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION /*recommendation*/, | ||
900 | __inout BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION* /*pAction*/ | ||
901 | ) | ||
902 | { | ||
903 | return S_OK; | ||
904 | } | ||
905 | |||
895 | public: // IBAFunctions | 906 | public: // IBAFunctions |
896 | virtual STDMETHODIMP OnPlan( | 907 | virtual STDMETHODIMP OnPlan( |
897 | ) | 908 | ) |
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h index ff92717d..e10decfc 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h | |||
@@ -163,6 +163,7 @@ static HRESULT WINAPI BalBaseBAFunctionsProc( | |||
163 | case BA_FUNCTIONS_MESSAGE_ONAPPLYDOWNGRADE: | 163 | case BA_FUNCTIONS_MESSAGE_ONAPPLYDOWNGRADE: |
164 | case BA_FUNCTIONS_MESSAGE_ONEXECUTEPROCESSCANCEL: | 164 | case BA_FUNCTIONS_MESSAGE_ONEXECUTEPROCESSCANCEL: |
165 | case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE: | 165 | case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE: |
166 | case BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE: | ||
166 | hr = BalBaseBootstrapperApplicationProc((BOOTSTRAPPER_APPLICATION_MESSAGE)message, pvArgs, pvResults, pvContext); | 167 | hr = BalBaseBootstrapperApplicationProc((BOOTSTRAPPER_APPLICATION_MESSAGE)message, pvArgs, pvResults, pvContext); |
167 | break; | 168 | break; |
168 | case BA_FUNCTIONS_MESSAGE_ONTHEMELOADED: | 169 | case BA_FUNCTIONS_MESSAGE_ONTHEMELOADED: |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h index fc9c4dd7..aa1ca56f 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | |||
@@ -505,6 +505,7 @@ public: // IBootstrapperApplication | |||
505 | __in_z LPCWSTR /*wzPackageId*/, | 505 | __in_z LPCWSTR /*wzPackageId*/, |
506 | __in DWORD /*cCachePayloads*/, | 506 | __in DWORD /*cCachePayloads*/, |
507 | __in DWORD64 /*dw64PackageCacheSize*/, | 507 | __in DWORD64 /*dw64PackageCacheSize*/, |
508 | __in BOOL /*fVital*/, | ||
508 | __inout BOOL* pfCancel | 509 | __inout BOOL* pfCancel |
509 | ) | 510 | ) |
510 | { | 511 | { |
@@ -1084,6 +1085,16 @@ public: // IBootstrapperApplication | |||
1084 | return S_OK; | 1085 | return S_OK; |
1085 | } | 1086 | } |
1086 | 1087 | ||
1088 | virtual STDMETHODIMP OnCachePackageNonVitalValidationFailure( | ||
1089 | __in_z LPCWSTR /*wzPackageId*/, | ||
1090 | __in HRESULT /*hrStatus*/, | ||
1091 | __in BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION /*recommendation*/, | ||
1092 | __inout BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION* /*pAction*/ | ||
1093 | ) | ||
1094 | { | ||
1095 | return S_OK; | ||
1096 | } | ||
1097 | |||
1087 | public: //CBalBaseBootstrapperApplication | 1098 | public: //CBalBaseBootstrapperApplication |
1088 | virtual STDMETHODIMP Initialize( | 1099 | virtual STDMETHODIMP Initialize( |
1089 | __in const BOOTSTRAPPER_CREATE_ARGS* pCreateArgs | 1100 | __in const BOOTSTRAPPER_CREATE_ARGS* pCreateArgs |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h index 92243540..3054731f 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h | |||
@@ -330,7 +330,7 @@ static HRESULT BalBaseBAProcOnCachePackageBegin( | |||
330 | __inout BA_ONCACHEPACKAGEBEGIN_RESULTS* pResults | 330 | __inout BA_ONCACHEPACKAGEBEGIN_RESULTS* pResults |
331 | ) | 331 | ) |
332 | { | 332 | { |
333 | return pBA->OnCachePackageBegin(pArgs->wzPackageId, pArgs->cCachePayloads, pArgs->dw64PackageCacheSize, &pResults->fCancel); | 333 | return pBA->OnCachePackageBegin(pArgs->wzPackageId, pArgs->cCachePayloads, pArgs->dw64PackageCacheSize, pArgs->fVital, &pResults->fCancel); |
334 | } | 334 | } |
335 | 335 | ||
336 | static HRESULT BalBaseBAProcOnCacheAcquireBegin( | 336 | static HRESULT BalBaseBAProcOnCacheAcquireBegin( |
@@ -756,6 +756,15 @@ static HRESULT BalBaseBAProcOnDetectRelatedBundlePackage( | |||
756 | return pBA->OnDetectRelatedBundlePackage(pArgs->wzPackageId, pArgs->wzBundleId, pArgs->relationType, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel); | 756 | return pBA->OnDetectRelatedBundlePackage(pArgs->wzPackageId, pArgs->wzBundleId, pArgs->relationType, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel); |
757 | } | 757 | } |
758 | 758 | ||
759 | static HRESULT BalBaseBAProcOnCachePackageNonVitalValidationFailure( | ||
760 | __in IBootstrapperApplication* pBA, | ||
761 | __in BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS* pArgs, | ||
762 | __inout BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_RESULTS* pResults | ||
763 | ) | ||
764 | { | ||
765 | return pBA->OnCachePackageNonVitalValidationFailure(pArgs->wzPackageId, pArgs->hrStatus, pArgs->recommendation, &pResults->action); | ||
766 | } | ||
767 | |||
759 | /******************************************************************* | 768 | /******************************************************************* |
760 | BalBaseBootstrapperApplicationProc - requires pvContext to be of type IBootstrapperApplication. | 769 | BalBaseBootstrapperApplicationProc - requires pvContext to be of type IBootstrapperApplication. |
761 | Provides a default mapping between the new message based BA interface and | 770 | Provides a default mapping between the new message based BA interface and |
@@ -1024,6 +1033,9 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc( | |||
1024 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE: | 1033 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE: |
1025 | hr = BalBaseBAProcOnDetectRelatedBundlePackage(pBA, reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS*>(pvResults)); | 1034 | hr = BalBaseBAProcOnDetectRelatedBundlePackage(pBA, reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS*>(pvResults)); |
1026 | break; | 1035 | break; |
1036 | case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGENONVITALVALIDATIONFAILURE: | ||
1037 | hr = BalBaseBAProcOnCachePackageNonVitalValidationFailure(pBA, reinterpret_cast<BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS*>(pvArgs), reinterpret_cast<BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_RESULTS*>(pvResults)); | ||
1038 | break; | ||
1027 | } | 1039 | } |
1028 | } | 1040 | } |
1029 | 1041 | ||
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h index 382d5aad..0362e171 100644 --- a/src/api/burn/balutil/inc/IBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h | |||
@@ -343,6 +343,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
343 | __in_z LPCWSTR wzPackageId, | 343 | __in_z LPCWSTR wzPackageId, |
344 | __in DWORD cCachePayloads, | 344 | __in DWORD cCachePayloads, |
345 | __in DWORD64 dw64PackageCacheSize, | 345 | __in DWORD64 dw64PackageCacheSize, |
346 | __in BOOL fVital, | ||
346 | __inout BOOL* pfCancel | 347 | __inout BOOL* pfCancel |
347 | ) = 0; | 348 | ) = 0; |
348 | 349 | ||
@@ -728,4 +729,12 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
728 | __in_z LPCWSTR wzVersion, | 729 | __in_z LPCWSTR wzVersion, |
729 | __inout BOOL* pfCancel | 730 | __inout BOOL* pfCancel |
730 | ) = 0; | 731 | ) = 0; |
732 | |||
733 | // OnCachePackageNonVitalValidationFailure - called when the engine failed validating a package in the package cache that is non-vital to execution. | ||
734 | STDMETHOD(OnCachePackageNonVitalValidationFailure)( | ||
735 | __in_z LPCWSTR wzPackageId, | ||
736 | __in HRESULT hrStatus, | ||
737 | __in BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION recommendation, | ||
738 | __inout BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION* pAction | ||
739 | ) = 0; | ||
731 | }; | 740 | }; |