Add Windows manifest files to the executables to activate utf-8, long path and SegmentHeap

For backwards compatibility Windows will only activate new OS functionality by an opt-in mechanism (this to prevent breaking legacy apps). Activate the following: - Support for long path names (requires Windows 10 1607 or newer), File names longer then 260 characters are now supported. - The UTF-8 code page (requires Windows 10 1903 or newer). Unicode file names can be passed on the command line and opened. Calls to Win32 API functions with xxxA accept UTF-8 strings. - Usage of the new memory heap (requires Windows 10 2004 or newer)
2025-03-28 21:03:13 +00:00 · 2020-09-30 23:55:17 +02:00 · 2020-09-30 23:55:17 +02:00 · d79494c65a
commit d79494c65a
parent f933dc5033
14 changed files with 100 additions and 5 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -16,6 +16,9 @@ insert_final_newline = true
 [CMakeLists.txt]
 indent_size = 2

+[*.manifest]
+indent_size = 2
+
 [*.cs]
 indent_size = 4

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,7 +1,7 @@
 # Copyright (c) Team CharLS.
 # SPDX-License-Identifier: BSD-3-Clause

-cmake_minimum_required(VERSION 3.9...3.16)
+cmake_minimum_required(VERSION 3.9...3.18)

 # Extract the version info from version.h
 file(READ "include/charls/version.h" version)
--- a/samples/convert.c/CMakeLists.txt
+++ b/samples/convert.c/CMakeLists.txt
@ -8,6 +8,11 @@ target_sources(convert-c
    main.c
 )

+if(WIN32)
+  # Only add the manifest file when building a Windows app
+  target_sources(convert-c PRIVATE app.manifest)
+endif()
+
 target_link_libraries(convert-c PRIVATE charls)

 if(MSVC)
--- a/samples/convert.c/app.manifest
+++ b/samples/convert.c/app.manifest
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  <application>
+    <windowsSettings>
+      <!-- Activate support for long path names (requires Windows 10 1607 or newer) -->
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true"</longPathAware>
+
+      <!-- Activate the UTF-8 code page (requires Windows 10 1903 or newer) -->
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+
+      <!-- Activate the new memory heap (requires Windows 10 2004 or newer) -->
+      <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
+    </windowsSettings>
+  </application>
+</assembly>
--- a/samples/convert.c/convert-c.vcxproj
+++ b/samples/convert.c/convert-c.vcxproj
@ -191,6 +191,9 @@
      <Project>{1e31f9f1-f175-4082-b3e2-b1f0eca3f44c}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/samples/convert.c/convert-c.vcxproj.filters
+++ b/samples/convert.c/convert-c.vcxproj.filters
@ -11,4 +11,7 @@
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
 </Project>
--- a/samples/convert.cpp/CMakeLists.txt
+++ b/samples/convert.cpp/CMakeLists.txt
@ -10,6 +10,11 @@ target_sources(convert-cpp
    main.cpp
 )

+if(WIN32)
+  # Only add the manifest file when building a Windows app
+  target_sources(convert-cpp PRIVATE app.manifest)
+endif()
+
 set_target_properties(convert-cpp PROPERTIES CXX_VISIBILITY_PRESET hidden)

 target_link_libraries(convert-cpp PRIVATE charls)
--- a/samples/convert.cpp/app.manifest
+++ b/samples/convert.cpp/app.manifest
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  <application>
+    <windowsSettings>
+      <!-- Activate support for long path names (requires Windows 10 1607 or newer) -->
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true"</longPathAware>
+
+      <!-- Activate the UTF-8 code page (requires Windows 10 1903 or newer) -->
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+
+      <!-- Activate the new memory heap (requires Windows 10 2004 or newer) -->
+      <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
+    </windowsSettings>
+  </application>
+</assembly>
--- a/samples/convert.cpp/convert-cpp.vcxproj
+++ b/samples/convert.cpp/convert-cpp.vcxproj
@ -210,6 +210,9 @@
      <Project>{1e31f9f1-f175-4082-b3e2-b1f0eca3f44c}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/samples/convert.cpp/convert-cpp.vcxproj.filters
+++ b/samples/convert.cpp/convert-cpp.vcxproj.filters
@ -9,10 +9,6 @@
      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h">
@ -30,4 +26,7 @@
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
 </Project>
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -20,6 +20,11 @@ target_sources(charlstest
    legacy.h
 )

+if(WIN32)
+  # Only add the manifest file when building a Windows app
+  target_sources(charlstest PRIVATE app.manifest)
+endif()
+
 set_target_properties(charlstest PROPERTIES CXX_VISIBILITY_PRESET hidden)

 target_link_libraries(charlstest PRIVATE charls)
--- a/test/CharLSTest.vcxproj
+++ b/test/CharLSTest.vcxproj
@ -436,5 +436,8 @@
      <Project>{1e31f9f1-f175-4082-b3e2-b1f0eca3f44c}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/test/CharLSTest.vcxproj.filters
+++ b/test/CharLSTest.vcxproj.filters
@ -130,4 +130,7 @@
      <Filter>Data Files</Filter>
    </CopyFileToFolders>
  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
 </Project>
--- a/test/app.manifest
+++ b/test/app.manifest
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  <application>
+    <windowsSettings>
+      <!-- Activate support for long path names (requires Windows 10 1607 or newer) -->
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true"</longPathAware>
+
+      <!-- Activate the UTF-8 code page (requires Windows 10 1903 or newer) -->
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+
+      <!-- Activate the new memory heap (requires Windows 10 2004 or newer) -->
+      <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
+    </windowsSettings>
+  </application>
+</assembly>