From 453bec104676c7dd808a20eaf30db9c918bed1e7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 24 Jun 2020 09:20:15 +1000
Subject: Update to latest dutil.

---
 src/engine/engine.vcxproj       |  4 ++--
 src/engine/packages.config      |  2 +-
 src/engine/precomp.h            |  6 ++++--
 src/engine/registration.cpp     |  2 +-
 src/stub/WixToolset.Burn.nuspec |  3 +--
 src/stub/packages.config        |  2 +-
 src/stub/precomp.h              |  1 +
 src/stub/stub.cpp               | 30 ++++++++++++++++++++++++++++++
 src/stub/stub.vcxproj           |  8 ++++----
 9 files changed, 45 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
index 80b67b7d..2fe68c2a 100644
--- a/src/engine/engine.vcxproj
+++ b/src/engine/engine.vcxproj
@@ -3,7 +3,7 @@
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -167,7 +167,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
       <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.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/src/engine/packages.config b/src/engine/packages.config
index 251df9d0..52ccddb4 100644
--- a/src/engine/packages.config
+++ b/src/engine/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
   <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/engine/precomp.h b/src/engine/precomp.h
index 7aa7dafa..04dfa50e 100644
--- a/src/engine/precomp.h
+++ b/src/engine/precomp.h
@@ -2,8 +2,6 @@
 // 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.
 
 
-#define ExitTrace LogErrorString
-
 #include <windows.h>
 #include <aclapi.h>
 #include <Bits.h>
@@ -26,6 +24,10 @@
 #include <wininet.h>
 #include <stddef.h>
 
+#include <dutilsources.h>
+
+#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL
+
 #include <dutil.h>
 #include <aclutil.h>
 #include <apputil.h>
diff --git a/src/engine/registration.cpp b/src/engine/registration.cpp
index 93c990f5..bbde92b3 100644
--- a/src/engine/registration.cpp
+++ b/src/engine/registration.cpp
@@ -893,7 +893,7 @@ extern "C" HRESULT RegistrationSessionEnd(
 
         if (FAILED(hr))
         {
-            ExitTrace(hr, "Failed to write volatile reboot required registry key.");
+            ExitTraceSource(DUTIL_SOURCE_DEFAULT, hr, "Failed to write volatile reboot required registry key.");
             hr = S_OK;
         }
     }
diff --git a/src/stub/WixToolset.Burn.nuspec b/src/stub/WixToolset.Burn.nuspec
index e71f64e4..35392523 100644
--- a/src/stub/WixToolset.Burn.nuspec
+++ b/src/stub/WixToolset.Burn.nuspec
@@ -5,8 +5,7 @@
     <version>$version$</version>
     <authors>$authors$</authors>
     <owners>$authors$</owners>
-    <!-- <license type="expression">MS-RL</license> -->
-    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
+    <license type="expression">MS-RL</license>
     <projectUrl>https://github.com/wixtoolset/burn</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
diff --git a/src/stub/packages.config b/src/stub/packages.config
index e8115bfa..38ce9597 100644
--- a/src/stub/packages.config
+++ b/src/stub/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/stub/precomp.h b/src/stub/precomp.h
index 387d4f0f..c8301a0f 100644
--- a/src/stub/precomp.h
+++ b/src/stub/precomp.h
@@ -9,5 +9,6 @@
 #include <strutil.h>
 #include <fileutil.h>
 #include <pathutil.h>
+#include <logutil.h>
 
 #include "engine.h"
diff --git a/src/stub/stub.cpp b/src/stub/stub.cpp
index 2f09eede..d3ace1f3 100644
--- a/src/stub/stub.cpp
+++ b/src/stub/stub.cpp
@@ -3,6 +3,16 @@
 #include "precomp.h"
 
 
+static void CALLBACK BurnTraceError(
+    __in_z LPCSTR szFile,
+    __in int iLine,
+    __in REPORT_LEVEL rl,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
+
 int WINAPI wWinMain(
     __in HINSTANCE hInstance,
     __in_opt HINSTANCE /* hPrevInstance */,
@@ -30,6 +40,8 @@ int WINAPI wWinMain(
         L"feclient.dll", // unsafely loaded by DecryptFile().
     };
 
+    DutilInitialize(&BurnTraceError);
+
     // Best effort attempt to get our file handle as soon as possible.
     hr = PathForCurrentProcess(&sczPath, NULL);
     if (SUCCEEDED(hr))
@@ -60,5 +72,23 @@ LExit:
     ReleaseFileHandle(hEngineFile);
     ReleaseStr(sczPath);
 
+    DutilUninitialize();
+
     return FAILED(hr) ? (int)hr : (int)dwExitCode;
 }
+
+static void CALLBACK BurnTraceError(
+    __in_z LPCSTR /*szFile*/,
+    __in int /*iLine*/,
+    __in REPORT_LEVEL /*rl*/,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    if (DUTIL_SOURCE_DEFAULT == source)
+    {
+        LogErrorStringArgs(hrError, szFormat, args);
+    }
+}
diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj
index ce43e0e6..a3db2044 100644
--- a/src/stub/stub.vcxproj
+++ b/src/stub/stub.vcxproj
@@ -2,7 +2,7 @@
 <!-- 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.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -28,7 +28,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <ProjectSubSystem>Windows</ProjectSubSystem>
     <TargetName>burn</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <Description>Native component of WixToolset.Burn</Description>
   </PropertyGroup>
@@ -85,7 +85,7 @@
   </ItemGroup>
 
   <Target Name="Pack" DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack WixToolset.Burn.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=WixToolset.Burn;Version="$(BuildVersionSimple)";ProjectFolder=$(MSBuildThisFileDirectory);Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
+    <Exec Command='nuget pack WixToolset.Burn.nuspec -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -NoPackageAnalysis -Properties Configuration=$(Configuration);Id=WixToolset.Burn;Version="$(BuildVersionSimple)";ProjectFolder=$(MSBuildThisFileDirectory);Platform=$(PlatformTarget);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' />
   </Target>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -94,6 +94,6 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
   </Target>
 </Project>
-- 
cgit v1.2.3-55-g6feb