Simplify BootstrapperApplication header files

Take this breaking change opportunity to simplify the header files used by
BA devs.

8 files changed, 31 insertions, 19 deletions

diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp
index 7f774b6c..5d8bfa9c 100644
--- a/src/api/burn/balutil/balutil.cpp
+++ b/src/api/burn/balutil/balutil.cpp
@@ -38,7 +38,7 @@ static void MsgProc(
 
 // prototypes
 
-DAPI_(HRESULT) BootstrapperApplicationRun(
+EXTERN_C HRESULT __stdcall BootstrapperApplicationRun(
     __in IBootstrapperApplication* pApplication
     )
 {
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index 7d539b5b..2b0fd23f 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.vcxproj
@@ -63,7 +63,7 @@
     <ClCompile Include="msg.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="inc\BalBaseBootstrapperApplication.h" />
+    <ClInclude Include="inc\BootstrapperApplicationBase.h" />
     <ClInclude Include="inc\balcondition.h" />
     <ClInclude Include="inc\balinfo.h" />
     <ClInclude Include="inc\balretry.h" />
diff --git a/src/api/burn/balutil/inc/BootstrapperApplication.h b/src/api/burn/balutil/inc/BootstrapperApplication.h
new file mode 100644
index 00000000..d11fccf0
--- /dev/null
+++ b/src/api/burn/balutil/inc/BootstrapperApplication.h
@@ -0,0 +1,21 @@
+#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 "IBootstrapperApplication.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*******************************************************************
+ BootstrapperApplicationRun - runs the IBootstrapperApplication until
+                              the application quits.
+
+********************************************************************/
+HRESULT __stdcall BootstrapperApplicationRun(
+    __in IBootstrapperApplication* pApplication
+    );
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
index 09f1f7a2..a3a3643f 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
@@ -9,9 +9,9 @@
 #include "balinfo.h"
 #include "balretry.h"
 
-#define CBalBaseBootstrapperApplication CBootstrapperApplication
+#define CBalBaseBootstrapperApplication CBootstrapperApplicationBase
 
-class CBootstrapperApplication : public IBootstrapperApplication
+class CBootstrapperApplicationBase : public IBootstrapperApplication
 {
 public: // IUnknown
     virtual STDMETHODIMP QueryInterface(
@@ -1187,7 +1187,7 @@ protected:
         return m_fCanceled;
     }
 
-    CBalBaseBootstrapperApplication(
+    CBootstrapperApplicationBase(
         __in DWORD dwRetryCount = 0,
         __in DWORD dwRetryTimeout = 1000
         )
@@ -1208,7 +1208,7 @@ protected:
         BalRetryInitialize(dwRetryCount, dwRetryTimeout);
     }
 
-    virtual ~CBalBaseBootstrapperApplication()
+    virtual ~CBootstrapperApplicationBase()
     {
         BalInfoUninitializeCommandLine(&m_BalInfoCommand);
         BalRetryUninitialize();
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 3f57f095..a08f6863 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 <BootstrapperApplication.h>
-#include <IBootstrapperEngine.h>
+#include "BootstrapperApplicationTypes.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 ef3b9812..02094aa5 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 "BootstrapperEngine.h"
+#include "BootstrapperEngineTypes.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 d77b3599..32190b56 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
 
 
 /*******************************************************************
- BootstrapperApplicationRun - runs the IBootstrapperApplication until
-                              the application quits.
-
-********************************************************************/
-DAPI_(HRESULT) BootstrapperApplicationRun(
-    __in IBootstrapperApplication* pApplication
-    );
-
-/*******************************************************************
  BalDebuggerCheck - allows bootstrapper application to explicitly check
         whether a debugger should be attached to the boostrapper application.
 
diff --git a/src/api/burn/balutil/precomp.h b/src/api/burn/balutil/precomp.h
index 753bc21f..3123143e 100644
--- a/src/api/burn/balutil/precomp.h
+++ b/src/api/burn/balutil/precomp.h
@@ -30,7 +30,7 @@
 #include <thmutil.h>
 #include <xmlutil.h>
 
-#include "IBootstrapperApplication.h"
+#include "BootstrapperApplication.h"
 
 #include "balutil.h"
 #include "BalBootstrapperEngine.h"