diff options
author | Rob Mensching <rob@firegiant.com> | 2024-03-07 09:41:29 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-03-07 10:55:57 -0800 |
commit | 5baa1dfe8ba2a3bd4728bca118fe1de225f848d4 (patch) | |
tree | 4f1c216075173e0e4d0863ada195f21d7ec976e0 /src/api/burn/bextutil | |
parent | dea25ba9bcfd65200b60339c2e4bc060cdf20723 (diff) | |
download | wix-5baa1dfe8ba2a3bd4728bca118fe1de225f848d4.tar.gz wix-5baa1dfe8ba2a3bd4728bca118fe1de225f848d4.tar.bz2 wix-5baa1dfe8ba2a3bd4728bca118fe1de225f848d4.zip |
Rename "bundle extension" to "bootstrapper extension" for more consistency
Also renames WixToolet.BextUtil nupkg to WixToolset.BootstrapperExtensionApi.
Diffstat (limited to 'src/api/burn/bextutil')
14 files changed, 196 insertions, 196 deletions
diff --git a/src/api/burn/bextutil/BextBundleExtensionEngine.cpp b/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp index 2c854817..a5e40c8e 100644 --- a/src/api/burn/bextutil/BextBundleExtensionEngine.cpp +++ b/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp | |||
@@ -3,7 +3,7 @@ | |||
3 | #include "precomp.h" | 3 | #include "precomp.h" |
4 | 4 | ||
5 | 5 | ||
6 | class CBextBundleExtensionEngine : public IBundleExtensionEngine | 6 | class CBextBootstrapperExtensionEngine : public IBootstrapperExtensionEngine |
7 | { | 7 | { |
8 | public: // IUnknown | 8 | public: // IUnknown |
9 | virtual STDMETHODIMP QueryInterface( | 9 | virtual STDMETHODIMP QueryInterface( |
@@ -18,9 +18,9 @@ public: // IUnknown | |||
18 | 18 | ||
19 | *ppvObject = NULL; | 19 | *ppvObject = NULL; |
20 | 20 | ||
21 | if (::IsEqualIID(__uuidof(IBundleExtensionEngine), riid)) | 21 | if (::IsEqualIID(__uuidof(IBootstrapperExtensionEngine), riid)) |
22 | { | 22 | { |
23 | *ppvObject = static_cast<IBundleExtensionEngine*>(this); | 23 | *ppvObject = static_cast<IBootstrapperExtensionEngine*>(this); |
24 | } | 24 | } |
25 | else if (::IsEqualIID(IID_IUnknown, riid)) | 25 | else if (::IsEqualIID(IID_IUnknown, riid)) |
26 | { | 26 | { |
@@ -52,7 +52,7 @@ public: // IUnknown | |||
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | public: // IBundleExtensionEngine | 55 | public: // IBootstrapperExtensionEngine |
56 | virtual STDMETHODIMP EscapeString( | 56 | virtual STDMETHODIMP EscapeString( |
57 | __in_z LPCWSTR wzIn, | 57 | __in_z LPCWSTR wzIn, |
58 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, | 58 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, |
@@ -60,8 +60,8 @@ public: // IBundleExtensionEngine | |||
60 | ) | 60 | ) |
61 | { | 61 | { |
62 | HRESULT hr = S_OK; | 62 | HRESULT hr = S_OK; |
63 | BUNDLE_EXTENSION_ENGINE_ESCAPESTRING_ARGS args = { }; | 63 | BOOTSTRAPPER_EXTENSION_ENGINE_ESCAPESTRING_ARGS args = { }; |
64 | BUNDLE_EXTENSION_ENGINE_ESCAPESTRING_RESULTS results = { }; | 64 | BOOTSTRAPPER_EXTENSION_ENGINE_ESCAPESTRING_RESULTS results = { }; |
65 | 65 | ||
66 | ExitOnNull(pcchOut, hr, E_INVALIDARG, "pcchOut is required"); | 66 | ExitOnNull(pcchOut, hr, E_INVALIDARG, "pcchOut is required"); |
67 | 67 | ||
@@ -72,7 +72,7 @@ public: // IBundleExtensionEngine | |||
72 | results.wzOut = wzOut; | 72 | results.wzOut = wzOut; |
73 | results.cchOut = *pcchOut; | 73 | results.cchOut = *pcchOut; |
74 | 74 | ||
75 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_ESCAPESTRING, &args, &results, m_pvBundleExtensionEngineProcContext); | 75 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_ESCAPESTRING, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
76 | 76 | ||
77 | *pcchOut = results.cchOut; | 77 | *pcchOut = results.cchOut; |
78 | 78 | ||
@@ -86,8 +86,8 @@ public: // IBundleExtensionEngine | |||
86 | ) | 86 | ) |
87 | { | 87 | { |
88 | HRESULT hr = S_OK; | 88 | HRESULT hr = S_OK; |
89 | BUNDLE_EXTENSION_ENGINE_EVALUATECONDITION_ARGS args = { }; | 89 | BOOTSTRAPPER_EXTENSION_ENGINE_EVALUATECONDITION_ARGS args = { }; |
90 | BUNDLE_EXTENSION_ENGINE_EVALUATECONDITION_RESULTS results = { }; | 90 | BOOTSTRAPPER_EXTENSION_ENGINE_EVALUATECONDITION_RESULTS results = { }; |
91 | 91 | ||
92 | ExitOnNull(pf, hr, E_INVALIDARG, "pf is required"); | 92 | ExitOnNull(pf, hr, E_INVALIDARG, "pf is required"); |
93 | 93 | ||
@@ -96,7 +96,7 @@ public: // IBundleExtensionEngine | |||
96 | 96 | ||
97 | results.cbSize = sizeof(results); | 97 | results.cbSize = sizeof(results); |
98 | 98 | ||
99 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_EVALUATECONDITION, &args, &results, m_pvBundleExtensionEngineProcContext); | 99 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_EVALUATECONDITION, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
100 | 100 | ||
101 | *pf = results.f; | 101 | *pf = results.f; |
102 | 102 | ||
@@ -111,8 +111,8 @@ public: // IBundleExtensionEngine | |||
111 | ) | 111 | ) |
112 | { | 112 | { |
113 | HRESULT hr = S_OK; | 113 | HRESULT hr = S_OK; |
114 | BUNDLE_EXTENSION_ENGINE_FORMATSTRING_ARGS args = { }; | 114 | BOOTSTRAPPER_EXTENSION_ENGINE_FORMATSTRING_ARGS args = { }; |
115 | BUNDLE_EXTENSION_ENGINE_FORMATSTRING_RESULTS results = { }; | 115 | BOOTSTRAPPER_EXTENSION_ENGINE_FORMATSTRING_RESULTS results = { }; |
116 | 116 | ||
117 | ExitOnNull(pcchOut, hr, E_INVALIDARG, "pcchOut is required"); | 117 | ExitOnNull(pcchOut, hr, E_INVALIDARG, "pcchOut is required"); |
118 | 118 | ||
@@ -123,7 +123,7 @@ public: // IBundleExtensionEngine | |||
123 | results.wzOut = wzOut; | 123 | results.wzOut = wzOut; |
124 | results.cchOut = *pcchOut; | 124 | results.cchOut = *pcchOut; |
125 | 125 | ||
126 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_FORMATSTRING, &args, &results, m_pvBundleExtensionEngineProcContext); | 126 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_FORMATSTRING, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
127 | 127 | ||
128 | *pcchOut = results.cchOut; | 128 | *pcchOut = results.cchOut; |
129 | 129 | ||
@@ -137,8 +137,8 @@ public: // IBundleExtensionEngine | |||
137 | ) | 137 | ) |
138 | { | 138 | { |
139 | HRESULT hr = S_OK; | 139 | HRESULT hr = S_OK; |
140 | BUNDLE_EXTENSION_ENGINE_GETVARIABLENUMERIC_ARGS args = { }; | 140 | BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLENUMERIC_ARGS args = { }; |
141 | BUNDLE_EXTENSION_ENGINE_GETVARIABLENUMERIC_RESULTS results = { }; | 141 | BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLENUMERIC_RESULTS results = { }; |
142 | 142 | ||
143 | ExitOnNull(pllValue, hr, E_INVALIDARG, "pllValue is required"); | 143 | ExitOnNull(pllValue, hr, E_INVALIDARG, "pllValue is required"); |
144 | 144 | ||
@@ -147,7 +147,7 @@ public: // IBundleExtensionEngine | |||
147 | 147 | ||
148 | results.cbSize = sizeof(results); | 148 | results.cbSize = sizeof(results); |
149 | 149 | ||
150 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLENUMERIC, &args, &results, m_pvBundleExtensionEngineProcContext); | 150 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETVARIABLENUMERIC, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
151 | 151 | ||
152 | *pllValue = results.llValue; | 152 | *pllValue = results.llValue; |
153 | 153 | ||
@@ -163,8 +163,8 @@ public: // IBundleExtensionEngine | |||
163 | ) | 163 | ) |
164 | { | 164 | { |
165 | HRESULT hr = S_OK; | 165 | HRESULT hr = S_OK; |
166 | BUNDLE_EXTENSION_ENGINE_GETVARIABLESTRING_ARGS args = { }; | 166 | BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLESTRING_ARGS args = { }; |
167 | BUNDLE_EXTENSION_ENGINE_GETVARIABLESTRING_RESULTS results = { }; | 167 | BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLESTRING_RESULTS results = { }; |
168 | 168 | ||
169 | ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); | 169 | ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); |
170 | 170 | ||
@@ -175,7 +175,7 @@ public: // IBundleExtensionEngine | |||
175 | results.wzValue = wzValue; | 175 | results.wzValue = wzValue; |
176 | results.cchValue = *pcchValue; | 176 | results.cchValue = *pcchValue; |
177 | 177 | ||
178 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLESTRING, &args, &results, m_pvBundleExtensionEngineProcContext); | 178 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETVARIABLESTRING, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
179 | 179 | ||
180 | *pcchValue = results.cchValue; | 180 | *pcchValue = results.cchValue; |
181 | 181 | ||
@@ -190,8 +190,8 @@ public: // IBundleExtensionEngine | |||
190 | ) | 190 | ) |
191 | { | 191 | { |
192 | HRESULT hr = S_OK; | 192 | HRESULT hr = S_OK; |
193 | BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_ARGS args = { }; | 193 | BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLEVERSION_ARGS args = { }; |
194 | BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_RESULTS results = { }; | 194 | BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLEVERSION_RESULTS results = { }; |
195 | 195 | ||
196 | ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); | 196 | ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); |
197 | 197 | ||
@@ -202,7 +202,7 @@ public: // IBundleExtensionEngine | |||
202 | results.wzValue = wzValue; | 202 | results.wzValue = wzValue; |
203 | results.cchValue = *pcchValue; | 203 | results.cchValue = *pcchValue; |
204 | 204 | ||
205 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLEVERSION, &args, &results, m_pvBundleExtensionEngineProcContext); | 205 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETVARIABLEVERSION, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
206 | 206 | ||
207 | *pcchValue = results.cchValue; | 207 | *pcchValue = results.cchValue; |
208 | 208 | ||
@@ -211,12 +211,12 @@ public: // IBundleExtensionEngine | |||
211 | } | 211 | } |
212 | 212 | ||
213 | virtual STDMETHODIMP Log( | 213 | virtual STDMETHODIMP Log( |
214 | __in BUNDLE_EXTENSION_LOG_LEVEL level, | 214 | __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level, |
215 | __in_z LPCWSTR wzMessage | 215 | __in_z LPCWSTR wzMessage |
216 | ) | 216 | ) |
217 | { | 217 | { |
218 | BUNDLE_EXTENSION_ENGINE_LOG_ARGS args = { }; | 218 | BOOTSTRAPPER_EXTENSION_ENGINE_LOG_ARGS args = { }; |
219 | BUNDLE_EXTENSION_ENGINE_LOG_RESULTS results = { }; | 219 | BOOTSTRAPPER_EXTENSION_ENGINE_LOG_RESULTS results = { }; |
220 | 220 | ||
221 | args.cbSize = sizeof(args); | 221 | args.cbSize = sizeof(args); |
222 | args.level = level; | 222 | args.level = level; |
@@ -224,7 +224,7 @@ public: // IBundleExtensionEngine | |||
224 | 224 | ||
225 | results.cbSize = sizeof(results); | 225 | results.cbSize = sizeof(results); |
226 | 226 | ||
227 | return m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_LOG, &args, &results, m_pvBundleExtensionEngineProcContext); | 227 | return m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_LOG, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
228 | } | 228 | } |
229 | 229 | ||
230 | virtual STDMETHODIMP SetVariableNumeric( | 230 | virtual STDMETHODIMP SetVariableNumeric( |
@@ -232,8 +232,8 @@ public: // IBundleExtensionEngine | |||
232 | __in LONGLONG llValue | 232 | __in LONGLONG llValue |
233 | ) | 233 | ) |
234 | { | 234 | { |
235 | BUNDLE_EXTENSION_ENGINE_SETVARIABLENUMERIC_ARGS args = { }; | 235 | BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLENUMERIC_ARGS args = { }; |
236 | BUNDLE_EXTENSION_ENGINE_SETVARIABLENUMERIC_RESULTS results = { }; | 236 | BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLENUMERIC_RESULTS results = { }; |
237 | 237 | ||
238 | args.cbSize = sizeof(args); | 238 | args.cbSize = sizeof(args); |
239 | args.wzVariable = wzVariable; | 239 | args.wzVariable = wzVariable; |
@@ -241,7 +241,7 @@ public: // IBundleExtensionEngine | |||
241 | 241 | ||
242 | results.cbSize = sizeof(results); | 242 | results.cbSize = sizeof(results); |
243 | 243 | ||
244 | return m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLENUMERIC, &args, &results, m_pvBundleExtensionEngineProcContext); | 244 | return m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_SETVARIABLENUMERIC, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
245 | } | 245 | } |
246 | 246 | ||
247 | virtual STDMETHODIMP SetVariableString( | 247 | virtual STDMETHODIMP SetVariableString( |
@@ -250,8 +250,8 @@ public: // IBundleExtensionEngine | |||
250 | __in BOOL fFormatted | 250 | __in BOOL fFormatted |
251 | ) | 251 | ) |
252 | { | 252 | { |
253 | BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS args = { }; | 253 | BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS args = { }; |
254 | BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_RESULTS results = { }; | 254 | BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLESTRING_RESULTS results = { }; |
255 | 255 | ||
256 | args.cbSize = sizeof(args); | 256 | args.cbSize = sizeof(args); |
257 | args.wzVariable = wzVariable; | 257 | args.wzVariable = wzVariable; |
@@ -260,7 +260,7 @@ public: // IBundleExtensionEngine | |||
260 | 260 | ||
261 | results.cbSize = sizeof(results); | 261 | results.cbSize = sizeof(results); |
262 | 262 | ||
263 | return m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLESTRING, &args, &results, m_pvBundleExtensionEngineProcContext); | 263 | return m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_SETVARIABLESTRING, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
264 | } | 264 | } |
265 | 265 | ||
266 | virtual STDMETHODIMP SetVariableVersion( | 266 | virtual STDMETHODIMP SetVariableVersion( |
@@ -268,8 +268,8 @@ public: // IBundleExtensionEngine | |||
268 | __in_z_opt LPCWSTR wzValue | 268 | __in_z_opt LPCWSTR wzValue |
269 | ) | 269 | ) |
270 | { | 270 | { |
271 | BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS args = { }; | 271 | BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS args = { }; |
272 | BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS results = { }; | 272 | BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS results = { }; |
273 | 273 | ||
274 | args.cbSize = sizeof(args); | 274 | args.cbSize = sizeof(args); |
275 | args.wzVariable = wzVariable; | 275 | args.wzVariable = wzVariable; |
@@ -277,7 +277,7 @@ public: // IBundleExtensionEngine | |||
277 | 277 | ||
278 | results.cbSize = sizeof(results); | 278 | results.cbSize = sizeof(results); |
279 | 279 | ||
280 | return m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLEVERSION, &args, &results, m_pvBundleExtensionEngineProcContext); | 280 | return m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_SETVARIABLEVERSION, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
281 | } | 281 | } |
282 | 282 | ||
283 | virtual STDMETHODIMP CompareVersions( | 283 | virtual STDMETHODIMP CompareVersions( |
@@ -287,8 +287,8 @@ public: // IBundleExtensionEngine | |||
287 | ) | 287 | ) |
288 | { | 288 | { |
289 | HRESULT hr = S_OK; | 289 | HRESULT hr = S_OK; |
290 | BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_ARGS args = { }; | 290 | BOOTSTRAPPER_EXTENSION_ENGINE_COMPAREVERSIONS_ARGS args = { }; |
291 | BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_RESULTS results = { }; | 291 | BOOTSTRAPPER_EXTENSION_ENGINE_COMPAREVERSIONS_RESULTS results = { }; |
292 | 292 | ||
293 | ExitOnNull(pnResult, hr, E_INVALIDARG, "pnResult is required"); | 293 | ExitOnNull(pnResult, hr, E_INVALIDARG, "pnResult is required"); |
294 | 294 | ||
@@ -298,7 +298,7 @@ public: // IBundleExtensionEngine | |||
298 | 298 | ||
299 | results.cbSize = sizeof(results); | 299 | results.cbSize = sizeof(results); |
300 | 300 | ||
301 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_COMPAREVERSIONS, &args, &results, m_pvBundleExtensionEngineProcContext); | 301 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_COMPAREVERSIONS, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
302 | 302 | ||
303 | *pnResult = results.nResult; | 303 | *pnResult = results.nResult; |
304 | 304 | ||
@@ -314,8 +314,8 @@ public: // IBundleExtensionEngine | |||
314 | ) | 314 | ) |
315 | { | 315 | { |
316 | HRESULT hr = S_OK; | 316 | HRESULT hr = S_OK; |
317 | BUNDLE_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS args = { }; | 317 | BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS args = { }; |
318 | BUNDLE_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS results = { }; | 318 | BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS results = { }; |
319 | 319 | ||
320 | ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); | 320 | ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); |
321 | 321 | ||
@@ -327,7 +327,7 @@ public: // IBundleExtensionEngine | |||
327 | results.wzValue = wzValue; | 327 | results.wzValue = wzValue; |
328 | results.cchValue = *pcchValue; | 328 | results.cchValue = *pcchValue; |
329 | 329 | ||
330 | hr = m_pfnBundleExtensionEngineProc(BUNDLE_EXTENSION_ENGINE_MESSAGE_GETRELATEDBUNDLEVARIABLE, &args, &results, m_pvBundleExtensionEngineProcContext); | 330 | hr = m_pfnBootstrapperExtensionEngineProc(BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETRELATEDBUNDLEVARIABLE, &args, &results, m_pvBootstrapperExtensionEngineProcContext); |
331 | 331 | ||
332 | *pcchValue = results.cchValue; | 332 | *pcchValue = results.cchValue; |
333 | 333 | ||
@@ -336,38 +336,38 @@ public: // IBundleExtensionEngine | |||
336 | } | 336 | } |
337 | 337 | ||
338 | public: | 338 | public: |
339 | CBextBundleExtensionEngine( | 339 | CBextBootstrapperExtensionEngine( |
340 | __in PFN_BUNDLE_EXTENSION_ENGINE_PROC pfnBundleExtensionEngineProc, | 340 | __in PFN_BOOTSTRAPPER_EXTENSION_ENGINE_PROC pfnBootstrapperExtensionEngineProc, |
341 | __in_opt LPVOID pvBundleExtensionEngineProcContext | 341 | __in_opt LPVOID pvBootstrapperExtensionEngineProcContext |
342 | ) | 342 | ) |
343 | { | 343 | { |
344 | m_cReferences = 1; | 344 | m_cReferences = 1; |
345 | m_pfnBundleExtensionEngineProc = pfnBundleExtensionEngineProc; | 345 | m_pfnBootstrapperExtensionEngineProc = pfnBootstrapperExtensionEngineProc; |
346 | m_pvBundleExtensionEngineProcContext = pvBundleExtensionEngineProcContext; | 346 | m_pvBootstrapperExtensionEngineProcContext = pvBootstrapperExtensionEngineProcContext; |
347 | } | 347 | } |
348 | 348 | ||
349 | private: | 349 | private: |
350 | long m_cReferences; | 350 | long m_cReferences; |
351 | PFN_BUNDLE_EXTENSION_ENGINE_PROC m_pfnBundleExtensionEngineProc; | 351 | PFN_BOOTSTRAPPER_EXTENSION_ENGINE_PROC m_pfnBootstrapperExtensionEngineProc; |
352 | LPVOID m_pvBundleExtensionEngineProcContext; | 352 | LPVOID m_pvBootstrapperExtensionEngineProcContext; |
353 | }; | 353 | }; |
354 | 354 | ||
355 | HRESULT BextBundleExtensionEngineCreate( | 355 | HRESULT BextBootstrapperExtensionEngineCreate( |
356 | __in PFN_BUNDLE_EXTENSION_ENGINE_PROC pfnBundleExtensionEngineProc, | 356 | __in PFN_BOOTSTRAPPER_EXTENSION_ENGINE_PROC pfnBootstrapperExtensionEngineProc, |
357 | __in_opt LPVOID pvBundleExtensionEngineProcContext, | 357 | __in_opt LPVOID pvBootstrapperExtensionEngineProcContext, |
358 | __out IBundleExtensionEngine** ppEngineForExtension | 358 | __out IBootstrapperExtensionEngine** ppEngineForExtension |
359 | ) | 359 | ) |
360 | { | 360 | { |
361 | HRESULT hr = S_OK; | 361 | HRESULT hr = S_OK; |
362 | CBextBundleExtensionEngine* pBundleExtensionEngine = NULL; | 362 | CBextBootstrapperExtensionEngine* pBootstrapperExtensionEngine = NULL; |
363 | 363 | ||
364 | pBundleExtensionEngine = new CBextBundleExtensionEngine(pfnBundleExtensionEngineProc, pvBundleExtensionEngineProcContext); | 364 | pBootstrapperExtensionEngine = new CBextBootstrapperExtensionEngine(pfnBootstrapperExtensionEngineProc, pvBootstrapperExtensionEngineProcContext); |
365 | ExitOnNull(pBundleExtensionEngine, hr, E_OUTOFMEMORY, "Failed to allocate new BextBundleExtensionEngine object."); | 365 | ExitOnNull(pBootstrapperExtensionEngine, hr, E_OUTOFMEMORY, "Failed to allocate new BextBootstrapperExtensionEngine object."); |
366 | 366 | ||
367 | hr = pBundleExtensionEngine->QueryInterface(IID_PPV_ARGS(ppEngineForExtension)); | 367 | hr = pBootstrapperExtensionEngine->QueryInterface(IID_PPV_ARGS(ppEngineForExtension)); |
368 | ExitOnFailure(hr, "Failed to QI for IBundleExtensionEngine from BextBundleExtensionEngine object."); | 368 | ExitOnFailure(hr, "Failed to QI for IBootstrapperExtensionEngine from BextBootstrapperExtensionEngine object."); |
369 | 369 | ||
370 | LExit: | 370 | LExit: |
371 | ReleaseObject(pBundleExtensionEngine); | 371 | ReleaseObject(pBootstrapperExtensionEngine); |
372 | return hr; | 372 | return hr; |
373 | } | 373 | } |
diff --git a/src/api/burn/bextutil/bextutil.cpp b/src/api/burn/bextutil/bextutil.cpp index b2e689c3..6f960ef5 100644 --- a/src/api/burn/bextutil/bextutil.cpp +++ b/src/api/burn/bextutil/bextutil.cpp | |||
@@ -2,12 +2,12 @@ | |||
2 | 2 | ||
3 | #include "precomp.h" | 3 | #include "precomp.h" |
4 | 4 | ||
5 | static IBundleExtensionEngine* vpEngine = NULL; | 5 | static IBootstrapperExtensionEngine* vpEngine = NULL; |
6 | 6 | ||
7 | // prototypes | 7 | // prototypes |
8 | 8 | ||
9 | DAPI_(void) BextInitialize( | 9 | DAPI_(void) BextInitialize( |
10 | __in IBundleExtensionEngine* pEngine | 10 | __in IBootstrapperExtensionEngine* pEngine |
11 | ) | 11 | ) |
12 | { | 12 | { |
13 | pEngine->AddRef(); | 13 | pEngine->AddRef(); |
@@ -17,15 +17,15 @@ DAPI_(void) BextInitialize( | |||
17 | } | 17 | } |
18 | 18 | ||
19 | DAPI_(HRESULT) BextInitializeFromCreateArgs( | 19 | DAPI_(HRESULT) BextInitializeFromCreateArgs( |
20 | __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, | 20 | __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs, |
21 | __out_opt IBundleExtensionEngine** ppEngine | 21 | __out_opt IBootstrapperExtensionEngine** ppEngine |
22 | ) | 22 | ) |
23 | { | 23 | { |
24 | HRESULT hr = S_OK; | 24 | HRESULT hr = S_OK; |
25 | IBundleExtensionEngine* pEngine = NULL; | 25 | IBootstrapperExtensionEngine* pEngine = NULL; |
26 | 26 | ||
27 | hr = BextBundleExtensionEngineCreate(pArgs->pfnBundleExtensionEngineProc, pArgs->pvBundleExtensionEngineProcContext, &pEngine); | 27 | hr = BextBootstrapperExtensionEngineCreate(pArgs->pfnBootstrapperExtensionEngineProc, pArgs->pvBootstrapperExtensionEngineProcContext, &pEngine); |
28 | ExitOnFailure(hr, "Failed to create BextBundleExtensionEngine."); | 28 | ExitOnFailure(hr, "Failed to create BextBootstrapperExtensionEngine."); |
29 | 29 | ||
30 | BextInitialize(pEngine); | 30 | BextInitialize(pEngine); |
31 | 31 | ||
@@ -47,30 +47,30 @@ DAPI_(void) BextUninitialize() | |||
47 | ReleaseNullObject(vpEngine); | 47 | ReleaseNullObject(vpEngine); |
48 | } | 48 | } |
49 | 49 | ||
50 | DAPI_(HRESULT) BextGetBundleExtensionDataNode( | 50 | DAPI_(HRESULT) BextGetBootstrapperExtensionDataNode( |
51 | __in IXMLDOMDocument* pixdManifest, | 51 | __in IXMLDOMDocument* pixdManifest, |
52 | __in LPCWSTR wzExtensionId, | 52 | __in LPCWSTR wzExtensionId, |
53 | __out IXMLDOMNode** ppixnBundleExtension | 53 | __out IXMLDOMNode** ppixnBootstrapperExtension |
54 | ) | 54 | ) |
55 | { | 55 | { |
56 | HRESULT hr = S_OK; | 56 | HRESULT hr = S_OK; |
57 | IXMLDOMElement* pixeBundleExtensionData = NULL; | 57 | IXMLDOMElement* pixeBootstrapperExtensionData = NULL; |
58 | IXMLDOMNodeList* pixnNodes = NULL; | 58 | IXMLDOMNodeList* pixnNodes = NULL; |
59 | IXMLDOMNode* pixnNode = NULL; | 59 | IXMLDOMNode* pixnNode = NULL; |
60 | DWORD cNodes = 0; | 60 | DWORD cNodes = 0; |
61 | LPWSTR sczId = NULL; | 61 | LPWSTR sczId = NULL; |
62 | 62 | ||
63 | // Get BundleExtensionData element. | 63 | // Get BootstrapperExtensionData element. |
64 | hr = pixdManifest->get_documentElement(&pixeBundleExtensionData); | 64 | hr = pixdManifest->get_documentElement(&pixeBootstrapperExtensionData); |
65 | ExitOnFailure(hr, "Failed to get BundleExtensionData element."); | 65 | ExitOnFailure(hr, "Failed to get BootstrapperExtensionData element."); |
66 | 66 | ||
67 | // Select BundleExtension nodes. | 67 | // Select BootstrapperExtension nodes. |
68 | hr = XmlSelectNodes(pixeBundleExtensionData, L"BundleExtension", &pixnNodes); | 68 | hr = XmlSelectNodes(pixeBootstrapperExtensionData, L"BootstrapperExtension", &pixnNodes); |
69 | ExitOnFailure(hr, "Failed to select BundleExtension nodes."); | 69 | ExitOnFailure(hr, "Failed to select BootstrapperExtension nodes."); |
70 | 70 | ||
71 | // Get BundleExtension node count. | 71 | // Get BootstrapperExtension node count. |
72 | hr = pixnNodes->get_length((long*)&cNodes); | 72 | hr = pixnNodes->get_length((long*)&cNodes); |
73 | ExitOnFailure(hr, "Failed to get BundleExtension node count."); | 73 | ExitOnFailure(hr, "Failed to get BootstrapperExtension node count."); |
74 | 74 | ||
75 | if (!cNodes) | 75 | if (!cNodes) |
76 | { | 76 | { |
@@ -89,7 +89,7 @@ DAPI_(HRESULT) BextGetBundleExtensionDataNode( | |||
89 | 89 | ||
90 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczId, -1, wzExtensionId, -1)) | 90 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczId, -1, wzExtensionId, -1)) |
91 | { | 91 | { |
92 | *ppixnBundleExtension = pixnNode; | 92 | *ppixnBootstrapperExtension = pixnNode; |
93 | pixnNode = NULL; | 93 | pixnNode = NULL; |
94 | 94 | ||
95 | ExitFunction1(hr = S_OK); | 95 | ExitFunction1(hr = S_OK); |
@@ -105,14 +105,14 @@ LExit: | |||
105 | ReleaseStr(sczId); | 105 | ReleaseStr(sczId); |
106 | ReleaseObject(pixnNode); | 106 | ReleaseObject(pixnNode); |
107 | ReleaseObject(pixnNodes); | 107 | ReleaseObject(pixnNodes); |
108 | ReleaseObject(pixeBundleExtensionData); | 108 | ReleaseObject(pixeBootstrapperExtensionData); |
109 | 109 | ||
110 | return hr; | 110 | return hr; |
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
114 | DAPIV_(HRESULT) BextLog( | 114 | DAPIV_(HRESULT) BextLog( |
115 | __in BUNDLE_EXTENSION_LOG_LEVEL level, | 115 | __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level, |
116 | __in_z __format_string LPCSTR szFormat, | 116 | __in_z __format_string LPCSTR szFormat, |
117 | ... | 117 | ... |
118 | ) | 118 | ) |
@@ -136,7 +136,7 @@ LExit: | |||
136 | 136 | ||
137 | 137 | ||
138 | DAPI_(HRESULT) BextLogArgs( | 138 | DAPI_(HRESULT) BextLogArgs( |
139 | __in BUNDLE_EXTENSION_LOG_LEVEL level, | 139 | __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level, |
140 | __in_z __format_string LPCSTR szFormat, | 140 | __in_z __format_string LPCSTR szFormat, |
141 | __in va_list args | 141 | __in va_list args |
142 | ) | 142 | ) |
@@ -212,7 +212,7 @@ DAPI_(HRESULT) BextLogErrorArgs( | |||
212 | hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x: %S", hrError, sczFormattedAnsi); | 212 | hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x: %S", hrError, sczFormattedAnsi); |
213 | ExitOnFailure(hr, "Failed to prepend error number to error log string."); | 213 | ExitOnFailure(hr, "Failed to prepend error number to error log string."); |
214 | 214 | ||
215 | hr = vpEngine->Log(BUNDLE_EXTENSION_LOG_LEVEL_ERROR, sczMessage); | 215 | hr = vpEngine->Log(BOOTSTRAPPER_EXTENSION_LOG_LEVEL_ERROR, sczMessage); |
216 | 216 | ||
217 | LExit: | 217 | LExit: |
218 | ReleaseStr(sczMessage); | 218 | ReleaseStr(sczMessage); |
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index b2881354..c710f424 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec | |||
@@ -21,8 +21,8 @@ | |||
21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
22 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> | 22 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> |
23 | <file src="$projectFolder$\inc\*" target="build\native\include" /> | 23 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
24 | <file src="$projectFolder$\..\inc\BundleExtension.h" target="build\native\include" /> | 24 | <file src="$projectFolder$\..\inc\BootstrapperExtension.h" target="build\native\include" /> |
25 | <file src="$projectFolder$\..\inc\BundleExtensionEngine.h" target="build\native\include" /> | 25 | <file src="$projectFolder$\..\inc\BootstrapperExtensionEngine.h" target="build\native\include" /> |
26 | <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" /> | 26 | <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" /> |
27 | <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" /> | 27 | <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" /> |
28 | <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" /> | 28 | <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" /> |
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj index 467f2d56..0299c381 100644 --- a/src/api/burn/bextutil/bextutil.vcxproj +++ b/src/api/burn/bextutil/bextutil.vcxproj | |||
@@ -34,8 +34,8 @@ | |||
34 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
35 | <TargetName>bextutil</TargetName> | 35 | <TargetName>bextutil</TargetName> |
36 | <CharacterSet>MultiByte</CharacterSet> | 36 | <CharacterSet>MultiByte</CharacterSet> |
37 | <Description>WiX Toolset Bundle Extension native utility library</Description> | 37 | <Description>WiX Toolset Bundle Extension API</Description> |
38 | <PackageId>WixToolset.BextUtil</PackageId> | 38 | <PackageId>WixToolset.BootstrapperExtensionApi</PackageId> |
39 | </PropertyGroup> | 39 | </PropertyGroup> |
40 | 40 | ||
41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
@@ -53,19 +53,19 @@ | |||
53 | </PropertyGroup> | 53 | </PropertyGroup> |
54 | 54 | ||
55 | <ItemGroup> | 55 | <ItemGroup> |
56 | <ClCompile Include="BextBundleExtensionEngine.cpp" /> | 56 | <ClCompile Include="BextBootstrapperExtensionEngine.cpp" /> |
57 | <ClCompile Include="bextutil.cpp" /> | 57 | <ClCompile Include="bextutil.cpp" /> |
58 | <ClCompile Include="precomp.cpp"> | 58 | <ClCompile Include="precomp.cpp"> |
59 | <PrecompiledHeader>Create</PrecompiledHeader> | 59 | <PrecompiledHeader>Create</PrecompiledHeader> |
60 | </ClCompile> | 60 | </ClCompile> |
61 | </ItemGroup> | 61 | </ItemGroup> |
62 | <ItemGroup> | 62 | <ItemGroup> |
63 | <ClInclude Include="inc\BextBaseBundleExtension.h" /> | 63 | <ClInclude Include="inc\BextBaseBootstrapperExtension.h" /> |
64 | <ClInclude Include="inc\BextBaseBundleExtensionProc.h" /> | 64 | <ClInclude Include="inc\BextBaseBootstrapperExtensionProc.h" /> |
65 | <ClInclude Include="inc\BextBundleExtensionEngine.h" /> | 65 | <ClInclude Include="inc\BextBootstrapperExtensionEngine.h" /> |
66 | <ClInclude Include="inc\bextutil.h" /> | 66 | <ClInclude Include="inc\bextutil.h" /> |
67 | <ClInclude Include="inc\IBundleExtension.h" /> | 67 | <ClInclude Include="inc\IBootstrapperExtension.h" /> |
68 | <ClInclude Include="inc\IBundleExtensionEngine.h" /> | 68 | <ClInclude Include="inc\IBootstrapperExtensionEngine.h" /> |
69 | <ClInclude Include="precomp.h" /> | 69 | <ClInclude Include="precomp.h" /> |
70 | </ItemGroup> | 70 | </ItemGroup> |
71 | 71 | ||
diff --git a/src/api/burn/bextutil/build/WixToolset.BextUtil.props b/src/api/burn/bextutil/build/WixToolset.BootstrapperExtensionApi.props index dbaddb70..dbaddb70 100644 --- a/src/api/burn/bextutil/build/WixToolset.BextUtil.props +++ b/src/api/burn/bextutil/build/WixToolset.BootstrapperExtensionApi.props | |||
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtension.h index 5bda04e1..83ba23a6 100644 --- a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h +++ b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtension.h | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | #include "bextutil.h" | 5 | #include "bextutil.h" |
6 | 6 | ||
7 | class CBextBaseBundleExtension : public IBundleExtension | 7 | class CBextBaseBootstrapperExtension : public IBootstrapperExtension |
8 | { | 8 | { |
9 | public: // IUnknown | 9 | public: // IUnknown |
10 | virtual STDMETHODIMP QueryInterface( | 10 | virtual STDMETHODIMP QueryInterface( |
@@ -19,9 +19,9 @@ public: // IUnknown | |||
19 | 19 | ||
20 | *ppvObject = NULL; | 20 | *ppvObject = NULL; |
21 | 21 | ||
22 | if (::IsEqualIID(__uuidof(IBundleExtension), riid)) | 22 | if (::IsEqualIID(__uuidof(IBootstrapperExtension), riid)) |
23 | { | 23 | { |
24 | *ppvObject = static_cast<IBundleExtension*>(this); | 24 | *ppvObject = static_cast<IBootstrapperExtension*>(this); |
25 | } | 25 | } |
26 | else if (::IsEqualIID(IID_IUnknown, riid)) | 26 | else if (::IsEqualIID(IID_IUnknown, riid)) |
27 | { | 27 | { |
@@ -53,7 +53,7 @@ public: // IUnknown | |||
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | public: // IBundleExtension | 56 | public: // IBootstrapperExtension |
57 | virtual STDMETHODIMP Search( | 57 | virtual STDMETHODIMP Search( |
58 | __in LPCWSTR /*wzId*/, | 58 | __in LPCWSTR /*wzId*/, |
59 | __in LPCWSTR /*wzVariable*/ | 59 | __in LPCWSTR /*wzVariable*/ |
@@ -62,8 +62,8 @@ public: // IBundleExtension | |||
62 | return E_NOTIMPL; | 62 | return E_NOTIMPL; |
63 | } | 63 | } |
64 | 64 | ||
65 | virtual STDMETHODIMP BundleExtensionProc( | 65 | virtual STDMETHODIMP BootstrapperExtensionProc( |
66 | __in BUNDLE_EXTENSION_MESSAGE /*message*/, | 66 | __in BOOTSTRAPPER_EXTENSION_MESSAGE /*message*/, |
67 | __in const LPVOID /*pvArgs*/, | 67 | __in const LPVOID /*pvArgs*/, |
68 | __inout LPVOID /*pvResults*/, | 68 | __inout LPVOID /*pvResults*/, |
69 | __in_opt LPVOID /*pvContext*/ | 69 | __in_opt LPVOID /*pvContext*/ |
@@ -72,15 +72,15 @@ public: // IBundleExtension | |||
72 | return E_NOTIMPL; | 72 | return E_NOTIMPL; |
73 | } | 73 | } |
74 | 74 | ||
75 | public: //CBextBaseBundleExtension | 75 | public: //CBextBaseBootstrapperExtension |
76 | virtual STDMETHODIMP Initialize( | 76 | virtual STDMETHODIMP Initialize( |
77 | __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs | 77 | __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pCreateArgs |
78 | ) | 78 | ) |
79 | { | 79 | { |
80 | HRESULT hr = S_OK; | 80 | HRESULT hr = S_OK; |
81 | 81 | ||
82 | hr = StrAllocString(&m_sczBundleExtensionDataPath, pCreateArgs->wzBundleExtensionDataPath, 0); | 82 | hr = StrAllocString(&m_sczBootstrapperExtensionDataPath, pCreateArgs->wzBootstrapperExtensionDataPath, 0); |
83 | ExitOnFailure(hr, "Failed to copy BundleExtensionDataPath."); | 83 | ExitOnFailure(hr, "Failed to copy BootstrapperExtensionDataPath."); |
84 | 84 | ||
85 | LExit: | 85 | LExit: |
86 | return hr; | 86 | return hr; |
@@ -88,8 +88,8 @@ public: //CBextBaseBundleExtension | |||
88 | 88 | ||
89 | protected: | 89 | protected: |
90 | 90 | ||
91 | CBextBaseBundleExtension( | 91 | CBextBaseBootstrapperExtension( |
92 | __in IBundleExtensionEngine* pEngine | 92 | __in IBootstrapperExtensionEngine* pEngine |
93 | ) | 93 | ) |
94 | { | 94 | { |
95 | m_cReferences = 1; | 95 | m_cReferences = 1; |
@@ -97,18 +97,18 @@ protected: | |||
97 | pEngine->AddRef(); | 97 | pEngine->AddRef(); |
98 | m_pEngine = pEngine; | 98 | m_pEngine = pEngine; |
99 | 99 | ||
100 | m_sczBundleExtensionDataPath = NULL; | 100 | m_sczBootstrapperExtensionDataPath = NULL; |
101 | } | 101 | } |
102 | 102 | ||
103 | virtual ~CBextBaseBundleExtension() | 103 | virtual ~CBextBaseBootstrapperExtension() |
104 | { | 104 | { |
105 | ReleaseNullObject(m_pEngine); | 105 | ReleaseNullObject(m_pEngine); |
106 | ReleaseStr(m_sczBundleExtensionDataPath); | 106 | ReleaseStr(m_sczBootstrapperExtensionDataPath); |
107 | } | 107 | } |
108 | 108 | ||
109 | protected: | 109 | protected: |
110 | IBundleExtensionEngine* m_pEngine; | 110 | IBootstrapperExtensionEngine* m_pEngine; |
111 | LPWSTR m_sczBundleExtensionDataPath; | 111 | LPWSTR m_sczBootstrapperExtensionDataPath; |
112 | 112 | ||
113 | private: | 113 | private: |
114 | long m_cReferences; | 114 | long m_cReferences; |
diff --git a/src/api/burn/bextutil/inc/BextBaseBootstrapperExtensionProc.h b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtensionProc.h new file mode 100644 index 00000000..4f96399c --- /dev/null +++ b/src/api/burn/bextutil/inc/BextBaseBootstrapperExtensionProc.h | |||
@@ -0,0 +1,46 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | |||
5 | #include <windows.h> | ||
6 | |||
7 | #include <IBootstrapperExtensionEngine.h> | ||
8 | #include <IBootstrapperExtension.h> | ||
9 | |||
10 | static HRESULT BextBaseBEProcSearch( | ||
11 | __in IBootstrapperExtension* pBE, | ||
12 | __in BOOTSTRAPPER_EXTENSION_SEARCH_ARGS* pArgs, | ||
13 | __inout BOOTSTRAPPER_EXTENSION_SEARCH_RESULTS* /*pResults*/ | ||
14 | ) | ||
15 | { | ||
16 | return pBE->Search(pArgs->wzId, pArgs->wzVariable); | ||
17 | } | ||
18 | |||
19 | /******************************************************************* | ||
20 | BextBaseBootstrapperExtensionProc - requires pvContext to be of type IBootstrapperExtension. | ||
21 | Provides a default mapping between the message based | ||
22 | BootstrapperExtension interface and the COM-based BootstrapperExtension interface. | ||
23 | |||
24 | *******************************************************************/ | ||
25 | static HRESULT WINAPI BextBaseBootstrapperExtensionProc( | ||
26 | __in BOOTSTRAPPER_EXTENSION_MESSAGE message, | ||
27 | __in const LPVOID pvArgs, | ||
28 | __inout LPVOID pvResults, | ||
29 | __in_opt LPVOID pvContext | ||
30 | ) | ||
31 | { | ||
32 | IBootstrapperExtension* pBE = reinterpret_cast<IBootstrapperExtension*>(pvContext); | ||
33 | HRESULT hr = pBE->BootstrapperExtensionProc(message, pvArgs, pvResults, pvContext); | ||
34 | |||
35 | if (E_NOTIMPL == hr) | ||
36 | { | ||
37 | switch (message) | ||
38 | { | ||
39 | case BOOTSTRAPPER_EXTENSION_MESSAGE_SEARCH: | ||
40 | hr = BextBaseBEProcSearch(pBE, reinterpret_cast<BOOTSTRAPPER_EXTENSION_SEARCH_ARGS*>(pvArgs), reinterpret_cast<BOOTSTRAPPER_EXTENSION_SEARCH_RESULTS*>(pvResults)); | ||
41 | break; | ||
42 | } | ||
43 | } | ||
44 | |||
45 | return hr; | ||
46 | } | ||
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h b/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h deleted file mode 100644 index cd7e3cb3..00000000 --- a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | |||
5 | #include <windows.h> | ||
6 | |||
7 | #include <IBundleExtensionEngine.h> | ||
8 | #include <IBundleExtension.h> | ||
9 | |||
10 | static HRESULT BextBaseBEProcSearch( | ||
11 | __in IBundleExtension* pBE, | ||
12 | __in BUNDLE_EXTENSION_SEARCH_ARGS* pArgs, | ||
13 | __inout BUNDLE_EXTENSION_SEARCH_RESULTS* /*pResults*/ | ||
14 | ) | ||
15 | { | ||
16 | return pBE->Search(pArgs->wzId, pArgs->wzVariable); | ||
17 | } | ||
18 | |||
19 | /******************************************************************* | ||
20 | BextBaseBundleExtensionProc - requires pvContext to be of type IBundleExtension. | ||
21 | Provides a default mapping between the message based | ||
22 | BundleExtension interface and the COM-based BundleExtension interface. | ||
23 | |||
24 | *******************************************************************/ | ||
25 | static HRESULT WINAPI BextBaseBundleExtensionProc( | ||
26 | __in BUNDLE_EXTENSION_MESSAGE message, | ||
27 | __in const LPVOID pvArgs, | ||
28 | __inout LPVOID pvResults, | ||
29 | __in_opt LPVOID pvContext | ||
30 | ) | ||
31 | { | ||
32 | IBundleExtension* pBE = reinterpret_cast<IBundleExtension*>(pvContext); | ||
33 | HRESULT hr = pBE->BundleExtensionProc(message, pvArgs, pvResults, pvContext); | ||
34 | |||
35 | if (E_NOTIMPL == hr) | ||
36 | { | ||
37 | switch (message) | ||
38 | { | ||
39 | case BUNDLE_EXTENSION_MESSAGE_SEARCH: | ||
40 | hr = BextBaseBEProcSearch(pBE, reinterpret_cast<BUNDLE_EXTENSION_SEARCH_ARGS*>(pvArgs), reinterpret_cast<BUNDLE_EXTENSION_SEARCH_RESULTS*>(pvResults)); | ||
41 | break; | ||
42 | } | ||
43 | } | ||
44 | |||
45 | return hr; | ||
46 | } | ||
diff --git a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h b/src/api/burn/bextutil/inc/BextBootstrapperExtensionEngine.h index 97b02f36..a27ff186 100644 --- a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h +++ b/src/api/burn/bextutil/inc/BextBootstrapperExtensionEngine.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
3 | 3 | ||
4 | #include <IBundleExtensionEngine.h> | 4 | #include <IBootstrapperExtensionEngine.h> |
5 | 5 | ||
6 | #ifdef __cplusplus | 6 | #ifdef __cplusplus |
7 | extern "C" { | 7 | extern "C" { |
@@ -9,10 +9,10 @@ extern "C" { | |||
9 | 9 | ||
10 | // function declarations | 10 | // function declarations |
11 | 11 | ||
12 | HRESULT BextBundleExtensionEngineCreate( | 12 | HRESULT BextBootstrapperExtensionEngineCreate( |
13 | __in PFN_BUNDLE_EXTENSION_ENGINE_PROC pfnBundleExtensionEngineProc, | 13 | __in PFN_BOOTSTRAPPER_EXTENSION_ENGINE_PROC pfnBootstrapperExtensionEngineProc, |
14 | __in_opt LPVOID pvBundleExtensionEngineProcContext, | 14 | __in_opt LPVOID pvBootstrapperExtensionEngineProcContext, |
15 | __out IBundleExtensionEngine** ppEngineForExtension | 15 | __out IBootstrapperExtensionEngine** ppEngineForExtension |
16 | ); | 16 | ); |
17 | 17 | ||
18 | #ifdef __cplusplus | 18 | #ifdef __cplusplus |
diff --git a/src/api/burn/bextutil/inc/IBootstrapperExtension.h b/src/api/burn/bextutil/inc/IBootstrapperExtension.h new file mode 100644 index 00000000..4005a9fd --- /dev/null +++ b/src/api/burn/bextutil/inc/IBootstrapperExtension.h | |||
@@ -0,0 +1,21 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | #include <BootstrapperExtension.h> | ||
5 | |||
6 | DECLARE_INTERFACE_IID_(IBootstrapperExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD") | ||
7 | { | ||
8 | STDMETHOD(Search)( | ||
9 | __in LPCWSTR wzId, | ||
10 | __in LPCWSTR wzVariable | ||
11 | ) = 0; | ||
12 | |||
13 | // BootstrapperExtensionProc - The PFN_BOOTSTRAPPER_EXTENSION_PROC can call this method to give the BootstrapperExtension raw access to the callback from the engine. | ||
14 | // This might be used to help the BootstrapperExtension support more than one version of the engine. | ||
15 | STDMETHOD(BootstrapperExtensionProc)( | ||
16 | __in BOOTSTRAPPER_EXTENSION_MESSAGE message, | ||
17 | __in const LPVOID pvArgs, | ||
18 | __inout LPVOID pvResults, | ||
19 | __in_opt LPVOID pvContext | ||
20 | ) = 0; | ||
21 | }; | ||
diff --git a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h index a4a27fb1..b23a57b7 100644 --- a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h +++ b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h | |||
@@ -1,9 +1,9 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
3 | 3 | ||
4 | #include <BundleExtensionEngine.h> | 4 | #include <BootstrapperExtensionEngine.h> |
5 | 5 | ||
6 | DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263") | 6 | DECLARE_INTERFACE_IID_(IBootstrapperExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263") |
7 | { | 7 | { |
8 | STDMETHOD(EscapeString)( | 8 | STDMETHOD(EscapeString)( |
9 | __in_z LPCWSTR wzIn, | 9 | __in_z LPCWSTR wzIn, |
@@ -40,7 +40,7 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973 | |||
40 | ) = 0; | 40 | ) = 0; |
41 | 41 | ||
42 | STDMETHOD(Log)( | 42 | STDMETHOD(Log)( |
43 | __in BUNDLE_EXTENSION_LOG_LEVEL level, | 43 | __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level, |
44 | __in_z LPCWSTR wzMessage | 44 | __in_z LPCWSTR wzMessage |
45 | ) = 0; | 45 | ) = 0; |
46 | 46 | ||
diff --git a/src/api/burn/bextutil/inc/IBundleExtension.h b/src/api/burn/bextutil/inc/IBundleExtension.h deleted file mode 100644 index 00301672..00000000 --- a/src/api/burn/bextutil/inc/IBundleExtension.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | #include <BundleExtension.h> | ||
5 | |||
6 | DECLARE_INTERFACE_IID_(IBundleExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD") | ||
7 | { | ||
8 | STDMETHOD(Search)( | ||
9 | __in LPCWSTR wzId, | ||
10 | __in LPCWSTR wzVariable | ||
11 | ) = 0; | ||
12 | |||
13 | // BundleExtensionProc - The PFN_BUNDLE_EXTENSION_PROC can call this method to give the BundleExtension raw access to the callback from the engine. | ||
14 | // This might be used to help the BundleExtension support more than one version of the engine. | ||
15 | STDMETHOD(BundleExtensionProc)( | ||
16 | __in BUNDLE_EXTENSION_MESSAGE message, | ||
17 | __in const LPVOID pvArgs, | ||
18 | __inout LPVOID pvResults, | ||
19 | __in_opt LPVOID pvContext | ||
20 | ) = 0; | ||
21 | }; | ||
diff --git a/src/api/burn/bextutil/inc/bextutil.h b/src/api/burn/bextutil/inc/bextutil.h index b8536444..64633cf1 100644 --- a/src/api/burn/bextutil/inc/bextutil.h +++ b/src/api/burn/bextutil/inc/bextutil.h | |||
@@ -4,8 +4,8 @@ | |||
4 | 4 | ||
5 | #include "dutil.h" | 5 | #include "dutil.h" |
6 | 6 | ||
7 | #include "IBundleExtensionEngine.h" | 7 | #include "IBootstrapperExtensionEngine.h" |
8 | #include "IBundleExtension.h" | 8 | #include "IBootstrapperExtension.h" |
9 | 9 | ||
10 | #ifdef __cplusplus | 10 | #ifdef __cplusplus |
11 | extern "C" { | 11 | extern "C" { |
@@ -33,7 +33,7 @@ extern "C" { | |||
33 | #define BextExitOnOptionalXmlQueryFailure(x, b, f, ...) BextExitOnOptionalXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, b, f, __VA_ARGS__) | 33 | #define BextExitOnOptionalXmlQueryFailure(x, b, f, ...) BextExitOnOptionalXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, b, f, __VA_ARGS__) |
34 | #define BextExitOnRequiredXmlQueryFailure(x, f, ...) BextExitOnRequiredXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__) | 34 | #define BextExitOnRequiredXmlQueryFailure(x, f, ...) BextExitOnRequiredXmlQueryFailureSource(DUTIL_SOURCE_DEFAULT, x, f, __VA_ARGS__) |
35 | 35 | ||
36 | const LPCWSTR BUNDLE_EXTENSION_MANIFEST_FILENAME = L"BundleExtensionData.xml"; | 36 | const LPCWSTR BOOTSTRAPPER_EXTENSION_MANIFEST_FILENAME = L"BootstrapperExtensionData.xml"; |
37 | 37 | ||
38 | 38 | ||
39 | /******************************************************************* | 39 | /******************************************************************* |
@@ -42,17 +42,17 @@ const LPCWSTR BUNDLE_EXTENSION_MANIFEST_FILENAME = L"BundleExtensionData.xml"; | |||
42 | 42 | ||
43 | ********************************************************************/ | 43 | ********************************************************************/ |
44 | DAPI_(void) BextInitialize( | 44 | DAPI_(void) BextInitialize( |
45 | __in IBundleExtensionEngine* pEngine | 45 | __in IBootstrapperExtensionEngine* pEngine |
46 | ); | 46 | ); |
47 | 47 | ||
48 | /******************************************************************* | 48 | /******************************************************************* |
49 | BextInitializeFromCreateArgs - convenience function to call BextBundleExtensionEngineCreate | 49 | BextInitializeFromCreateArgs - convenience function to call BextBootstrapperExtensionEngineCreate |
50 | then pass it along to BextInitialize. | 50 | then pass it along to BextInitialize. |
51 | 51 | ||
52 | ********************************************************************/ | 52 | ********************************************************************/ |
53 | DAPI_(HRESULT) BextInitializeFromCreateArgs( | 53 | DAPI_(HRESULT) BextInitializeFromCreateArgs( |
54 | __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, | 54 | __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs, |
55 | __out IBundleExtensionEngine** ppEngine | 55 | __out IBootstrapperExtensionEngine** ppEngine |
56 | ); | 56 | ); |
57 | 57 | ||
58 | /******************************************************************* | 58 | /******************************************************************* |
@@ -62,13 +62,13 @@ DAPI_(HRESULT) BextInitializeFromCreateArgs( | |||
62 | DAPI_(void) BextUninitialize(); | 62 | DAPI_(void) BextUninitialize(); |
63 | 63 | ||
64 | /******************************************************************* | 64 | /******************************************************************* |
65 | BextGetBundleExtensionDataNode - gets the requested BundleExtension node. | 65 | BextGetBootstrapperExtensionDataNode - gets the requested BootstrapperExtension node. |
66 | 66 | ||
67 | ********************************************************************/ | 67 | ********************************************************************/ |
68 | DAPI_(HRESULT) BextGetBundleExtensionDataNode( | 68 | DAPI_(HRESULT) BextGetBootstrapperExtensionDataNode( |
69 | __in IXMLDOMDocument* pixdManifest, | 69 | __in IXMLDOMDocument* pixdManifest, |
70 | __in LPCWSTR wzExtensionId, | 70 | __in LPCWSTR wzExtensionId, |
71 | __out IXMLDOMNode** ppixnBundleExtension | 71 | __out IXMLDOMNode** ppixnBootstrapperExtension |
72 | ); | 72 | ); |
73 | 73 | ||
74 | /******************************************************************* | 74 | /******************************************************************* |
@@ -76,7 +76,7 @@ DAPI_(HRESULT) BextGetBundleExtensionDataNode( | |||
76 | 76 | ||
77 | ********************************************************************/ | 77 | ********************************************************************/ |
78 | DAPIV_(HRESULT) BextLog( | 78 | DAPIV_(HRESULT) BextLog( |
79 | __in BUNDLE_EXTENSION_LOG_LEVEL level, | 79 | __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level, |
80 | __in_z __format_string LPCSTR szFormat, | 80 | __in_z __format_string LPCSTR szFormat, |
81 | ... | 81 | ... |
82 | ); | 82 | ); |
@@ -86,7 +86,7 @@ DAPIV_(HRESULT) BextLog( | |||
86 | 86 | ||
87 | ********************************************************************/ | 87 | ********************************************************************/ |
88 | DAPI_(HRESULT) BextLogArgs( | 88 | DAPI_(HRESULT) BextLogArgs( |
89 | __in BUNDLE_EXTENSION_LOG_LEVEL level, | 89 | __in BOOTSTRAPPER_EXTENSION_LOG_LEVEL level, |
90 | __in_z __format_string LPCSTR szFormat, | 90 | __in_z __format_string LPCSTR szFormat, |
91 | __in va_list args | 91 | __in va_list args |
92 | ); | 92 | ); |
diff --git a/src/api/burn/bextutil/precomp.h b/src/api/burn/bextutil/precomp.h index d5714cc2..52962c06 100644 --- a/src/api/burn/bextutil/precomp.h +++ b/src/api/burn/bextutil/precomp.h | |||
@@ -13,4 +13,4 @@ | |||
13 | #include <xmlutil.h> | 13 | #include <xmlutil.h> |
14 | 14 | ||
15 | #include "bextutil.h" | 15 | #include "bextutil.h" |
16 | #include "BextBundleExtensionEngine.h" | 16 | #include "BextBootstrapperExtensionEngine.h" |