[GEN][ZH] Add Windows application manifest to tell Windows that the App is DPI aware (TheSuperHackers#595)

valeronm · web-flow · commit 5121f07be58f · 2025-06-01T10:21:52.000+02:00
diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
@@ -69,6 +69,13 @@ target_sources(g_generals PRIVATE
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    # VS2005 and later adds default manifest, we need to turn it off to prevent conflict with custom manifest
+    if(NOT IS_VS6_BUILD)
+        target_link_options(g_generals PRIVATE
+            "/MANIFEST:NO"
+        )
+    endif()
+
     target_sources(g_generals PRIVATE
         RTS.RC
     )
diff --git a/Generals/Code/Main/RTS.RC b/Generals/Code/Main/RTS.RC
@@ -65,6 +65,8 @@ IDB_LOAD_SCREEN         BITMAP  DISCARDABLE     "Install_Final.bmp"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+// Add manifest to specify that the app is DPI aware and prevent forced scaling by the system
+1 24 "app.manifest"
 
 
 #ifndef APSTUDIO_INVOKED
diff --git a/Generals/Code/Main/app.manifest b/Generals/Code/Main/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -59,6 +59,13 @@ target_sources(z_generals PRIVATE
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    # VS2005 and later adds default manifest, we need to turn it off to prevent conflict with custom manifest
+    if(NOT IS_VS6_BUILD)
+        target_link_options(z_generals PRIVATE
+            "/MANIFEST:NO"
+        )
+    endif()
+
     target_sources(z_generals PRIVATE
         RTS.RC
     )
diff --git a/GeneralsMD/Code/Main/RTS.RC b/GeneralsMD/Code/Main/RTS.RC
@@ -58,6 +58,8 @@ IDI_ApplicationIcon     ICON    DISCARDABLE     "GENERALS.ICO"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+// Add manifest to specify that the app is DPI aware and prevent forced scaling by the system
+1 24 "app.manifest"
 
 
 #ifndef APSTUDIO_INVOKED
diff --git a/GeneralsMD/Code/Main/app.manifest b/GeneralsMD/Code/Main/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,13 @@ target_sources(g_generals PRIVATE`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")`
	`72`	`+ # VS2005 and later adds default manifest, we need to turn it off to prevent conflict with custom manifest`
	`73`	`+ if(NOT IS_VS6_BUILD)`
	`74`	`+ target_link_options(g_generals PRIVATE`
	`75`	`+ "/MANIFEST:NO"`
	`76`	`+ )`
	`77`	`+ endif()`
	`78`	`+`
`72`	`79`	`target_sources(g_generals PRIVATE`
`73`	`80`	`RTS.RC`
`74`	`81`	`)`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,13 @@ target_sources(z_generals PRIVATE`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")`
	`62`	`+ # VS2005 and later adds default manifest, we need to turn it off to prevent conflict with custom manifest`
	`63`	`+ if(NOT IS_VS6_BUILD)`
	`64`	`+ target_link_options(z_generals PRIVATE`
	`65`	`+ "/MANIFEST:NO"`
	`66`	`+ )`
	`67`	`+ endif()`
	`68`	`+`
`62`	`69`	`target_sources(z_generals PRIVATE`
`63`	`70`	`RTS.RC`
`64`	`71`	`)`