From d48f6801f0a8ef79845a5b7025f2257f7e7e1900 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Mon, 3 Oct 2016 13:44:21 +0100
Subject: [PATCH 1/2] Disable DPI scaling on core binaries

---
 res/dpiaware.manifest           | 8 ++++++++
 src/cmd/synergyc/CMakeLists.txt | 9 +++++++++
 src/cmd/synergyd/CMakeLists.txt | 9 +++++++++
 src/cmd/synergys/CMakeLists.txt | 9 +++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 res/dpiaware.manifest

diff --git a/res/dpiaware.manifest b/res/dpiaware.manifest
new file mode 100644
index 00000000..5de107ba
--- /dev/null
+++ b/res/dpiaware.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+	<asmv3:application>
+		<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+			<dpiAware>true</dpiAware>
+		</asmv3:windowsSettings>
+	</asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index 11d428d4..922ee324 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -60,6 +60,15 @@ add_executable(synergyc ${sources})
 target_link_libraries(synergyc
 	arch base client common io mt net ipc platform server synergy ${libs})
 
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET synergyc
+		POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergyc>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergyc>\"\;\#1
+		COMMENT "Adding display aware manifest..."
+	)
+endif()
+
 if (CONF_CPACK)
 	install(TARGETS
 		synergyc
diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/synergyd/CMakeLists.txt
index 1caa35b5..49a6a7f8 100644
--- a/src/cmd/synergyd/CMakeLists.txt
+++ b/src/cmd/synergyd/CMakeLists.txt
@@ -37,6 +37,15 @@ endif()
 target_link_libraries(synergyd
 	arch base common io ipc mt net platform synergy ${libs})
 
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET synergyd
+		POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergyd>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergyd>\"\;\#1
+		COMMENT "Adding display aware manifest..."
+	)
+endif()
+
 if (CONF_CPACK)
 	install(TARGETS
 		synergyd
diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt
index c749e09a..3e2faad1 100644
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -60,6 +60,15 @@ add_executable(synergys ${sources})
 target_link_libraries(synergys
 	arch base client common io mt net ipc platform server synergy ${libs})
 
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET synergys
+		POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergys>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergys>\"\;\#1
+		COMMENT "Adding display aware manifest..."
+	)
+endif()
+
 if (CONF_CPACK)
 	install(TARGETS
 		synergys

From 8788faffdd031a6967bcebe4a6783e609d10534c Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Mon, 3 Oct 2016 14:41:53 +0100
Subject: [PATCH 2/2] Enable Windows 7 compatibility mode for core binaries

---
 res/dpiaware.manifest | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/res/dpiaware.manifest b/res/dpiaware.manifest
index 5de107ba..743e3369 100644
--- a/res/dpiaware.manifest
+++ b/res/dpiaware.manifest
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
-	<asmv3:application>
-		<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-			<dpiAware>true</dpiAware>
-		</asmv3:windowsSettings>
-	</asmv3:application>
-</assembly>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+    </application>
+  </compatibility>
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
+