win32: improved support for manifests

The UTF-8 manifest has been updated to include features from the
standard application manifest.

Include a copy of the standard application manifest for toolchains
that don't provide one.

(GitHub issue #366)

10 files changed, 89 insertions, 8 deletions

diff --git a/Config.in b/Config.in
index 548eaf20c..5a7eda66a 100644
--- a/Config.in
+++ b/Config.in
@@ -432,15 +432,36 @@ config FEATURE_VERSIONINFO
         help
         Include version information in the application.
 
-config FEATURE_UTF8_MANIFEST
-        bool "Include UTF-8 manifest in binary"
-        default n
+choice
+        prompt "Manifest"
+        default FEATURE_TOOLCHAIN_MANIFEST
         depends on FEATURE_RESOURCES
         help
+          Manifest to include in resources.
+
+config FEATURE_TOOLCHAIN_MANIFEST
+        bool "Toolchain default"
+        help
+        Include the default application manifest provided by the build
+        toolchain, if any.
+
+config FEATURE_APP_MANIFEST
+        bool "Application"
+        help
+        Include a manifest which declares privileges required by the
+        application and supported versions of Windows.  Enable this
+        if your build toolchain doesn't include it by default.
+
+config FEATURE_UTF8_MANIFEST
+        bool "UTF-8"
+        help
         Include a manifest which sets the process code page to UTF-8.
+        This also includes details from the standard application manifest.
         Users who enable this may also wish to enable FEATURE_UTF8_INPUT
         and/or FEATURE_UTF8_OUTPUT.
 
+endchoice
+
 config FEATURE_ICON
         bool "Include application icon in binary"
         default y
diff --git a/configs/make32_defconfig b/configs/make32_defconfig
index 9e127b2f5..0892801d3 100644
--- a/configs/make32_defconfig
+++ b/configs/make32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Aug 10 10:24:35 2023
+# Thu Sep 14 16:00:50 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,6 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 # CONFIG_FEATURE_RESOURCES is not set
 # CONFIG_FEATURE_VERSIONINFO is not set
+CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
+# CONFIG_FEATURE_APP_MANIFEST is not set
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 # CONFIG_FEATURE_ICON is not set
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/make64_defconfig b/configs/make64_defconfig
index 5a126c9b6..8c372ae54 100644
--- a/configs/make64_defconfig
+++ b/configs/make64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Aug 10 10:24:35 2023
+# Thu Sep 14 16:00:50 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,6 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 # CONFIG_FEATURE_RESOURCES is not set
 # CONFIG_FEATURE_VERSIONINFO is not set
+CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
+# CONFIG_FEATURE_APP_MANIFEST is not set
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 # CONFIG_FEATURE_ICON is not set
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 7af208171..9a822e351 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Aug 10 10:20:52 2023
+# Thu Sep 14 16:00:50 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,6 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
+CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
+# CONFIG_FEATURE_APP_MANIFEST is not set
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 92ceee1b9..7a83a096f 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Aug 10 10:20:52 2023
+# Thu Sep 14 16:00:50 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,6 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
+CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
+# CONFIG_FEATURE_APP_MANIFEST is not set
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/mingw64u_defconfig b/configs/mingw64u_defconfig
index 38ddc0111..e9425d45b 100644
--- a/configs/mingw64u_defconfig
+++ b/configs/mingw64u_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Aug 10 10:20:52 2023
+# Thu Sep 14 16:00:50 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,6 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
+# CONFIG_FEATURE_TOOLCHAIN_MANIFEST is not set
+# CONFIG_FEATURE_APP_MANIFEST is not set
 CONFIG_FEATURE_UTF8_MANIFEST=y
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index c4cb9642f..e2d884e98 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -27,3 +27,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
+win32/resources/resources.o: win32/resources/app.manifest
diff --git a/win32/resources/app.manifest b/win32/resources/app.manifest
new file mode 100644
index 000000000..5e76b7b8e
--- /dev/null
+++ b/win32/resources/app.manifest
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below indicates application support for Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--The ID below indicates application support for Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--The ID below indicates application support for Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--The ID below indicates application support for Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--The ID below indicates application support for Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index b7d82d767..e75bec6ea 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -38,3 +38,7 @@ END
 #if ENABLE_FEATURE_UTF8_MANIFEST
 1 MANIFEST "utf8.manifest"
 #endif
+
+#if ENABLE_FEATURE_APP_MANIFEST
+1 MANIFEST "app.manifest"
+#endif
diff --git a/win32/resources/utf8.manifest b/win32/resources/utf8.manifest
index cb9a81e5c..efe6a3d2f 100644
--- a/win32/resources/utf8.manifest
+++ b/win32/resources/utf8.manifest
@@ -6,4 +6,25 @@
       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
     </windowsSettings>
   </application>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below indicates application support for Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--The ID below indicates application support for Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--The ID below indicates application support for Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--The ID below indicates application support for Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--The ID below indicates application support for Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
 </assembly>