From 830e2cfae63a20beddd81d9db00dc906265a0e34 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Tue, 20 Jun 2023 15:33:10 +0100
Subject: win32: include UTF-8 manifest

Include a manifest in the binary to set the process code page to
UTF-8.  This only has an effect from Windows 10 version 1903.

Controlled by the FEATURE_UTF8_MANIFEST config setting, disabled
by default.
---
 .gitignore                    | 1 -
 Config.in                     | 7 +++++++
 win32/resources/Kbuild.src    | 1 +
 win32/resources/resources.rc  | 4 ++++
 win32/resources/utf8.manifest | 9 +++++++++
 5 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 win32/resources/utf8.manifest

diff --git a/.gitignore b/.gitignore
index 764cc058a..a4031f6ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ Config.in
 /busybox_old
 /busybox_old.exe
 /busybox_unstripped*
-win32/resources/busybox-w32.manifest
 
 #
 # Backups / patches
diff --git a/Config.in b/Config.in
index 2da0a6aec..917712c0c 100644
--- a/Config.in
+++ b/Config.in
@@ -432,6 +432,13 @@ config FEATURE_VERSIONINFO
 	help
 	Include version information in the application.
 
+config FEATURE_UTF8_MANIFEST
+	bool "Include UTF-8 manifest in binary"
+	default n
+	depends on FEATURE_RESOURCES
+	help
+	Include a manifest which sets the process code page to UTF-8.
+
 config FEATURE_ICON
 	bool "Include application icon in binary"
 	default y
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index 9e5fe4e10..c4cb9642f 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -26,3 +26,4 @@ quiet_cmd_windres = WINDRES $@
 
 win32/resources/resources.o: win32/resources/resources.rc .config
 win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico
+win32/resources/resources.o: win32/resources/utf8.manifest
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index f459ebb73..b7d82d767 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -34,3 +34,7 @@ BEGIN
   END
 END
 #endif
+
+#if ENABLE_FEATURE_UTF8_MANIFEST
+1 MANIFEST "utf8.manifest"
+#endif
diff --git a/win32/resources/utf8.manifest b/win32/resources/utf8.manifest
new file mode 100644
index 000000000..cb9a81e5c
--- /dev/null
+++ b/win32/resources/utf8.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity type="win32" name="busybox.exe" version="6.0.0.0"/>
+    <application>
+    <windowsSettings>
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+    </windowsSettings>
+  </application>
+</assembly>
-- 
cgit v1.2.3-55-g6feb