Simplify BootstrapperApplication header files

Take this breaking change opportunity to simplify the header files used by BA devs.
author: Rob Mensching <rob@firegiant.com> 2024-03-21 00:59:21 -0700
committer: Rob Mensching <rob@firegiant.com> 2024-03-21 13:07:14 -0700
commit: 90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc (patch)
tree: 8701442f92b68fc5d7d24ebc09449419b6824cd5 /src/api/burn/inc
parent: a2b75ebed82be8c488f2840c359a512e865d682c (diff)
download: wix-90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc.tar.gz
wix-90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc.tar.bz2
wix-90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc.zip
4 files changed, 2 insertions, 60 deletions
diff --git a/src/api/burn/inc/BootstrapperApplication.h b/src/api/burn/inc/BootstrapperApplicationTypes.h
index 8b945b77..c7eaa3d3 100644
--- a/src/api/burn/inc/BootstrapperApplication.h
+++ b/src/api/burn/inc/BootstrapperApplicationTypes.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"
 #if defined(__cplusplus)
 extern "C" {
@@ -1535,57 +1535,6 @@ struct BA_ONUNREGISTERCOMPLETE_RESULTS
    DWORD dwApiVersion;
 };
-#ifdef TODO_DELETE
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_PROC)(
-    __in BOOTSTRAPPER_APPLICATION_MESSAGE message,
-    __in const LPVOID pvArgs,
-    __inout LPVOID pvResults,
-    __in_opt LPVOID pvContext
-    );
-struct BOOTSTRAPPER_DESTROY_ARGS
-{
-    DWORD dwApiVersion;
-    BOOL fReload;
-};
-struct BOOTSTRAPPER_DESTROY_RESULTS
-{
-    DWORD dwApiVersion;
-    BOOL fDisableUnloading; // indicates the BA dll must not be unloaded after BootstrapperApplicationDestroy.
-};
-extern "C" typedef void (WINAPI *PFN_BOOTSTRAPPER_APPLICATION_DESTROY)(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    );
-struct BOOTSTRAPPER_CREATE_ARGS
-{
-    DWORD dwApiVersion;
-    DWORD64 qwEngineAPIVersion;
-    PFN_BOOTSTRAPPER_ENGINE_PROC pfnBootstrapperEngineProc;
-    LPVOID pvBootstrapperEngineProcContext;
-    BOOTSTRAPPER_COMMAND* pCommand;
-};
-struct BOOTSTRAPPER_CREATE_RESULTS
-{
-    DWORD dwApiVersion;
-    PFN_BOOTSTRAPPER_APPLICATION_PROC pfnBootstrapperApplicationProc;
-    LPVOID pvBootstrapperApplicationProcContext;
-};
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_CREATE)(
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
-#endif
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/api/burn/inc/BootstrapperEngine.h b/src/api/burn/inc/BootstrapperEngineTypes.h
index 7af41d97..e2634383 100644
--- a/src/api/burn/inc/BootstrapperEngine.h
+++ b/src/api/burn/inc/BootstrapperEngineTypes.h
@@ -448,13 +448,6 @@ typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS
    DWORD cchValue;
 } BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS;
-// extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_ENGINE_PROC)(
-//     __in BOOTSTRAPPER_ENGINE_MESSAGE message,
-//     __in const LPVOID pvArgs,
-//     __inout LPVOID pvResults,
-//     __in_opt LPVOID pvContext
-//     );
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/api/burn/inc/BootstrapperExtensionEngine.h b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
index 24c304c6..24c304c6 100644
--- a/src/api/burn/inc/BootstrapperExtensionEngine.h
+++ b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
diff --git a/src/api/burn/inc/BootstrapperExtension.h b/src/api/burn/inc/BootstrapperExtensionTypes.h
index b1fa6408..4d45b59d 100644
--- a/src/api/burn/inc/BootstrapperExtension.h
+++ b/src/api/burn/inc/BootstrapperExtensionTypes.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 <BootstrapperExtensionEngine.h>
+#include "BootstrapperExtensionEngineTypes.h"
 #if defined(__cplusplus)
 extern "C" {
author	Rob Mensching <rob@firegiant.com>	2024-03-21 00:59:21 -0700
committer	Rob Mensching <rob@firegiant.com>	2024-03-21 13:07:14 -0700
commit	90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc (patch)
tree	8701442f92b68fc5d7d24ebc09449419b6824cd5 /src/api/burn/inc
parent	a2b75ebed82be8c488f2840c359a512e865d682c (diff)
download	wix-90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc.tar.gz wix-90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc.tar.bz2 wix-90cdebbe94c7f60db86965ffb97d9ba51d0bc9fc.zip

diff --git a/src/api/burn/inc/BootstrapperApplication.h b/src/api/burn/inc/BootstrapperApplicationTypes.h index 8b945b77..c7eaa3d3 100644 --- a/src/api/burn/inc/BootstrapperApplication.h +++ b/src/api/burn/inc/BootstrapperApplicationTypes.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 "BootstrapperEngine.h"	4	#include "BootstrapperEngineTypes.h"
5		5
6	#if defined(__cplusplus)	6	#if defined(__cplusplus)
7	extern "C" {	7	extern "C" {
@@ -1535,57 +1535,6 @@ struct BA_ONUNREGISTERCOMPLETE_RESULTS
1535	DWORD dwApiVersion;	1535	DWORD dwApiVersion;
1536	};	1536	};
1537		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
1589	#if defined(__cplusplus)	1538	#if defined(__cplusplus)
1590	}	1539	}
1591	#endif	1540	#endif


diff --git a/src/api/burn/inc/BootstrapperEngine.h b/src/api/burn/inc/BootstrapperEngineTypes.h index 7af41d97..e2634383 100644 --- a/src/api/burn/inc/BootstrapperEngine.h +++ b/src/api/burn/inc/BootstrapperEngineTypes.h
@@ -448,13 +448,6 @@ typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS
448	DWORD cchValue;	448	DWORD cchValue;
449	} BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS;	449	} BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS;
450		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
458	#if defined(__cplusplus)	451	#if defined(__cplusplus)
459	}	452	}
460	#endif	453	#endif


diff --git a/src/api/burn/inc/BootstrapperExtensionEngine.h b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h index 24c304c6..24c304c6 100644 --- a/src/api/burn/inc/BootstrapperExtensionEngine.h +++ b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h


diff --git a/src/api/burn/inc/BootstrapperExtension.h b/src/api/burn/inc/BootstrapperExtensionTypes.h index b1fa6408..4d45b59d 100644 --- a/src/api/burn/inc/BootstrapperExtension.h +++ b/src/api/burn/inc/BootstrapperExtensionTypes.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 <BootstrapperExtensionEngine.h>	4	#include "BootstrapperExtensionEngineTypes.h"
5		5
6	#if defined(__cplusplus)	6	#if defined(__cplusplus)
7	extern "C" {	7	extern "C" {