From e619546617d6266645561428fbbe7a05d257eeba Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 4 Feb 2021 21:19:55 -0600 Subject: Update to latest Burn headers. --- src/WixToolset.Mba.Core/BootstrapperApplication.cs | 79 +---------- src/WixToolset.Mba.Core/EventArgs.cs | 155 ++------------------- .../IBootstrapperApplication.cs | 70 ++-------- .../IDefaultBootstrapperApplication.cs | 15 -- src/balutil/balutil.vcxproj | 4 +- src/balutil/inc/BAFunctions.h | 3 - src/balutil/inc/BalBaseBAFunctions.h | 38 +---- src/balutil/inc/BalBaseBAFunctionsProc.h | 3 - src/balutil/inc/BalBaseBootstrapperApplication.h | 40 +----- .../inc/BalBaseBootstrapperApplicationProc.h | 38 +---- src/balutil/inc/IBootstrapperApplication.h | 33 +---- src/balutil/packages.config | 2 +- src/bextutil/bextutil.vcxproj | 4 +- src/bextutil/packages.config | 2 +- src/mbanative/mbanative.vcxproj | 4 +- src/mbanative/packages.config | 2 +- src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | 4 +- src/test/BalUtilUnitTest/packages.config | 2 +- src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | 4 +- src/test/BextUtilUnitTest/packages.config | 2 +- 20 files changed, 40 insertions(+), 464 deletions(-) diff --git a/src/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/WixToolset.Mba.Core/BootstrapperApplication.cs index 759e76b1..9f4f6330 100644 --- a/src/WixToolset.Mba.Core/BootstrapperApplication.cs +++ b/src/WixToolset.Mba.Core/BootstrapperApplication.cs @@ -63,9 +63,6 @@ namespace WixToolset.Mba.Core /// public event EventHandler DetectPackageBegin; - - /// - public event EventHandler DetectCompatibleMsiPackage; /// public event EventHandler DetectRelatedMsiPackage; @@ -91,12 +88,6 @@ namespace WixToolset.Mba.Core /// public event EventHandler PlanPackageBegin; - /// - public event EventHandler PlanCompatibleMsiPackageBegin; - - /// - public event EventHandler PlanCompatibleMsiPackageComplete; - /// public event EventHandler PlanTargetMsiPackage; @@ -387,19 +378,6 @@ namespace WixToolset.Mba.Core } } - /// - /// Called by the engine, raises the event. - /// - /// Additional arguments for this event. - protected virtual void OnDetectCompatibleMsiPackage(DetectCompatibleMsiPackageEventArgs args) - { - EventHandler handler = this.DetectCompatibleMsiPackage; - if (null != handler) - { - handler(this, args); - } - } - /// /// Called by the engine, raises the event. /// @@ -504,32 +482,6 @@ namespace WixToolset.Mba.Core } } - /// - /// Called by the engine, raises the event. - /// - /// Additional arguments for this event. - protected virtual void OnPlanCompatibleMsiPackageBegin(PlanCompatibleMsiPackageBeginEventArgs args) - { - EventHandler handler = this.PlanCompatibleMsiPackageBegin; - if (null != handler) - { - handler(this, args); - } - } - - /// - /// Called by the engine, raises the event. - /// - /// Additional arguments for this event. - protected virtual void OnPlanCompatibleMsiPackageComplete(PlanCompatibleMsiPackageCompleteEventArgs args) - { - EventHandler handler = this.PlanCompatibleMsiPackageComplete; - if (null != handler) - { - handler(this, args); - } - } - /// /// Called by the engine, raises the event. /// @@ -1209,15 +1161,6 @@ namespace WixToolset.Mba.Core return args.HResult; } - int IBootstrapperApplication.OnDetectCompatibleMsiPackage(string wzPackageId, string wzCompatiblePackageId, string wzCompatiblePackageVersion, ref bool fCancel) - { - DetectCompatibleMsiPackageEventArgs args = new DetectCompatibleMsiPackageEventArgs(wzPackageId, wzCompatiblePackageId, wzCompatiblePackageVersion, fCancel); - this.OnDetectCompatibleMsiPackage(args); - - fCancel = args.Cancel; - return args.HResult; - } - int IBootstrapperApplication.OnDetectRelatedMsiPackage(string wzPackageId, string wzUpgradeCode, string wzProductCode, bool fPerMachine, string wzVersion, RelatedOperation operation, ref bool fCancel) { DetectRelatedMsiPackageEventArgs args = new DetectRelatedMsiPackageEventArgs(wzPackageId, wzUpgradeCode, wzProductCode, fPerMachine, wzVersion, operation, fCancel); @@ -1253,9 +1196,9 @@ namespace WixToolset.Mba.Core return args.HResult; } - int IBootstrapperApplication.OnDetectComplete(int hrStatus) + int IBootstrapperApplication.OnDetectComplete(int hrStatus, bool fEligibleForCleanup) { - DetectCompleteEventArgs args = new DetectCompleteEventArgs(hrStatus); + DetectCompleteEventArgs args = new DetectCompleteEventArgs(hrStatus, fEligibleForCleanup); this.OnDetectComplete(args); return args.HResult; @@ -1290,24 +1233,6 @@ namespace WixToolset.Mba.Core return args.HResult; } - int IBootstrapperApplication.OnPlanCompatibleMsiPackageBegin(string wzPackageId, string wzCompatiblePackageId, string wzCompatiblePackageVersion, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel) - { - PlanCompatibleMsiPackageBeginEventArgs args = new PlanCompatibleMsiPackageBeginEventArgs(wzPackageId, wzCompatiblePackageId, wzCompatiblePackageVersion, recommendedState, pRequestedState, fCancel); - this.OnPlanCompatibleMsiPackageBegin(args); - - pRequestedState = args.State; - fCancel = args.Cancel; - return args.HResult; - } - - int IBootstrapperApplication.OnPlanCompatibleMsiPackageComplete(string wzPackageId, string wzCompatiblePackageId, int hrStatus, PackageState state, RequestState requested, ActionState execute, ActionState rollback) - { - PlanCompatibleMsiPackageCompleteEventArgs args = new PlanCompatibleMsiPackageCompleteEventArgs(wzPackageId, wzCompatiblePackageId, hrStatus, state, requested, execute, rollback); - this.OnPlanCompatibleMsiPackageComplete(args); - - return args.HResult; - } - int IBootstrapperApplication.OnPlanTargetMsiPackage(string wzPackageId, string wzProductCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel) { PlanTargetMsiPackageEventArgs args = new PlanTargetMsiPackageEventArgs(wzPackageId, wzProductCode, recommendedState, pRequestedState, fCancel); diff --git a/src/WixToolset.Mba.Core/EventArgs.cs b/src/WixToolset.Mba.Core/EventArgs.cs index 4e59fd6f..2f21b50e 100644 --- a/src/WixToolset.Mba.Core/EventArgs.cs +++ b/src/WixToolset.Mba.Core/EventArgs.cs @@ -488,43 +488,6 @@ namespace WixToolset.Mba.Core public string PackageId { get; private set; } } - /// - /// Additional arguments used when a package was not found but a newer package using the same provider key was. - /// - [Serializable] - public class DetectCompatibleMsiPackageEventArgs : CancellableHResultEventArgs - { - /// - /// Creates a new instance of the class. - /// - /// The identity of the package that was not detected. - /// The identity of the compatible package that was detected. - /// The version of the compatible package that was detected. - /// The recommendation from the engine. - public DetectCompatibleMsiPackageEventArgs(string packageId, string compatiblePackageId, string compatiblePackageVersion, bool cancelRecommendation) - : base(cancelRecommendation) - { - this.PackageId = packageId; - this.CompatiblePackageId = compatiblePackageId; - this.CompatiblePackageVersion = compatiblePackageVersion; - } - - /// - /// Gets the identity of the package that was not detected. - /// - public string PackageId { get; private set; } - - /// - /// Gets the identity of the compatible package that was detected. - /// - public string CompatiblePackageId { get; private set; } - - /// - /// Gets the version of the compatible package that was detected. - /// - public string CompatiblePackageVersion { get; private set; } - } - /// /// Additional arguments used when a related MSI package has been detected for a package. /// @@ -695,10 +658,17 @@ namespace WixToolset.Mba.Core /// Creates a new instance of the class. /// /// The return code of the operation. - public DetectCompleteEventArgs(int hrStatus) + /// + public DetectCompleteEventArgs(int hrStatus, bool eligibleForCleanup) : base(hrStatus) { + this.EligibleForCleanup = eligibleForCleanup; } + + /// + /// Indicates whether the engine will uninstall the bundle if shutdown without running Apply. + /// + public bool EligibleForCleanup { get; private set; } } /// @@ -798,115 +768,6 @@ namespace WixToolset.Mba.Core public RequestState State { get; set; } } - /// - /// Additional arguments used when the engine is about to plan a newer package using the same provider key. - /// - [Serializable] - public class PlanCompatibleMsiPackageBeginEventArgs : CancellableHResultEventArgs - { - /// - /// Creates a new instance of the class. - /// - /// The identity of the package that was not detected. - /// The identity of the compatible package that was detected. - /// The version of the compatible package that was detected. - /// The recommended request state for the compatible package. - /// The requested state for the compatible package. - /// The recommendation from the engine. - public PlanCompatibleMsiPackageBeginEventArgs(string packageId, string compatiblePackageId, string compatiblePackageVersion, RequestState recommendedState, RequestState state, bool cancelRecommendation) - : base(cancelRecommendation) - { - this.PackageId = packageId; - this.CompatiblePackageId = compatiblePackageId; - this.CompatiblePackageVersion = compatiblePackageVersion; - this.RecommendedState = recommendedState; - this.State = state; - } - - /// - /// Gets the identity of the package that was not detected. - /// - public string PackageId { get; private set; } - - /// - /// Gets the identity of the compatible package detected. - /// - public string CompatiblePackageId { get; private set; } - - /// - /// Gets the version of the compatible package detected. - /// - public string CompatiblePackageVersion { get; private set; } - - /// - /// Gets the recommended state to use for the compatible package for planning. - /// - public RequestState RecommendedState { get; private set; } - - /// - /// Gets or sets the state to use for the compatible package for planning. - /// - public RequestState State { get; set; } - } - - /// - /// Additional arguments used when the engine has completed planning the installation of a specific package. - /// - [Serializable] - public class PlanCompatibleMsiPackageCompleteEventArgs : StatusEventArgs - { - /// - /// Creates a new instance of the class. - /// - /// The identity of the package planned for. - /// The identity of the compatible package that was detected. - /// The return code of the operation. - /// The current state of the package. - /// The requested state for the package - /// The execution action to take. - /// The rollback action to take. - public PlanCompatibleMsiPackageCompleteEventArgs(string packageId, string compatiblePackageId, int hrStatus, PackageState state, RequestState requested, ActionState execute, ActionState rollback) - : base(hrStatus) - { - this.PackageId = packageId; - this.CompatiblePackageId = compatiblePackageId; - this.State = state; - this.Requested = requested; - this.Execute = execute; - this.Rollback = rollback; - } - - /// - /// Gets the identity of the package planned for. - /// - public string PackageId { get; private set; } - - /// - /// Gets the identity of the compatible package detected. - /// - public string CompatiblePackageId { get; private set; } - - /// - /// Gets the current state of the package. - /// - public PackageState State { get; private set; } - - /// - /// Gets the requested state for the package. - /// - public RequestState Requested { get; private set; } - - /// - /// Gets the execution action to take. - /// - public ActionState Execute { get; private set; } - - /// - /// Gets the rollback action to take. - /// - public ActionState Rollback { get; private set; } - } - /// /// Additional arguments used when engine is about to plan a MSP applied to a target MSI package. /// diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs index 3c62370a..c1a32ed4 100644 --- a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs +++ b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs @@ -170,23 +170,6 @@ namespace WixToolset.Mba.Core [MarshalAs(UnmanagedType.Bool)] ref bool fCancel ); - /// - /// See . - /// - /// - /// - /// - /// - /// - [PreserveSig] - [return: MarshalAs(UnmanagedType.I4)] - int OnDetectCompatibleMsiPackage( - [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, - [MarshalAs(UnmanagedType.LPWStr)] string wzCompatiblePackageId, - [MarshalAs(UnmanagedType.LPWStr)] string wzCompatiblePackageVersion, - [MarshalAs(UnmanagedType.Bool)] ref bool fCancel - ); - /// /// See . /// @@ -263,11 +246,13 @@ namespace WixToolset.Mba.Core /// See . /// /// + /// /// [PreserveSig] [return: MarshalAs(UnmanagedType.I4)] int OnDetectComplete( - int hrStatus + int hrStatus, + [MarshalAs(UnmanagedType.Bool)] bool fEligibleForCleanup ); /// @@ -317,50 +302,6 @@ namespace WixToolset.Mba.Core [MarshalAs(UnmanagedType.Bool)] ref bool fCancel ); - /// - /// See . - /// - /// - /// - /// - /// - /// - /// - /// - [PreserveSig] - [return: MarshalAs(UnmanagedType.I4)] - int OnPlanCompatibleMsiPackageBegin( - [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, - [MarshalAs(UnmanagedType.LPWStr)] string wzCompatiblePackageId, - [MarshalAs(UnmanagedType.LPWStr)] string wzCompatiblePackageVersion, - [MarshalAs(UnmanagedType.U4)] RequestState recommendedState, - [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState, - [MarshalAs(UnmanagedType.Bool)] ref bool fCancel - ); - - /// - /// See . - /// - /// - /// - /// - /// - /// - /// - /// - /// - [PreserveSig] - [return: MarshalAs(UnmanagedType.I4)] - int OnPlanCompatibleMsiPackageComplete( - [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, - [MarshalAs(UnmanagedType.LPWStr)] string wzCompatiblePackageId, - int hrStatus, - [MarshalAs(UnmanagedType.U4)] PackageState state, - [MarshalAs(UnmanagedType.U4)] RequestState requested, - [MarshalAs(UnmanagedType.U4)] ActionState execute, - [MarshalAs(UnmanagedType.U4)] ActionState rollback - ); - /// /// See . /// @@ -1697,6 +1638,11 @@ namespace WixToolset.Mba.Core /// Typically used to switch from a native bootstrapper application to a managed one. /// ReloadBootstrapper, + + /// + /// Opts out of the engine behavior of trying to uninstall itself when no non-permanent packages are installed. + /// + SkipCleanup, } /// diff --git a/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs index b7e4759c..9970dc3e 100644 --- a/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs +++ b/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs @@ -89,11 +89,6 @@ namespace WixToolset.Mba.Core /// event EventHandler DetectBegin; - /// - /// Fired when a package was not detected but a package using the same provider key was. - /// - event EventHandler DetectCompatibleMsiPackage; - /// /// Fired when the detection phase has completed. /// @@ -229,16 +224,6 @@ namespace WixToolset.Mba.Core /// event EventHandler PlanBegin; - /// - /// Fired when the engine plans a new, compatible package using the same provider key. - /// - event EventHandler PlanCompatibleMsiPackageBegin; - - /// - /// Fired when the engine has completed planning the installation of a specific package. - /// - event EventHandler PlanCompatibleMsiPackageComplete; - /// /// Fired when the engine has completed planning the installation. /// 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 @@ - + @@ -98,7 +98,7 @@ 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}. - + 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 BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE, BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE, BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN, - BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE, BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE, BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE, BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE, BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE, BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE, BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN, - BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN, - BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE, BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE, 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 return S_OK; } - virtual STDMETHODIMP OnDetectCompatibleMsiPackage( - __in_z LPCWSTR /*wzPackageId*/, - __in_z LPCWSTR /*wzCompatiblePackageId*/, - __in LPCWSTR /*wzCompatiblePackageVersion*/, - __inout BOOL* /*pfCancel*/ - ) - { - return S_OK; - } - virtual STDMETHODIMP OnDetectRelatedMsiPackage( __in_z LPCWSTR /*wzPackageId*/, __in_z LPCWSTR /*wzUpgradeCode*/, @@ -217,7 +207,8 @@ public: // IBootstrapperApplication } virtual STDMETHODIMP OnDetectComplete( - __in HRESULT /*hrStatus*/ + __in HRESULT /*hrStatus*/, + __in BOOL /*fEligibleForCleanup*/ ) { return S_OK; @@ -251,31 +242,6 @@ public: // IBootstrapperApplication return S_OK; } - virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin( - __in_z LPCWSTR /*wzPackageId*/, - __in_z LPCWSTR /*wzCompatiblePackageId*/, - __in LPCWSTR /*wzCompatiblePackageVersion*/, - __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/, - __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/, - __inout BOOL* /*pfCancel*/ - ) - { - return S_OK; - } - - virtual STDMETHODIMP OnPlanCompatibleMsiPackageComplete( - __in_z LPCWSTR /*wzPackageId*/, - __in_z LPCWSTR /*wzCompatiblePackageId*/, - __in HRESULT /*hrStatus*/, - __in BOOTSTRAPPER_PACKAGE_STATE /*state*/, - __in BOOTSTRAPPER_REQUEST_STATE /*requested*/, - __in BOOTSTRAPPER_ACTION_STATE /*execute*/, - __in BOOTSTRAPPER_ACTION_STATE /*rollback*/ - ) - { - return S_OK; - } - virtual STDMETHODIMP OnPlanTargetMsiPackage( __in_z LPCWSTR /*wzPackageId*/, __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( case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE: case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE: case BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN: - case BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE: case BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE: case BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE: case BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE: case BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE: case BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE: case BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN: - case BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN: - case BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE: case BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE: case BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE: 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 return S_OK; } - virtual STDMETHODIMP OnDetectCompatibleMsiPackage( - __in_z LPCWSTR /*wzPackageId*/, - __in_z LPCWSTR /*wzCompatiblePackageId*/, - __in LPCWSTR /*wzCompatiblePackageVersion*/, - __inout BOOL* pfCancel - ) - { - *pfCancel |= CheckCanceled(); - return S_OK; - } - virtual STDMETHODIMP OnDetectRelatedMsiPackage( __in_z LPCWSTR /*wzPackageId*/, __in_z LPCWSTR /*wzUpgradeCode*/, @@ -224,7 +213,8 @@ public: // IBootstrapperApplication } virtual STDMETHODIMP OnDetectComplete( - __in HRESULT /*hrStatus*/ + __in HRESULT /*hrStatus*/, + __in BOOL /*fEligibleForCleanup*/ ) { return S_OK; @@ -261,32 +251,6 @@ public: // IBootstrapperApplication return S_OK; } - virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin( - __in_z LPCWSTR /*wzPackageId*/, - __in_z LPCWSTR /*wzCompatiblePackageId*/, - __in LPCWSTR /*wzCompatiblePackageVersion*/, - __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/, - __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/, - __inout BOOL* pfCancel - ) - { - *pfCancel |= CheckCanceled(); - return S_OK; - } - - virtual STDMETHODIMP OnPlanCompatibleMsiPackageComplete( - __in_z LPCWSTR /*wzPackageId*/, - __in_z LPCWSTR /*wzCompatiblePackageId*/, - __in HRESULT /*hrStatus*/, - __in BOOTSTRAPPER_PACKAGE_STATE /*state*/, - __in BOOTSTRAPPER_REQUEST_STATE /*requested*/, - __in BOOTSTRAPPER_ACTION_STATE /*execute*/, - __in BOOTSTRAPPER_ACTION_STATE /*rollback*/ - ) - { - return S_OK; - } - virtual STDMETHODIMP OnPlanTargetMsiPackage( __in_z LPCWSTR /*wzPackageId*/, __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( __inout BA_ONDETECTCOMPLETE_RESULTS* /*pResults*/ ) { - return pBA->OnDetectComplete(pArgs->hrStatus); + return pBA->OnDetectComplete(pArgs->hrStatus, pArgs->fEligibleForCleanup); } static HRESULT BalBaseBAProcOnPlanBegin( @@ -126,15 +126,6 @@ static HRESULT BalBaseBAProcOnDetectPackageBegin( return pBA->OnDetectPackageBegin(pArgs->wzPackageId, &pResults->fCancel); } -static HRESULT BalBaseBAProcOnDetectCompatiblePackage( - __in IBootstrapperApplication* pBA, - __in BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS* pArgs, - __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults - ) -{ - return pBA->OnDetectCompatibleMsiPackage(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->wzCompatiblePackageVersion, &pResults->fCancel); -} - static HRESULT BalBaseBAProcOnDetectRelatedMsiPackage( __in IBootstrapperApplication* pBA, __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, @@ -189,24 +180,6 @@ static HRESULT BalBaseBAProcOnPlanPackageBegin( return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel); } -static HRESULT BalBaseBAProcOnPlanCompatibleMsiPackageBegin( - __in IBootstrapperApplication* pBA, - __in BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS* pArgs, - __inout BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS* pResults - ) -{ - return pBA->OnPlanCompatibleMsiPackageBegin(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->wzCompatiblePackageVersion, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel); -} - -static HRESULT BalBaseBAProcOnPlanCompatibleMsiPackageComplete( - __in IBootstrapperApplication* pBA, - __in BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS* pArgs, - __inout BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS* /*pResults*/ - ) -{ - return pBA->OnPlanCompatibleMsiPackageComplete(pArgs->wzPackageId, pArgs->wzCompatiblePackageId, pArgs->hrStatus, pArgs->state, pArgs->requested, pArgs->execute, pArgs->rollback); -} - static HRESULT BalBaseBAProcOnPlanTargetMsiPackage( __in IBootstrapperApplication* pBA, __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs, @@ -662,9 +635,6 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc( case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: hr = BalBaseBAProcOnDetectPackageBegin(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE: - hr = BalBaseBAProcOnDetectCompatiblePackage(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: hr = BalBaseBAProcOnDetectRelatedMsiPackage(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; @@ -683,12 +653,6 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc( case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: hr = BalBaseBAProcOnPlanPackageBegin(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN: - hr = BalBaseBAProcOnPlanCompatibleMsiPackageBegin(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE: - hr = BalBaseBAProcOnPlanCompatibleMsiPackageComplete(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE: hr = BalBaseBAProcOnPlanTargetMsiPackage(pBA, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); 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 __inout BOOL* pfCancel ) = 0; - // OnDetectCompatibleMsiPackage - called when the engine detects that a package is not installed but a newer package using the same provider key is. - STDMETHOD(OnDetectCompatibleMsiPackage)( - __in_z LPCWSTR wzPackageId, - __in_z LPCWSTR wzCompatiblePackageId, - __in_z LPCWSTR wzCompatiblePackageVersion, - __inout BOOL* pfCancel - ) = 0; - // OnDetectRelatedMsiPackage - called when the engine begins detects a related package. STDMETHOD(OnDetectRelatedMsiPackage)( __in_z LPCWSTR wzPackageId, @@ -127,7 +119,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A // OnDetectPackageComplete - called after the engine completes detection. // STDMETHOD(OnDetectComplete)( - __in HRESULT hrStatus + __in HRESULT hrStatus, + __in BOOL fEligibleForCleanup ) = 0; // OnPlanBegin - called when the engine begins planning. @@ -152,28 +145,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A __inout BOOL* pfCancel ) = 0; - // OnPlanCompatibleMsiPackageBegin - called when the engine plans a newer, compatible package using the same provider key. - STDMETHOD(OnPlanCompatibleMsiPackageBegin)( - __in_z LPCWSTR wzPackageId, - __in_z LPCWSTR wzCompatiblePackageId, - __in_z LPCWSTR wzCompatiblePackageVersion, - __in BOOTSTRAPPER_REQUEST_STATE recommendedState, - __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState, - __inout BOOL* pfCancel - ) = 0; - - // OnPlanCompatibleMsiPackageComplete - called after the engine plans the package. - // - STDMETHOD(OnPlanCompatibleMsiPackageComplete)( - __in_z LPCWSTR wzPackageId, - __in_z LPCWSTR wzCompatiblePackageId, - __in HRESULT hrStatus, - __in BOOTSTRAPPER_PACKAGE_STATE state, - __in BOOTSTRAPPER_REQUEST_STATE requested, - __in BOOTSTRAPPER_ACTION_STATE execute, - __in BOOTSTRAPPER_ACTION_STATE rollback - ) = 0; - // OnPlanTargetMsiPackage - called when the engine plans an MSP package // to apply to an MSI package. 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 @@  - + \ No newline at end of file diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj index 140652c6..f81ce469 100644 --- a/src/bextutil/bextutil.vcxproj +++ b/src/bextutil/bextutil.vcxproj @@ -2,7 +2,7 @@ - + @@ -87,7 +87,7 @@ 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}. - + diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config index 15e2e31f..9a928742 100644 --- a/src/bextutil/packages.config +++ b/src/bextutil/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj index a8eda0b0..7132cf1a 100644 --- a/src/mbanative/mbanative.vcxproj +++ b/src/mbanative/mbanative.vcxproj @@ -5,7 +5,7 @@ - + @@ -94,7 +94,7 @@ - + \ No newline at end of file diff --git a/src/mbanative/packages.config b/src/mbanative/packages.config index 9f0405eb..b60fbb82 100644 --- a/src/mbanative/packages.config +++ b/src/mbanative/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index 4e14691e..5f250d39 100644 --- a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj @@ -4,7 +4,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/src/test/BalUtilUnitTest/packages.config b/src/test/BalUtilUnitTest/packages.config index cdbde0c8..273ae5d9 100644 --- a/src/test/BalUtilUnitTest/packages.config +++ b/src/test/BalUtilUnitTest/packages.config @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj index 0c170c02..c648b86b 100644 --- a/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj +++ b/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj @@ -4,7 +4,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/src/test/BextUtilUnitTest/packages.config b/src/test/BextUtilUnitTest/packages.config index cdbde0c8..273ae5d9 100644 --- a/src/test/BextUtilUnitTest/packages.config +++ b/src/test/BextUtilUnitTest/packages.config @@ -10,6 +10,6 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb