From 961147151f6b749a2028e5f55e3d266c4682240b Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Thu, 13 Sep 2018 08:40:29 -0700
Subject: [PATCH] fix: re-enable high-dpi support on windows (#14596)

fixes #14568
---
 BUILD.gn                                      |  2 +
 atom/browser/resources/win/atom.manifest      | 40 -------------------
 .../win/disable_window_filtering.manifest     |  9 +++++
 atom/browser/resources/win/dpi_aware.manifest |  9 +++++
 4 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 atom/browser/resources/win/atom.manifest
 create mode 100644 atom/browser/resources/win/disable_window_filtering.manifest
 create mode 100644 atom/browser/resources/win/dpi_aware.manifest

diff --git a/BUILD.gn b/BUILD.gn
index 6d2bb03c70f1..13b17e1580a1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -669,6 +669,8 @@ if (is_mac) {
       as_invoker_manifest,
       common_controls_manifest,
       default_compatibility_manifest,
+      "atom/browser/resources/win/dpi_aware.manifest",
+      "atom/browser/resources/win/disable_window_filtering.manifest",
     ]
   }
 
diff --git a/atom/browser/resources/win/atom.manifest b/atom/browser/resources/win/atom.manifest
deleted file mode 100644
index 7608ffb20f6c..000000000000
--- a/atom/browser/resources/win/atom.manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-      <!-- Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-    </application>
-  </compatibility>
-
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true/pm</dpiAware>
-      <disableWindowFiltering xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-
-</assembly>
diff --git a/atom/browser/resources/win/disable_window_filtering.manifest b/atom/browser/resources/win/disable_window_filtering.manifest
new file mode 100644
index 000000000000..e7cf392f60f8
--- /dev/null
+++ b/atom/browser/resources/win/disable_window_filtering.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <!-- See: https://docs.microsoft.com/en-us/windows/desktop/sbscs/application-manifests#disableWindowFiltering -->
+      <disableWindowFiltering xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/atom/browser/resources/win/dpi_aware.manifest b/atom/browser/resources/win/dpi_aware.manifest
new file mode 100644
index 000000000000..3fc15a1a28e5
--- /dev/null
+++ b/atom/browser/resources/win/dpi_aware.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <!-- See: https://docs.microsoft.com/en-us/windows/desktop/sbscs/application-manifests#dpiAware -->
+      <dpiAware>true/pm</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>