Move infinite loop detection into the hosts.

Tell the BA during Destroy whether it will be reloaded, and let the BA decide then whether it's module should be unloaded.
Show error when infinite prereq loop detected.
Only clip the exit code if they're Win32 errors.
Set related bundle type to none to avoid downgrades during preqba.

1 files changed, 16 insertions, 2 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index 228cb6ff..ea3be214 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -1494,7 +1494,22 @@ extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_PROC)(
     __in_opt LPVOID pvContext
     );
 
-extern "C" typedef void (WINAPI *PFN_BOOTSTRAPPER_APPLICATION_DESTROY)();
+struct BOOTSTRAPPER_DESTROY_ARGS
+{
+    DWORD cbSize;
+    BOOL fReload;
+};
+
+struct BOOTSTRAPPER_DESTROY_RESULTS
+{
+    DWORD cbSize;
+    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
+    );
 
 
 
@@ -1512,7 +1527,6 @@ struct BOOTSTRAPPER_CREATE_RESULTS
     DWORD cbSize;
     PFN_BOOTSTRAPPER_APPLICATION_PROC pfnBootstrapperApplicationProc;
     LPVOID pvBootstrapperApplicationProcContext;
-    BOOL fDisableUnloading; // indicates the BA dll must not be unloaded after BootstrapperApplicationDestroy.
 };
 
 extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_CREATE)(