diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-30 15:32:57 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-30 18:40:49 -0600 |
commit | 8dfadd0c9068965af138949b630ef8496b4f7bbb (patch) | |
tree | 58bc40d5306d80a39712470aab0d5bf325eb3a45 /src/api/burn/balutil/inc | |
parent | 84a1b0f8ffe40a26916b1dfb3e1b59b6b0c31ad4 (diff) | |
download | wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.tar.gz wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.tar.bz2 wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.zip |
Don't report related operation in OnDetectRelatedBundle.
#5796
Diffstat (limited to 'src/api/burn/balutil/inc')
4 files changed, 1 insertions, 4 deletions
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h index 7f52f76e..22e16f1b 100644 --- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h +++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h | |||
@@ -167,7 +167,6 @@ public: // IBootstrapperApplication | |||
167 | __in_z LPCWSTR /*wzBundleTag*/, | 167 | __in_z LPCWSTR /*wzBundleTag*/, |
168 | __in BOOL /*fPerMachine*/, | 168 | __in BOOL /*fPerMachine*/, |
169 | __in LPCWSTR /*wzVersion*/, | 169 | __in LPCWSTR /*wzVersion*/, |
170 | __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/, | ||
171 | __in BOOL /*fMissingFromCache*/, | 170 | __in BOOL /*fMissingFromCache*/, |
172 | __inout BOOL* /*pfCancel*/ | 171 | __inout BOOL* /*pfCancel*/ |
173 | ) | 172 | ) |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h index 5665fee3..631d3c62 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | |||
@@ -172,7 +172,6 @@ public: // IBootstrapperApplication | |||
172 | __in_z LPCWSTR /*wzBundleTag*/, | 172 | __in_z LPCWSTR /*wzBundleTag*/, |
173 | __in BOOL /*fPerMachine*/, | 173 | __in BOOL /*fPerMachine*/, |
174 | __in LPCWSTR /*wzVersion*/, | 174 | __in LPCWSTR /*wzVersion*/, |
175 | __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/, | ||
176 | __in BOOL /*fMissingFromCache*/, | 175 | __in BOOL /*fMissingFromCache*/, |
177 | __inout BOOL* pfCancel | 176 | __inout BOOL* pfCancel |
178 | ) | 177 | ) |
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h index 2292cd64..b9866e4b 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h | |||
@@ -114,7 +114,7 @@ static HRESULT BalBaseBAProcOnDetectRelatedBundle( | |||
114 | __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults | 114 | __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults |
115 | ) | 115 | ) |
116 | { | 116 | { |
117 | return pBA->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->operation, pArgs->fMissingFromCache, &pResults->fCancel); | 117 | return pBA->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel); |
118 | } | 118 | } |
119 | 119 | ||
120 | static HRESULT BalBaseBAProcOnDetectPackageBegin( | 120 | static HRESULT BalBaseBAProcOnDetectPackageBegin( |
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h index 2ba1f503..577a705b 100644 --- a/src/api/burn/balutil/inc/IBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h | |||
@@ -91,7 +91,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A | |||
91 | __in_z LPCWSTR wzBundleTag, | 91 | __in_z LPCWSTR wzBundleTag, |
92 | __in BOOL fPerMachine, | 92 | __in BOOL fPerMachine, |
93 | __in_z LPCWSTR wzVersion, | 93 | __in_z LPCWSTR wzVersion, |
94 | __in BOOTSTRAPPER_RELATED_OPERATION operation, | ||
95 | __in BOOL fMissingFromCache, | 94 | __in BOOL fMissingFromCache, |
96 | __inout BOOL* pfCancel | 95 | __inout BOOL* pfCancel |
97 | ) = 0; | 96 | ) = 0; |