WIP - BA header simplification

23 files changed, 50 insertions, 67 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/batypes.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index 0116364c..79b1df80 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/batypes.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -1,6 +1,11 @@
 #pragma once
 // 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.
 
+#include "BootstrapperEngine.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 const LPCWSTR BOOTSTRAPPER_APPLICATION_COMMANDLINE_SWITCH_API_VERSION = L"burn.ba.apiver";
 const LPCWSTR BOOTSTRAPPER_APPLICATION_COMMANDLINE_SWITCH_PIPE_NAME = L"burn.ba.pipe";
@@ -1595,3 +1600,7 @@ extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_CREATE)(
     );
 
 #endif
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/baenginetypes.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
index 7af41d97..7af41d97 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/baenginetypes.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp
index a77ff7d0..7f774b6c 100644
--- a/src/api/burn/balutil/balutil.cpp
+++ b/src/api/burn/balutil/balutil.cpp
@@ -38,21 +38,6 @@ static void MsgProc(
 
 // prototypes
 
-DAPI_(void) BalInitialize(
-    __in IBootstrapperEngine* pEngine
-    )
-{
-    pEngine->AddRef();
-
-    ReleaseObject(vpEngine);
-    vpEngine = pEngine;
-}
-
-DAPI_(void) BalUninitialize()
-{
-    ReleaseNullObject(vpEngine);
-}
-
 DAPI_(HRESULT) BootstrapperApplicationRun(
     __in IBootstrapperApplication* pApplication
     )
@@ -86,7 +71,7 @@ DAPI_(HRESULT) BootstrapperApplicationRun(
     BalInitialize(pEngine);
     fInitializedBal = TRUE;
 
-    BootstrapperApplicationDebuggerCheck();
+    BalDebuggerCheck();
 
     hr = MsgPump(hBAPipe, pApplication, pEngine);
     BalExitOnFailure(hr, "Failed while pumping messages.");
@@ -111,7 +96,22 @@ LExit:
     return hr;
 }
 
-DAPI_(VOID) BootstrapperApplicationDebuggerCheck()
+DAPI_(void) BalInitialize(
+    __in IBootstrapperEngine* pEngine
+    )
+{
+    pEngine->AddRef();
+
+    ReleaseObject(vpEngine);
+    vpEngine = pEngine;
+}
+
+DAPI_(void) BalUninitialize()
+{
+    ReleaseNullObject(vpEngine);
+}
+
+DAPI_(VOID) BalDebuggerCheck()
 {
     HRESULT hr = S_OK;
     HKEY hk = NULL;
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
index 33b71324..df0b7006 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -4,7 +4,7 @@
 #include <windows.h>
 #include <msiquery.h>
 
-#include <batypes.h>
+#include <BootstrapperApplication.h>
 
 #include "IBAFunctions.h"
 
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index 30c75fb6..09f1f7a2 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -3,7 +3,6 @@
 #include <windows.h>
 #include <msiquery.h>
 
-#include "IBootstrapperEngine.h"
 #include "IBootstrapperApplication.h"
 
 #include "balutil.h"
diff --git a/src/api/burn/balutil/inc/IBAFunctions.h b/src/api/burn/balutil/inc/IBAFunctions.h
index b0afabb3..42b64f9b 100644
--- a/src/api/burn/balutil/inc/IBAFunctions.h
+++ b/src/api/burn/balutil/inc/IBAFunctions.h
@@ -3,6 +3,7 @@
 
 
 #include "IBootstrapperApplication.h"
+#include "BAFunctions.h"
 
 DECLARE_INTERFACE_IID_(IBAFunctions, IBootstrapperApplication, "0FB445ED-17BD-49C7-BE19-479776F8AE96")
 {
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 6eb32ee6..3f57f095 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -1,8 +1,8 @@
 #pragma once
 // 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.
 
-#include <batypes.h>
-
+#include <BootstrapperApplication.h>
+#include <IBootstrapperEngine.h>
 
 DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-AB06-099D717C67FE")
 {
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index 3c1afb77..ef3b9812 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -1,7 +1,7 @@
 #pragma once
 // 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.
 
-#include <baenginetypes.h>
+#include "BootstrapperEngine.h"
 
 DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-81512C29C2FB")
 {
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h
index 4f8cb23d..d77b3599 100644
--- a/src/api/burn/balutil/inc/balutil.h
+++ b/src/api/burn/balutil/inc/balutil.h
@@ -43,15 +43,6 @@ static const HRESULT E_PREREQBA_INFINITE_LOOP = MAKE_HRESULT(SEVERITY_ERROR, FAC
 
 
 /*******************************************************************
- BootstrapperApplicationDebuggerCheck - allows bootstrapper application to
-        explicitly check whether a debugger should be attached to the boostrapper
-        application.
-
- Note: Automatically called in BootstrapperApplicationRun().
-********************************************************************/
-DAPI_(VOID) BootstrapperApplicationDebuggerCheck();
-
-/*******************************************************************
  BootstrapperApplicationRun - runs the IBootstrapperApplication until
                               the application quits.
 
@@ -61,6 +52,14 @@ DAPI_(HRESULT) BootstrapperApplicationRun(
     );
 
 /*******************************************************************
+ BalDebuggerCheck - allows bootstrapper application to explicitly check
+        whether a debugger should be attached to the boostrapper application.
+
+ Note: Automatically called in BootstrapperApplicationRun().
+********************************************************************/
+DAPI_(VOID) BalDebuggerCheck();
+
+/*******************************************************************
  BalInitialize - remembers the engine interface to enable logging and
                  other functions.
 
diff --git a/src/api/burn/balutil/precomp.h b/src/api/burn/balutil/precomp.h
index ace4f3ec..68e07a44 100644
--- a/src/api/burn/balutil/precomp.h
+++ b/src/api/burn/balutil/precomp.h
@@ -30,13 +30,6 @@
 #include <thmutil.h>
 #include <xmlutil.h>
 
-#include <baenginetypes.h>
-#include <batypes.h>
-
-#include "IBootstrapperEngine.h"
-#include "IBootstrapperApplication.h"
-
-#include "BAFunctions.h"
 #include "IBAFunctions.h"
 
 #include "balutil.h"
diff --git a/src/api/burn/mbanative/mbanative.def b/src/api/burn/mbanative/mbanative.def
index bd013699..37876be0 100644
--- a/src/api/burn/mbanative/mbanative.def
+++ b/src/api/burn/mbanative/mbanative.def
@@ -8,7 +8,7 @@ EXPORTS
     BalGetVersionVariableFromEngine
     BalGetRelatedBundleVariableFromEngine
     BalVariableExistsFromEngine
-    BootstrapperApplicationDebuggerCheck
+    BalDebuggerCheck
     BootstrapperApplicationRun
     StrFree
     VerCompareParsedVersions
diff --git a/src/api/burn/mbanative/precomp.h b/src/api/burn/mbanative/precomp.h
index 622f341a..81f875af 100644
--- a/src/api/burn/mbanative/precomp.h
+++ b/src/api/burn/mbanative/precomp.h
@@ -8,9 +8,5 @@
 #include <dutil.h>
 #include <verutil.h>
 
-// #include <BootstrapperEngine.h>
-// #include <BootstrapperApplication.h>
-
-#include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
 #include <balutil.h>
diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h
index 57487bc5..4cdd262c 100644
--- a/src/api/burn/test/BalUtilUnitTest/precomp.h
+++ b/src/api/burn/test/BalUtilUnitTest/precomp.h
@@ -15,11 +15,6 @@
 #include <dutil.h>
 #include <dictutil.h>
 
-#include <baenginetypes.h>
-#include <batypes.h>
-
-#include <BAFunctions.h>
-#include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
 #include <IBAFunctions.h>
 #include <balutil.h>
diff --git a/src/burn/engine/bootstrapperapplication.h b/src/burn/engine/ba.h
index c092fedf..c092fedf 100644
--- a/src/burn/engine/bootstrapperapplication.h
+++ b/src/burn/engine/ba.h
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index 7a2447f8..a897140d 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -102,12 +102,12 @@
   <ItemGroup>
     <ClInclude Include="apply.h" />
     <ClInclude Include="approvedexe.h" />
-    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\batypes.h" />
-    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\baenginetypes.h" />
+    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" />
+    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" />
     <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" />
     <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" />
+    <ClInclude Include="ba.h" />
     <ClInclude Include="bacallback.h" />
-    <ClInclude Include="bootstrapperapplication.h" />
     <ClInclude Include="bundlepackageengine.h" />
     <ClInclude Include="burnextension.h" />
     <ClInclude Include="cabextract.h" />
diff --git a/src/burn/engine/precomp.h b/src/burn/engine/precomp.h
index 1150b2a0..24a01140 100644
--- a/src/burn/engine/precomp.h
+++ b/src/burn/engine/precomp.h
@@ -61,8 +61,8 @@
 #include <dpiutil.h>
 #include <butil.h>
 
-#include "baenginetypes.h"
-#include "batypes.h"
+#include "BootstrapperApplication.h"
+
 #include "BundleExtensionEngine.h"
 #include "BundleExtension.h"
 
@@ -77,7 +77,7 @@
 #include "cabextract.h"
 #include "burnextension.h"
 #include "search.h"
-#include "bootstrapperapplication.h"
+#include "ba.h"
 #include "userexperience.h"
 #include "package.h"
 #include "update.h"
diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h
index 82fedf10..1b297429 100644
--- a/src/burn/test/BurnUnitTest/precomp.h
+++ b/src/burn/test/BurnUnitTest/precomp.h
@@ -37,8 +37,7 @@
 #include <deputil.h>
 #include <butil.h>
 
-#include "baenginetypes.h"
-#include "batypes.h"
+#include "BootstrapperApplication.h"
 #include "BundleExtensionEngine.h"
 #include "BundleExtension.h"
 
@@ -53,7 +52,7 @@
 #include "cabextract.h"
 #include "burnextension.h"
 #include "search.h"
-#include "bootstrapperapplication.h"
+#include "ba.h"
 #include "userexperience.h"
 #include "package.h"
 #include "update.h"
diff --git a/src/ext/Bal/Samples/bafunctions/precomp.h b/src/ext/Bal/Samples/bafunctions/precomp.h
index cda11a40..542ac606 100644
--- a/src/ext/Bal/Samples/bafunctions/precomp.h
+++ b/src/ext/Bal/Samples/bafunctions/precomp.h
@@ -34,7 +34,6 @@
 //#include "xmlutil.h"
 #include "regutil.h"
 
-//#include "IBootstrapperEngine.h"
 //#include "IBootstrapperApplication.h"
 
 #include "BalBaseBootstrapperApplication.h"
diff --git a/src/ext/Bal/stdbas/precomp.h b/src/ext/Bal/stdbas/precomp.h
index 7f138035..00d0d03f 100644
--- a/src/ext/Bal/stdbas/precomp.h
+++ b/src/ext/Bal/stdbas/precomp.h
@@ -36,7 +36,6 @@
 #include <uriutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
 
 #include <balutil.h>
diff --git a/src/ext/Bal/test/examples/TestEngine/precomp.h b/src/ext/Bal/test/examples/TestEngine/precomp.h
index e9ba3f98..2beba0b9 100644
--- a/src/ext/Bal/test/examples/TestEngine/precomp.h
+++ b/src/ext/Bal/test/examples/TestEngine/precomp.h
@@ -11,8 +11,8 @@
 #include "pathutil.h"
 #include "strutil.h"
 
-#include <baenginetypes.h>
-#include <batypes.h>
+// #include <baenginetypes.h>
+// #include <batypes.h>
 
 #include "TestEngine.h"
 #include "ReloadEngine.h"
diff --git a/src/ext/Bal/wixiuiba/precomp.h b/src/ext/Bal/wixiuiba/precomp.h
index cb6730fd..782c0b1b 100644
--- a/src/ext/Bal/wixiuiba/precomp.h
+++ b/src/ext/Bal/wixiuiba/precomp.h
@@ -15,10 +15,6 @@
 #include <strutil.h>
 #include <xmlutil.h>
 
-#include <baenginetypes.h>
-#include <batypes.h>
-
-#include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
 
 #include <balutil.h>
diff --git a/src/ext/Bal/wixprqba/precomp.h b/src/ext/Bal/wixprqba/precomp.h
index 8844d150..a47f411b 100644
--- a/src/ext/Bal/wixprqba/precomp.h
+++ b/src/ext/Bal/wixprqba/precomp.h
@@ -35,7 +35,6 @@
 #include <uriutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
 
 #include <balutil.h>
diff --git a/src/ext/Bal/wixstdba/precomp.h b/src/ext/Bal/wixstdba/precomp.h
index 8844d150..a47f411b 100644
--- a/src/ext/Bal/wixstdba/precomp.h
+++ b/src/ext/Bal/wixstdba/precomp.h
@@ -35,7 +35,6 @@
 #include <uriutil.h>
 #include <xmlutil.h>
 
-#include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
 
 #include <balutil.h>