From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 13 Oct 2021 04:17:44 +0000 (+0800)
Subject: tools/generate-uac-manifest.py: Fix UAC manifest .rc
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0028267228dbaa5be76415e6847ada6db81d1792;p=gtk4.git

tools/generate-uac-manifest.py: Fix UAC manifest .rc

The resource compiler in the Windows 11 SDK does not allow one to include
winuser.h directly in resource scripts (.rc) with a rather cryptic error
message, so fix generating the .rc file to embed the UAC manifest by including
windows.h with WIN32_LEAN_AND_MEAN instead.
---

diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py
index ede6ba5044..62f063a8bb 100644
--- a/tools/generate-uac-manifest.py
+++ b/tools/generate-uac-manifest.py
@@ -24,7 +24,7 @@ def main():
                         help='require admin access to application')
     parser.add_argument('--input-resource-file', dest='resource',
                         default=None,
-                        help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it')
+                        help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it')
     parser.add_argument('--output-dir', dest='outdir',
                         default=None,
                         help='directory to output resulting files')
@@ -92,7 +92,8 @@ def write_rc_file(name, resource, outdir):
 
     if resource is None:
         outfile = open(output_file_base_name + '.rc', 'w+')
-        outfile.write('#include <winuser.h>')
+        outfile.write('#define WIN32_LEAN_AND_MEAN\n')
+        outfile.write('#include <windows.h>\n')
     else:
         if resource != output_file_base_name + '.rc':
             outfile = open(output_file_base_name + '.rc', 'w+')