Update to latest Core changes plus other minor fixes

3 files changed, 11 insertions, 2 deletions

diff --git a/src/thmviewer/thmviewer.cpp b/src/thmviewer/thmviewer.cpp
index 511272a9..425cdf43 100644
--- a/src/thmviewer/thmviewer.cpp
+++ b/src/thmviewer/thmviewer.cpp
@@ -98,7 +98,7 @@ int WINAPI wWinMain(
         ofn.hwndOwner = hWnd;
         ofn.lpstrFile = wzFile;
         ofn.nMaxFile = countof(wzFile);
-        ofn.lpstrFilter = L"Theme Files\0*.thm\0XML Files\0*.xml\0All Files\0*.*\0";
+        ofn.lpstrFilter = L"Theme Files (*.thm)\0*.thm\0XML Files (*.xml)\0*.xml\0All Files (*.*)\0*.*\0";
         ofn.nFilterIndex = 1;
         ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
         ofn.lpstrTitle = vpTheme->sczCaption;
diff --git a/src/thmviewer/thmviewer.v3.ncrunchproject b/src/thmviewer/thmviewer.v3.ncrunchproject
new file mode 100644
index 00000000..3cffd6ce
--- /dev/null
+++ b/src/thmviewer/thmviewer.v3.ncrunchproject
@@ -0,0 +1,7 @@
+<ProjectConfiguration>
+  <Settings>
+    <AdditionalFilesToIncludeForProject>
+      <Value>thmviewer.manifest</Value>
+    </AdditionalFilesToIncludeForProject>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/thmviewer/thmviewer.vcxproj.filters b/src/thmviewer/thmviewer.vcxproj.filters
index 79e08275..9a1eff3f 100644
--- a/src/thmviewer/thmviewer.vcxproj.filters
+++ b/src/thmviewer/thmviewer.vcxproj.filters
@@ -24,9 +24,11 @@
     <ClCompile Include="load.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="thmviewer.build" />
     <None Include="Resources\thm.xml">
       <Filter>Resource Files</Filter>
     </None>