5 files changed, 93 insertions, 12 deletions

diff --git a/src/thmviewer/load.cpp b/src/thmviewer/load.cpp
index cd48caff..0267402a 100644
--- a/src/thmviewer/load.cpp
+++ b/src/thmviewer/load.cpp
@@ -106,6 +106,8 @@ static DWORD WINAPI LoadThreadProc(
         FILETIME ftModified = { };
         FileGetTime(sczThemePath, NULL, NULL, &ftModified);
 
+        ::SendMessageW(hWnd, WM_THMVWR_THEME_LOAD_BEGIN, 0, 0);
+
         // Try to load the theme file.
         hr = ThemeLoadFromFile(sczThemePath, &pTheme);
         if (FAILED(hr))
diff --git a/src/thmviewer/packages.config b/src/thmviewer/packages.config
index 05bd6cc6..38ce9597 100644
--- a/src/thmviewer/packages.config
+++ b/src/thmviewer/packages.config
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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.6" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/thmviewer/precomp.h b/src/thmviewer/precomp.h
index 1d186cf4..15d889fc 100644
--- a/src/thmviewer/precomp.h
+++ b/src/thmviewer/precomp.h
@@ -42,6 +42,7 @@ enum WM_THMVWR
     WM_THMVWR_PARSE_FILE,
     WM_THMVWR_NEW_THEME,
     WM_THMVWR_THEME_LOAD_ERROR,
+    WM_THMVWR_THEME_LOAD_BEGIN,
 };
 
 extern "C" HRESULT DisplayStart(
diff --git a/src/thmviewer/thmviewer.cpp b/src/thmviewer/thmviewer.cpp
index 425cdf43..adad3f50 100644
--- a/src/thmviewer/thmviewer.cpp
+++ b/src/thmviewer/thmviewer.cpp
@@ -6,6 +6,7 @@ static const LPCWSTR THMVWR_WINDOW_CLASS_MAIN = L"ThmViewerMain";
 
 static THEME* vpTheme = NULL;
 static DWORD vdwDisplayThreadId = 0;
+static LPWSTR vsczThemeLoadErrors = NULL;
 
 enum THMVWR_CONTROL
 {
@@ -39,6 +40,9 @@ static LRESULT CALLBACK MainWndProc(
     __in WPARAM wParam,
     __in LPARAM lParam
     );
+static void OnThemeLoadBegin(
+    __in_z_opt LPWSTR sczThemeLoadErrors
+    );
 static void OnThemeLoadError(
     __in THEME* pTheme,
     __in HRESULT hrFailure
@@ -48,6 +52,15 @@ static void OnNewTheme(
     __in HWND hWnd,
     __in HANDLE_THEME* pHandle
     );
+static void CALLBACK ThmviewerTraceError(
+    __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(
@@ -76,6 +89,8 @@ int WINAPI wWinMain(
     ExitOnFailure(hr, "Failed to initialize COM.");
     fComInitialized = TRUE;
 
+    DutilInitialize(&ThmviewerTraceError);
+
     hr = ProcessCommandLine(lpCmdLine, &sczThemeFile, &sczWxlFile);
     ExitOnFailure(hr, "Failed to process command line.");
 
@@ -161,6 +176,7 @@ LExit:
 
     ThemeFree(vpTheme);
     ThemeUninitialize();
+    DutilUninitialize();
 
     // uninitialize COM
     if (fComInitialized)
@@ -168,11 +184,45 @@ LExit:
         ::CoUninitialize();
     }
 
+    ReleaseNullStr(vsczThemeLoadErrors);
     ReleaseStr(sczThemeFile);
     ReleaseStr(sczWxlFile);
     return hr;
 }
 
+static void CALLBACK ThmviewerTraceError(
+    __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
+    )
+{
+    HRESULT hr = S_OK;
+    LPSTR sczFormattedAnsi = NULL;
+    LPWSTR sczMessage = NULL;
+
+    if (DUTIL_SOURCE_THMUTIL != source)
+    {
+        ExitFunction();
+    }
+
+    hr = StrAnsiAllocFormattedArgs(&sczFormattedAnsi, szFormat, args);
+    ExitOnFailure(hr, "Failed to format error log string.");
+
+    hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x: %S\r\n", hrError, sczFormattedAnsi);
+    ExitOnFailure(hr, "Failed to prepend error number to error log string.");
+
+    hr = StrAllocConcat(&vsczThemeLoadErrors, sczMessage, 0);
+    ExitOnFailure(hr, "Failed to append theme load error.");
+
+LExit:
+    ReleaseStr(sczFormattedAnsi);
+    ReleaseStr(sczMessage);
+}
+
 
 //
 // ProcessCommandLine - process the provided command line arguments.
@@ -311,6 +361,10 @@ static LRESULT CALLBACK MainWndProc(
         }
         break;
 
+    case WM_THMVWR_THEME_LOAD_BEGIN:
+        OnThemeLoadBegin(vsczThemeLoadErrors);
+        return 0;
+
     case WM_THMVWR_THEME_LOAD_ERROR:
         OnThemeLoadError(vpTheme, lParam);
         return 0;
@@ -351,6 +405,13 @@ static LRESULT CALLBACK MainWndProc(
     return ThemeDefWindowProc(vpTheme, hWnd, uMsg, wParam, lParam);
 }
 
+static void OnThemeLoadBegin(
+    __in_z_opt LPWSTR sczThemeLoadErrors
+    )
+{
+    ReleaseNullStr(sczThemeLoadErrors);
+}
+
 static void OnThemeLoadError(
     __in THEME* pTheme,
     __in HRESULT hrFailure
@@ -358,6 +419,8 @@ static void OnThemeLoadError(
 {
     HRESULT hr = S_OK;
     LPWSTR sczMessage = NULL;
+    LPWSTR* psczErrors = NULL;
+    UINT cErrors = 0;
     TVINSERTSTRUCTW tvi = { };
 
     // Add the application node.
@@ -368,22 +431,37 @@ static void OnThemeLoadError(
     tvi.item.pszText = L"Failed to load theme.";
     tvi.hParent = reinterpret_cast<HTREEITEM>(ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi)));
 
-    hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x.", hrFailure);
-    ExitOnFailure(hr, "Failed to format error message.");
+    if (!vsczThemeLoadErrors)
+    {
+        hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x.", hrFailure);
+        ExitOnFailure(hr, "Failed to format error message.");
+
+        tvi.item.pszText = sczMessage;
+        ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
 
-    tvi.item.pszText = sczMessage;
-    ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+        hr = StrAllocFromError(&sczMessage, hrFailure, NULL);
+        ExitOnFailure(hr, "Failed to format error message text.");
 
-    hr = StrAllocFromError(&sczMessage, hrFailure, NULL);
-    ExitOnFailure(hr, "Failed to format error message text.");
+        tvi.item.pszText = sczMessage;
+        ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+    }
+    else
+    {
+        hr = StrSplitAllocArray(&psczErrors, &cErrors, vsczThemeLoadErrors, L"\r\n");
+        ExitOnFailure(hr, "Failed to split theme load errors.");
 
-    tvi.item.pszText = sczMessage;
-    ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+        for (DWORD i = 0; i < cErrors; ++i)
+        {
+            tvi.item.pszText = psczErrors[i];
+            ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+        }
+    }
 
     ThemeSendControlMessage(pTheme, THMVWR_CONTROL_TREE, TVM_EXPAND, TVE_EXPAND, reinterpret_cast<LPARAM>(tvi.hParent));
 
 LExit:
     ReleaseStr(sczMessage);
+    ReleaseMem(psczErrors);
 }
 
 
diff --git a/src/thmviewer/thmviewer.vcxproj b/src/thmviewer/thmviewer.vcxproj
index ea589b4c..47b72f78 100644
--- a/src/thmviewer/thmviewer.vcxproj
+++ b/src/thmviewer/thmviewer.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.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\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">
@@ -70,6 +70,6 @@
       <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\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.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\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>