summaryrefslogtreecommitdiff
path: root/src/api/burn/balutil
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/balutil
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/balutil')
-rw-r--r--src/api/burn/balutil/inc/BalBaseBAFunctions.h2
-rw-r--r--src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h2
-rw-r--r--src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h2
-rw-r--r--src/api/burn/balutil/inc/IBootstrapperApplication.h2
4 files changed, 4 insertions, 4 deletions
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
21static HRESULT BalBaseBAProcOnDetectComplete( 21static 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;