aboutsummaryrefslogtreecommitdiff
path: root/src/api/burn/WixToolset.Mba.Core
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-03-04 17:55:17 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-03-05 16:22:04 -0600
commite027c6c571a4bc8c818244e2b0c5015eb4ef3110 (patch)
tree8149aa491766bfe8a883f921831a52133abceea5 /src/api/burn/WixToolset.Mba.Core
parentbaf09c19c5a0f0d3f9533f9084f094066c1be7d9 (diff)
downloadwix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.gz
wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.bz2
wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.zip
Change ARP property Installed to 0 when registrationType is InProgress.
Being registered in ARP and "installed" were always separate concepts, and some things like fEligibleForCleanup were looking at the wrong thing. This also allows the BA to tell the difference.
Diffstat (limited to 'src/api/burn/WixToolset.Mba.Core')
-rw-r--r--src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs4
-rw-r--r--src/api/burn/WixToolset.Mba.Core/EventArgs.cs8
-rw-r--r--src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs2
3 files changed, 7 insertions, 7 deletions
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 );