Windows: UTF-8 harder.

Set the process code page in wireshark.exe.manifest to UTF-8 as
described at

https://docs.microsoft.com/en-us/windows/apps/design/globalizing/use-utf8-code-page

Make sure each of our command line resource files includes our main
manifest. Rename wiretap.rc to libwiretap.rc to match our other libraries.
This commit is contained in:
Gerald Combs 2021-12-31 10:15:28 -08:00 committed by Wireshark GitLab Utility
parent 67f05835ca
commit 4e417b8e7c
5 changed files with 17 additions and 5 deletions

View File

@ -1698,12 +1698,12 @@ set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CFG_OUT_FILES
doxygen.cfg
image/libwireshark.rc
image/wireshark.rc
image/dumpcap.rc
image/libwireshark.rc
image/libwiretap.rc
image/libwsutil.rc
image/wiretap.rc
image/wireshark.exe.manifest
image/wireshark.rc
packaging/macosx/Info.plist
packaging/macosx/dmgbuild-settings.py
packaging/macosx/osx-app.sh

View File

@ -35,3 +35,8 @@ BEGIN
VALUE "Translation", 0x409, 1200
END
END
#define MANIFEST_RESOURCE_ID 1
#define RT_MANIFEST 24
MANIFEST_RESOURCE_ID RT_MANIFEST "wireshark.exe.manifest"

View File

@ -42,9 +42,16 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<!-- Windows 10 & 11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
<!-- Set our process code page to UTF-8
https://docs.microsoft.com/en-us/windows/apps/design/globalizing/use-utf8-code-page
https://nullprogram.com/blog/2021/12/30/
-->
<windowsSettings>
<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
</windowsSettings>
</compatibility>
<!--
MSDN recommends setting our DPI awareness to PerMonitorV2 instead

View File

@ -164,7 +164,7 @@ set_source_files_properties(
add_library(wiretap
${WIRETAP_FILES}
${CMAKE_BINARY_DIR}/image/wiretap.rc
${CMAKE_BINARY_DIR}/image/libwiretap.rc
)
set_target_properties(wiretap PROPERTIES