diff options
Diffstat (limited to 'src/api/burn')
8 files changed, 12 insertions, 12 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h index 5c6258d0..9a5fb8f8 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h | |||
@@ -642,7 +642,7 @@ struct BA_ONCOMMITMSITRANSACTIONCOMPLETE_RESULTS | |||
642 | struct BA_ONDETECTBEGIN_ARGS | 642 | struct BA_ONDETECTBEGIN_ARGS |
643 | { | 643 | { |
644 | DWORD cbSize; | 644 | DWORD cbSize; |
645 | BOOL fInstalled; | 645 | BOOTSTRAPPER_REGISTRATION_TYPE registrationType; |
646 | DWORD cPackages; | 646 | DWORD cPackages; |
647 | BOOL fCached; | 647 | BOOL fCached; |
648 | }; | 648 | }; |
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs index b08e66c0..1df992be 100644 --- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs +++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs | |||
@@ -1378,9 +1378,9 @@ namespace WixToolset.Mba.Core | |||
1378 | return args.HResult; | 1378 | return args.HResult; |
1379 | } | 1379 | } |
1380 | 1380 | ||
1381 | int IBootstrapperApplication.OnDetectBegin(bool fCached, bool fInstalled, int cPackages, ref bool fCancel) | 1381 | int IBootstrapperApplication.OnDetectBegin(bool fCached, RegistrationType registrationType, int cPackages, ref bool fCancel) |
1382 | { | 1382 | { |
1383 | DetectBeginEventArgs args = new DetectBeginEventArgs(fCached, fInstalled, cPackages, fCancel); | 1383 | DetectBeginEventArgs args = new DetectBeginEventArgs(fCached, registrationType, cPackages, fCancel); |
1384 | this.OnDetectBegin(args); | 1384 | this.OnDetectBegin(args); |
1385 | 1385 | ||
1386 | fCancel = args.Cancel; | 1386 | fCancel = args.Cancel; |
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs index 2e1e1be3..816757cc 100644 --- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs +++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs | |||
@@ -249,11 +249,11 @@ namespace WixToolset.Mba.Core | |||
249 | public class DetectBeginEventArgs : CancellableHResultEventArgs | 249 | public class DetectBeginEventArgs : CancellableHResultEventArgs |
250 | { | 250 | { |
251 | /// <summary /> | 251 | /// <summary /> |
252 | public DetectBeginEventArgs(bool cached, bool installed, int packageCount, bool cancelRecommendation) | 252 | public DetectBeginEventArgs(bool cached, RegistrationType registrationType, int packageCount, bool cancelRecommendation) |
253 | : base(cancelRecommendation) | 253 | : base(cancelRecommendation) |
254 | { | 254 | { |
255 | this.Cached = cached; | 255 | this.Cached = cached; |
256 | this.Installed = installed; | 256 | this.RegistrationType = registrationType; |
257 | this.PackageCount = packageCount; | 257 | this.PackageCount = packageCount; |
258 | } | 258 | } |
259 | 259 | ||
@@ -263,9 +263,9 @@ namespace WixToolset.Mba.Core | |||
263 | public bool Cached { get; private set; } | 263 | public bool Cached { get; private set; } |
264 | 264 | ||
265 | /// <summary> | 265 | /// <summary> |
266 | /// Gets whether the bundle is installed. | 266 | /// Gets the bundle's registration state. |
267 | /// </summary> | 267 | /// </summary> |
268 | public bool Installed { get; private set; } | 268 | public RegistrationType RegistrationType { get; private set; } |
269 | 269 | ||
270 | /// <summary> | 270 | /// <summary> |
271 | /// Gets the number of packages to detect. | 271 | /// Gets the number of packages to detect. |
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs index 4fbe5e18..489e3b6d 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs | |||
@@ -70,7 +70,7 @@ namespace WixToolset.Mba.Core | |||
70 | [return: MarshalAs(UnmanagedType.I4)] | 70 | [return: MarshalAs(UnmanagedType.I4)] |
71 | int OnDetectBegin( | 71 | int OnDetectBegin( |
72 | [MarshalAs(UnmanagedType.Bool)] bool fCached, | 72 | [MarshalAs(UnmanagedType.Bool)] bool fCached, |
73 | [MarshalAs(UnmanagedType.Bool)] bool fInstalled, | 73 | [MarshalAs(UnmanagedType.U4)] RegistrationType registrationType, |
74 | [MarshalAs(UnmanagedType.U4)] int cPackages, | 74 | [MarshalAs(UnmanagedType.U4)] int cPackages, |
75 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel | 75 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel |
76 | ); | 76 | ); |
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index e98ebc9f..60a70e3e 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h | |||
@@ -108,7 +108,7 @@ public: // IBootstrapperApplication | |||
108 | 108 | ||
109 | virtual STDMETHODIMP OnDetectBegin( | 109 | virtual STDMETHODIMP OnDetectBegin( |
110 | __in BOOL /*fCached*/, | 110 | __in BOOL /*fCached*/, |
111 | __in BOOL /*fInstalled*/, | 111 | __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/, |
112 | __in DWORD /*cPackages*/, | 112 | __in DWORD /*cPackages*/, |
113 | __inout BOOL* /*pfCancel*/ | 113 | __inout BOOL* /*pfCancel*/ |
114 | ) | 114 | ) |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h index 6a24f24b..7b3cf827 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | |||
@@ -109,7 +109,7 @@ public: // IBootstrapperApplication | |||
109 | 109 | ||
110 | virtual STDMETHODIMP OnDetectBegin( | 110 | virtual STDMETHODIMP OnDetectBegin( |
111 | __in BOOL /*fCached*/, | 111 | __in BOOL /*fCached*/, |
112 | __in BOOL /*fInstalled*/, | 112 | __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/, |
113 | __in DWORD /*cPackages*/, | 113 | __in DWORD /*cPackages*/, |
114 | __inout BOOL* pfCancel | 114 | __inout BOOL* pfCancel |
115 | ) | 115 | ) |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h index d40390e5..8c3b8b72 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h | |||
@@ -15,7 +15,7 @@ static HRESULT BalBaseBAProcOnDetectBegin( | |||
15 | __inout BA_ONDETECTBEGIN_RESULTS* pResults | 15 | __inout BA_ONDETECTBEGIN_RESULTS* pResults |
16 | ) | 16 | ) |
17 | { | 17 | { |
18 | return pBA->OnDetectBegin(pArgs->fCached, pArgs->fInstalled, pArgs->cPackages, &pResults->fCancel); | 18 | return pBA->OnDetectBegin(pArgs->fCached, pArgs->registrationType, pArgs->cPackages, &pResults->fCancel); |
19 | } | 19 | } |
20 | 20 | ||
21 | static HRESULT BalBaseBAProcOnDetectComplete( | 21 | static HRESULT BalBaseBAProcOnDetectComplete( |
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h index 5932c06e..e916d41e 100644 --- a/src/api/burn/balutil/inc/IBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h | |||
@@ -42,7 +42,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
42 | // OnDetectBegin - called when the engine begins detection. | 42 | // OnDetectBegin - called when the engine begins detection. |
43 | STDMETHOD(OnDetectBegin)( | 43 | STDMETHOD(OnDetectBegin)( |
44 | __in BOOL fCached, | 44 | __in BOOL fCached, |
45 | __in BOOL fInstalled, | 45 | __in BOOTSTRAPPER_REGISTRATION_TYPE registrationType, |
46 | __in DWORD cPackages, | 46 | __in DWORD cPackages, |
47 | __inout BOOL* pfCancel | 47 | __inout BOOL* pfCancel |
48 | ) = 0; | 48 | ) = 0; |