Simplify BootstrapperApplication header files
Take this breaking change opportunity to simplify the header files used by BA devs.
Rob Mensching committed
Mar 21, 2024 at 00:59 UTC
90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc
34 files changed
+75
-154
src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+2
-2
@@ -37,8 +37,8 @@
37
<file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />
38
39
<file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
40
- <file src="$projectFolder$\..\inc\BootstrapperApplication.h" target="build\native\include" />
41
- <file src="$projectFolder$\..\inc\BootstrapperEngine.h" target="build\native\include" />
40
+ <file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
41
+ <file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
42
<file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
43
<file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
44
<file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
src/api/burn/balutil/balutil.cpp
+1
-1
@@ -38,7 +38,7 @@ static void MsgProc(
38
39
// prototypes
40
41
-DAPI_(HRESULT) BootstrapperApplicationRun(
41
+EXTERN_C HRESULT __stdcall BootstrapperApplicationRun(
42
__in IBootstrapperApplication* pApplication
43
)
44
{
src/api/burn/balutil/balutil.vcxproj
+1
-1
@@ -63,7 +63,7 @@
63
<ClCompile Include="msg.cpp" />
64
</ItemGroup>
65
<ItemGroup>
66
- <ClInclude Include="inc\BalBaseBootstrapperApplication.h" />
66
+ <ClInclude Include="inc\BootstrapperApplicationBase.h" />
67
<ClInclude Include="inc\balcondition.h" />
68
<ClInclude Include="inc\balinfo.h" />
69
<ClInclude Include="inc\balretry.h" />
src/api/burn/balutil/inc/BootstrapperApplication.h
new
+21
@@ -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 "IBootstrapperApplication.h"
5
+
6
+#if defined(__cplusplus)
7
+extern "C" {
8
+#endif
9
+
10
+/*******************************************************************
11
+ BootstrapperApplicationRun - runs the IBootstrapperApplication until
12
+ the application quits.
13
+
14
+********************************************************************/
15
+HRESULT __stdcall BootstrapperApplicationRun(
16
+ __in IBootstrapperApplication* pApplication
17
+ );
18
+
19
+#if defined(__cplusplus)
20
+}
21
+#endif
src/api/burn/balutil/inc/BootstrapperApplicationBase.h
renamed
+4
-4
@@ -9,9 +9,9 @@
9
#include "balinfo.h"
10
#include "balretry.h"
11
12
-#define CBalBaseBootstrapperApplication CBootstrapperApplication
12
+#define CBalBaseBootstrapperApplication CBootstrapperApplicationBase
13
14
-class CBootstrapperApplication : public IBootstrapperApplication
14
+class CBootstrapperApplicationBase : public IBootstrapperApplication
15
{
16
public: // IUnknown
17
virtual STDMETHODIMP QueryInterface(
@@ -1187,7 +1187,7 @@ protected:
1187
return m_fCanceled;
1188
}
1189
1190
- CBalBaseBootstrapperApplication(
1190
+ CBootstrapperApplicationBase(
1191
__in DWORD dwRetryCount = 0,
1192
__in DWORD dwRetryTimeout = 1000
1193
)
@@ -1208,7 +1208,7 @@ protected:
1208
BalRetryInitialize(dwRetryCount, dwRetryTimeout);
1209
}
1210
1211
- virtual ~CBalBaseBootstrapperApplication()
1211
+ virtual ~CBootstrapperApplicationBase()
1212
{
1213
BalInfoUninitializeCommandLine(&m_BalInfoCommand);
1214
BalRetryUninitialize();
src/api/burn/balutil/inc/IBootstrapperApplication.h
+2
-2
@@ -1,8 +1,8 @@
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 <BootstrapperApplication.h>
5
-#include <IBootstrapperEngine.h>
4
+#include "BootstrapperApplicationTypes.h"
5
+#include "IBootstrapperEngine.h"
6
7
DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-AB06-099D717C67FE")
8
{
src/api/burn/balutil/inc/IBootstrapperEngine.h
+1
-1
@@ -1,7 +1,7 @@
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 "BootstrapperEngine.h"
4
+#include "BootstrapperEngineTypes.h"
5
6
DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-81512C29C2FB")
7
{
src/api/burn/balutil/inc/balutil.h
-9
@@ -42,15 +42,6 @@ static const HRESULT E_WIXSTDBA_CONDITION_FAILED = MAKE_HRESULT(SEVERITY_ERROR,
42
static const HRESULT E_PREREQBA_INFINITE_LOOP = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIX, 1002);
43
44
45
-/*******************************************************************
46
- BootstrapperApplicationRun - runs the IBootstrapperApplication until
47
- the application quits.
48
-
49
-********************************************************************/
50
-DAPI_(HRESULT) BootstrapperApplicationRun(
51
- __in IBootstrapperApplication* pApplication
52
- );
53
-
45
/*******************************************************************
46
BalDebuggerCheck - allows bootstrapper application to explicitly check
47
whether a debugger should be attached to the boostrapper application.
src/api/burn/balutil/precomp.h
+1
-1
@@ -30,7 +30,7 @@
30
#include <thmutil.h>
31
#include <xmlutil.h>
32
33
-#include "IBootstrapperApplication.h"
33
+#include "BootstrapperApplication.h"
34
35
#include "balutil.h"
36
#include "BalBootstrapperEngine.h"
src/api/burn/bextutil/bextutil.nuspec
+2
-2
@@ -21,8 +21,8 @@
21
<file src="$projectFolder$\build\$id$.props" target="build\" />
22
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23
<file src="$projectFolder$\inc\*" target="build\native\include" />
24
- <file src="$projectFolder$\..\inc\BootstrapperExtension.h" target="build\native\include" />
25
- <file src="$projectFolder$\..\inc\BootstrapperExtensionEngine.h" target="build\native\include" />
24
+ <file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
25
+ <file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
26
<file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
27
<file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
28
<file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
src/api/burn/bextutil/inc/IBootstrapperExtension.h
+1
-1
@@ -1,7 +1,7 @@
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>
4
+#include "BootstrapperExtensionTypes.h"
5
6
DECLARE_INTERFACE_IID_(IBootstrapperExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")
7
{
src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
+1
-1
@@ -1,7 +1,7 @@
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 <BootstrapperExtensionEngine.h>
4
+#include "BootstrapperExtensionEngineTypes.h"
5
6
DECLARE_INTERFACE_IID_(IBootstrapperExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")
7
{
src/api/burn/inc/BootstrapperApplicationTypes.h
renamed
+1
-52
@@ -1,7 +1,7 @@
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 "BootstrapperEngine.h"
4
+#include "BootstrapperEngineTypes.h"
5
6
#if defined(__cplusplus)
7
extern "C" {
@@ -1535,57 +1535,6 @@ struct BA_ONUNREGISTERCOMPLETE_RESULTS
1535
DWORD dwApiVersion;
1536
};
1537
1538
-#ifdef TODO_DELETE
1539
-
1540
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_PROC)(
1541
- __in BOOTSTRAPPER_APPLICATION_MESSAGE message,
1542
- __in const LPVOID pvArgs,
1543
- __inout LPVOID pvResults,
1544
- __in_opt LPVOID pvContext
1545
- );
1546
-
1547
-struct BOOTSTRAPPER_DESTROY_ARGS
1548
-{
1549
- DWORD dwApiVersion;
1550
- BOOL fReload;
1551
-};
1552
-
1553
-struct BOOTSTRAPPER_DESTROY_RESULTS
1554
-{
1555
- DWORD dwApiVersion;
1556
- BOOL fDisableUnloading; // indicates the BA dll must not be unloaded after BootstrapperApplicationDestroy.
1557
-};
1558
-
1559
-extern "C" typedef void (WINAPI *PFN_BOOTSTRAPPER_APPLICATION_DESTROY)(
1560
- __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
1561
- __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
1562
- );
1563
-
1564
-
1565
-
1566
-struct BOOTSTRAPPER_CREATE_ARGS
1567
-{
1568
- DWORD dwApiVersion;
1569
- DWORD64 qwEngineAPIVersion;
1570
- PFN_BOOTSTRAPPER_ENGINE_PROC pfnBootstrapperEngineProc;
1571
- LPVOID pvBootstrapperEngineProcContext;
1572
- BOOTSTRAPPER_COMMAND* pCommand;
1573
-};
1574
-
1575
-struct BOOTSTRAPPER_CREATE_RESULTS
1576
-{
1577
- DWORD dwApiVersion;
1578
- PFN_BOOTSTRAPPER_APPLICATION_PROC pfnBootstrapperApplicationProc;
1579
- LPVOID pvBootstrapperApplicationProcContext;
1580
-};
1581
-
1582
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_CREATE)(
1583
- __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
1584
- __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
1585
- );
1586
-
1587
-#endif
1588
-
1538
#if defined(__cplusplus)
1539
}
1540
#endif
src/api/burn/inc/BootstrapperEngineTypes.h
renamed
-7
@@ -448,13 +448,6 @@ typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS
448
DWORD cchValue;
449
} BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS;
450
451
-// extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_ENGINE_PROC)(
452
-// __in BOOTSTRAPPER_ENGINE_MESSAGE message,
453
-// __in const LPVOID pvArgs,
454
-// __inout LPVOID pvResults,
455
-// __in_opt LPVOID pvContext
456
-// );
457
-
451
#if defined(__cplusplus)
452
}
453
#endif
src/api/burn/inc/BootstrapperExtensionEngineTypes.h
renamed
src/api/burn/inc/BootstrapperExtensionTypes.h
renamed
+1
-1
@@ -1,7 +1,7 @@
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 <BootstrapperExtensionEngine.h>
4
+#include "BootstrapperExtensionEngineTypes.h"
5
6
#if defined(__cplusplus)
7
extern "C" {
src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.cpp
+2
-3
@@ -1,12 +1,11 @@
1
// 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
3
#include "precomp.h"
4
-#include "BalBaseBootstrapperApplication.h"
4
6
-class CTestBootstrapperApplication : public CBalBaseBootstrapperApplication
5
+class CTestBootstrapperApplication : public CBootstrapperApplicationBase
6
{
7
public:
9
- CTestBootstrapperApplication() : CBalBaseBootstrapperApplication()
8
+ CTestBootstrapperApplication() : CBootstrapperApplicationBase()
9
{
10
}
11
};
src/api/burn/test/BalUtilUnitTest/precomp.h
+1
-3
@@ -15,9 +15,7 @@
15
#include <dutil.h>
16
#include <dictutil.h>
17
18
-#include <IBootstrapperApplication.h>
19
-#include <balutil.h>
20
-#include <balretry.h>
18
+#include <BootstrapperApplicationBase.h>
19
20
#include "TestBootstrapperApplication.h"
21
src/burn/engine/engine.vcxproj
+4
-4
@@ -101,10 +101,10 @@
101
<ItemGroup>
102
<ClInclude Include="apply.h" />
103
<ClInclude Include="approvedexe.h" />
104
- <ClInclude Include="..\..\api\burn\inc\BootstrapperApplication.h" />
105
- <ClInclude Include="..\..\api\burn\inc\BootstrapperEngine.h" />
106
- <ClInclude Include="..\..\api\burn\inc\BootstrapperExtension.h" />
107
- <ClInclude Include="..\..\api\burn\inc\BootstrapperExtensionEngine.h" />
104
+ <ClInclude Include="..\..\api\burn\inc\BootstrapperApplicationTypes.h" />
105
+ <ClInclude Include="..\..\api\burn\inc\BootstrapperEngineTypes.h" />
106
+ <ClInclude Include="..\..\api\burn\inc\BootstrapperExtensionTypes.h" />
107
+ <ClInclude Include="..\..\api\burn\inc\BootstrapperExtensionEngineTypes.h" />
108
<ClInclude Include="ba.h" />
109
<ClInclude Include="bacallback.h" />
110
<ClInclude Include="bundlepackageengine.h" />
src/burn/engine/precomp.h
+2
-2
@@ -61,8 +61,8 @@
61
#include <dpiutil.h>
62
#include <butil.h>
63
64
-#include "BootstrapperApplication.h"
65
-#include "BootstrapperExtension.h"
64
+#include "BootstrapperApplicationTypes.h"
65
+#include "BootstrapperExtensionTypes.h"
66
67
#include "platform.h"
68
#include "variant.h"
src/burn/test/BurnUnitTest/precomp.h
+2
-2
@@ -37,8 +37,8 @@
37
#include <deputil.h>
38
#include <butil.h>
39
40
-#include "BootstrapperApplication.h"
41
-#include "BootstrapperExtension.h"
40
+#include "BootstrapperApplicationTypes.h"
41
+#include "BootstrapperExtensionTypes.h"
42
43
#include "platform.h"
44
#include "variant.h"
src/ext/Bal/Samples/bafunctions/precomp.h
+1
-6
@@ -34,12 +34,7 @@
34
//#include "xmlutil.h"
35
#include "regutil.h"
36
37
-//#include "IBootstrapperApplication.h"
38
-
39
-#include "BalBaseBootstrapperApplication.h"
40
-//#include "balinfo.h"
41
-//#include "balcondition.h"
42
-#include "balutil.h"
37
+#include "BootstrapperApplicationBase.h"
38
39
#include "BAFunctions.h"
40
#include "IBAFunctions.h"
src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
+4
-5
@@ -1,7 +1,6 @@
1
// 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
3
#include "precomp.h"
4
-#include "BalBaseBootstrapperApplication.h"
4
5
static const LPCWSTR WIXIUIBA_WINDOW_CLASS = L"WixInternalUIBA";
6
@@ -15,10 +14,10 @@ enum WM_WIXIUIBA
14
};
15
16
18
-class CWixInternalUIBootstrapperApplication : public CBalBaseBootstrapperApplication
17
+class CWixInternalUIBootstrapperApplication : public CBootstrapperApplicationBase
18
{
19
public: // IBootstrapperApplication
21
- STDMETHODIMP OnCreate(
20
+ virtual STDMETHODIMP OnCreate(
21
__in IBootstrapperEngine* pEngine,
22
__in BOOTSTRAPPER_COMMAND* pCommand
23
)
@@ -26,7 +25,7 @@ public: // IBootstrapperApplication
25
HRESULT hr = S_OK;
26
27
hr = __super::OnCreate(pEngine, pCommand);
29
- BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
28
+ BalExitOnFailure(hr, "CBootstrapperApplicationBase initialization failed.");
29
30
m_commandAction = pCommand->action;
31
m_commandDisplay = pCommand->display;
@@ -794,7 +793,7 @@ public:
793
//
794
CWixInternalUIBootstrapperApplication(
795
__in HMODULE hModule
797
- ) : CBalBaseBootstrapperApplication(3, 3000)
796
+ ) : CBootstrapperApplicationBase(3, 3000)
797
{
798
m_hModule = hModule;
799
m_commandAction = BOOTSTRAPPER_ACTION_UNKNOWN;
src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+7
-8
@@ -1,7 +1,6 @@
1
// 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
3
#include "precomp.h"
4
-#include "BalBaseBootstrapperApplication.h"
4
5
static const LPCWSTR WIXBUNDLE_VARIABLE_CANRESTART = L"WixCanRestart";
6
static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated";
@@ -178,10 +177,10 @@ static LPCSTR LoggingMsiFeatureStateToString(
177
);
178
179
181
-class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication
180
+class CWixStandardBootstrapperApplication : public CBootstrapperApplicationBase
181
{
182
public: // IBootstrapperApplication
184
- STDMETHODIMP OnCreate(
183
+ virtual STDMETHODIMP OnCreate(
184
__in IBootstrapperEngine* pEngine,
185
__in BOOTSTRAPPER_COMMAND* pCommand
186
)
@@ -189,7 +188,7 @@ public: // IBootstrapperApplication
188
HRESULT hr = S_OK;
189
190
hr = __super::OnCreate(pEngine, pCommand);
192
- BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
191
+ BalExitOnFailure(hr, "CBootstrapperApplicationBase initialization failed.");
192
193
m_commandAction = pCommand->action;
194
m_commandDisplay = pCommand->display;
@@ -388,7 +387,7 @@ public: // IBootstrapperApplication
387
}
388
389
LExit:
391
- return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
390
+ return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
391
}
392
393
@@ -563,7 +562,7 @@ public: // IBootstrapperApplication
562
*pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE;
563
}
564
566
- return CBalBaseBootstrapperApplication::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
565
+ return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
566
}
567
568
@@ -633,7 +632,7 @@ public: // IBootstrapperApplication
632
}
633
}
634
636
- return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel);
635
+ return CBootstrapperApplicationBase::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel);
636
}
637
638
@@ -4778,7 +4777,7 @@ public:
4777
CWixStandardBootstrapperApplication(
4778
__in HMODULE hModule,
4779
__in BOOL fRunAsPrereqBA
4781
- ) : CBalBaseBootstrapperApplication(3, 3000)
4780
+ ) : CBootstrapperApplicationBase(3, 3000)
4781
{
4782
THEME_ASSIGN_CONTROL_ID* pAssignControl = NULL;
4783
DWORD dwAutomaticBehaviorType = THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ENABLED | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VISIBLE | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ACTION | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VALUE;
src/ext/Bal/stdbas/precomp.h
+2
-6
@@ -36,13 +36,9 @@
36
#include <uriutil.h>
37
#include <xmlutil.h>
38
39
-#include <IBootstrapperApplication.h>
40
-
41
-#include <balutil.h>
42
-#include <balinfo.h>
43
-#include <balcondition.h>
44
-
39
+#include <BootstrapperApplicationBase.h>
40
#include <BAFunctions.h>
41
+#include <balcondition.h>
42
43
#include "stdbas.messages.h"
44
#include "WixStandardBootstrapperApplication.h"
src/ext/Bal/test/WixStdFnUnitTest/TestBootstrapperApplication.cpp
+2
-3
@@ -1,12 +1,11 @@
1
// 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
3
#include "precomp.h"
4
-#include "BalBaseBootstrapperApplication.h"
4
6
-class CTestBootstrapperApplication : public CBalBaseBootstrapperApplication
5
+class CTestBootstrapperApplication : public CBootstrapperApplicationBase
6
{
7
public:
9
- CTestBootstrapperApplication() : CBalBaseBootstrapperApplication()
8
+ CTestBootstrapperApplication() : CBootstrapperApplicationBase()
9
{
10
}
11
};
src/ext/Bal/test/WixStdFnUnitTest/precomp.h
+1
-3
@@ -15,10 +15,8 @@
15
#include <dutil.h>
16
#include <dictutil.h>
17
18
-#include <IBootstrapperApplication.h>
18
+#include <BootstrapperApplicationBase.h>
19
#include <IBAFunctions.h>
20
-#include <balutil.h>
21
-#include <balretry.h>
20
21
#include "TestBAFunctions.h"
22
#include "TestBootstrapperApplication.h"
src/ext/Bal/wixiuiba/precomp.h
+1
-5
@@ -15,10 +15,6 @@
15
#include <strutil.h>
16
#include <xmlutil.h>
17
18
-#include <IBootstrapperApplication.h>
19
-
20
-#include <balutil.h>
21
-#include <balinfo.h>
22
-#include <balcondition.h>
18
+#include <BootstrapperApplication.h>
19
20
#include "WixInternalUIBootstrapperApplication.h"
src/ext/Bal/wixprqba/precomp.h
+1
-6
@@ -35,12 +35,7 @@
35
#include <uriutil.h>
36
#include <xmlutil.h>
37
38
-#include <IBootstrapperApplication.h>
39
-
40
-#include <balutil.h>
41
-#include <balinfo.h>
42
-#include <balcondition.h>
43
-
38
+#include <BootstrapperApplication.h>
39
#include <BAFunctions.h>
40
41
#include "WixStandardBootstrapperApplication.h"
src/ext/Bal/wixstdba/precomp.h
+1
-5
@@ -35,12 +35,8 @@
35
#include <uriutil.h>
36
#include <xmlutil.h>
37
38
-#include <IBootstrapperApplication.h>
39
-
38
+#include <BootstrapperApplication.h>
39
#include <balutil.h>
41
-#include <balinfo.h>
42
-#include <balcondition.h>
43
-
40
#include <BAFunctions.h>
41
42
#include "WixStandardBootstrapperApplication.h"
src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.h
+1
-2
@@ -30,8 +30,7 @@
30
#include "regutil.h"
31
#include "xmlutil.h"
32
33
-#include "BalBaseBootstrapperApplication.h"
34
-#include "balutil.h"
33
+#include <BootstrapperApplicationBase.h>
34
35
#include "BAFunctions.h"
36
#include "IBAFunctions.h"
src/test/burn/TestData/Manual/BafThmutilTesting/precomp.h
+1
-2
@@ -30,8 +30,7 @@
30
#include "regutil.h"
31
#include "xmlutil.h"
32
33
-#include "BalBaseBootstrapperApplication.h"
34
-#include "balutil.h"
33
+#include <BootstrapperApplicationBase.h>
34
35
#include "BAFunctions.h"
36
#include "IBAFunctions.h"
src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
+2
-2
@@ -9,7 +9,7 @@ class CPrereqBaf : public CBalBaseBAFunctions
9
public: // IBAFunctions
10
11
public: //IBootstrapperApplication
12
- STDMETHODIMP OnCreate(
12
+ virtual STDMETHODIMP OnCreate(
13
__in IBootstrapperEngine* pEngine,
14
__in BOOTSTRAPPER_COMMAND* pCommand
15
)
@@ -17,7 +17,7 @@ public: //IBootstrapperApplication
17
HRESULT hr = S_OK;
18
19
hr = __super::OnCreate(pEngine, pCommand);
20
- ExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
20
+ ExitOnFailure(hr, "CPrereqBaf initialization failed.");
21
22
hr = StrAllocString(&m_sczBARuntimeDirectory, pCommand->wzBootstrapperWorkingFolder, 0);
23
ExitOnFailure(hr, "Failed to copy working folder");
src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.h
+1
-2
@@ -18,8 +18,7 @@
18
#include "pathutil.h"
19
#include "strutil.h"
20
21
-#include "BalBaseBootstrapperApplication.h"
22
-#include "balutil.h"
21
+#include <BootstrapperApplicationBase.h>
22
23
#include "BAFunctions.h"
24
#include "IBAFunctions.h"