Move the BootstrapperApplication out of proc

2 files changed, 6 insertions, 5 deletions

diff --git a/src/tools/thmviewer/thmviewer.cpp b/src/tools/thmviewer/thmviewer.cpp
index 4230dd35..5d4b88f5 100644
--- a/src/tools/thmviewer/thmviewer.cpp
+++ b/src/tools/thmviewer/thmviewer.cpp
@@ -109,10 +109,10 @@ int WINAPI wWinMain(
     ExitOnFailure(hr, "Failed to create theme.");
 
     hr = CreateMainWindowClass(hInstance, vpTheme, &atom);
-    ExitOnFailure(hr, "Failed to create main window.");
+    ExitOnFailure(hr, "Failed to create thmviewer main window.");
 
     hr = ThemeCreateParentWindow(vpTheme, 0, reinterpret_cast<LPCWSTR>(atom), vpTheme->sczCaption, vpTheme->dwStyle, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, hInstance, NULL, THEME_WINDOW_INITIAL_POSITION_DEFAULT, &hWnd);
-    ExitOnFailure(hr, "Failed to create window.");
+    ExitOnFailure(hr, "Failed to create thmviewer parent window.");
 
     if (!sczThemeFile)
     {
diff --git a/src/tools/thmviewer/thmviewer.manifest b/src/tools/thmviewer/thmviewer.manifest
index 4663b61c..bdf6a993 100644
--- a/src/tools/thmviewer/thmviewer.manifest
+++ b/src/tools/thmviewer/thmviewer.manifest
@@ -3,16 +3,17 @@
 
 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity name="thmviewer.exe" version="1.0.0.0" processorArchitecture="x86" type="win32"/>
+ <assemblyIdentity name="thmviewer.exe" version="5.0.0.0" type="win32"/>
  <description>WiX Toolset Theme Viewer</description>
- <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency>
+ <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/></application></compatibility>
  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-   <windowsSettings xmlns="urn:schemas-microsoft-com:asm.v3">
+   <windowsSettings>
      <!-- pre-Win10 1607 -->
      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
      <!-- Win10 picks the first one it recognizes -->
      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor, System</dpiAwareness>
+     <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
    </windowsSettings>
  </application>
  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>