Integrate OnUnregisterBegin changes in Burn headers.

6 files changed, 14 insertions, 12 deletions

diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 578586e8..1c9a2372 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -2,8 +2,8 @@
 <!-- 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. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
@@ -98,8 +98,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/src/balutil/inc/BalBaseBAFunctions.h b/src/balutil/inc/BalBaseBAFunctions.h
index 7699b8ff..55ed8cbe 100644
--- a/src/balutil/inc/BalBaseBAFunctions.h
+++ b/src/balutil/inc/BalBaseBAFunctions.h
@@ -548,7 +548,8 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnUnregisterBegin(
-        __inout BOOL* /*pfCancel*/
+        __in BOOL /*fKeepRegistration*/,
+        __inout BOOL* /*pfForceKeepRegistration*/
         )
     {
         return S_OK;
diff --git a/src/balutil/inc/BalBaseBootstrapperApplication.h b/src/balutil/inc/BalBaseBootstrapperApplication.h
index 59e57de1..ff1d07fd 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplication.h
@@ -719,10 +719,10 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnUnregisterBegin(
-        __inout BOOL* pfCancel
+        __in BOOL /*fKeepRegistration*/,
+        __inout BOOL* /*pfForceKeepRegistration*/
         )
     {
-        *pfCancel |= CheckCanceled();
         return S_OK;
     }
 
diff --git a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
index 6ce8710d..d971a2eb 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -443,11 +443,11 @@ static HRESULT BalBaseBAProcOnExecuteComplete(
 
 static HRESULT BalBaseBAProcOnUnregisterBegin(
     __in IBootstrapperApplication* pBA,
-    __in BA_ONUNREGISTERBEGIN_ARGS* /*pArgs*/,
+    __in BA_ONUNREGISTERBEGIN_ARGS* pArgs,
     __inout BA_ONUNREGISTERBEGIN_RESULTS* pResults
     )
 {
-    return pBA->OnUnregisterBegin(&pResults->fCancel);
+    return pBA->OnUnregisterBegin(pArgs->fKeepRegistration, &pResults->fForceKeepRegistration);
 }
 
 static HRESULT BalBaseBAProcOnUnregisterComplete(
diff --git a/src/balutil/inc/IBootstrapperApplication.h b/src/balutil/inc/IBootstrapperApplication.h
index 7d710b26..01d0bb8a 100644
--- a/src/balutil/inc/IBootstrapperApplication.h
+++ b/src/balutil/inc/IBootstrapperApplication.h
@@ -465,7 +465,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     // OnUnregisterBegin - called when the engine unregisters the bundle.
     //
     STDMETHOD(OnUnregisterBegin)(
-        __inout BOOL* pfCancel
+        __in BOOL fKeepRegistration,
+        __inout BOOL* pfForceKeepRegistration
         ) = 0;
 
     // OnUnregisterComplete - called when the engine unregistration is complete.
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 68970a7e..1ac5d2ac 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
 </packages>
\ No newline at end of file