From b743e664a0c741181ca33de0dc3f510232230db1 Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
Date: Tue, 13 Dec 2022 17:58:06 +0200
Subject: [PATCH] Add manifest for synergy-core to fix problem with dpi on
 windows (#7240)

---
 src/cmd/synergy-core/CMakeLists.txt            |  4 ++++
 src/cmd/synergy-core/synergy-core.cpp          |  5 ++---
 src/cmd/synergy-core/synergy-core.exe.manifest | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 src/cmd/synergy-core/synergy-core.exe.manifest

diff --git a/src/cmd/synergy-core/CMakeLists.txt b/src/cmd/synergy-core/CMakeLists.txt
index e91b01418..b8e4d6315 100644
--- a/src/cmd/synergy-core/CMakeLists.txt
+++ b/src/cmd/synergy-core/CMakeLists.txt
@@ -18,6 +18,10 @@ set(sources
     synergy-core.cpp
 )
 
+if (WIN32)
+    list(APPEND sources synergy-core.exe.manifest)
+endif()
+
 add_executable(synergy-core ${sources})
 target_link_libraries(synergy-core
     arch base client common io mt net ipc platform server synlib ${libs})
diff --git a/src/cmd/synergy-core/synergy-core.cpp b/src/cmd/synergy-core/synergy-core.cpp
index 567b6b8ad..bf41f710f 100644
--- a/src/cmd/synergy-core/synergy-core.cpp
+++ b/src/cmd/synergy-core/synergy-core.cpp
@@ -21,14 +21,13 @@
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "base/EventQueue.h"
-#include <vector>
 
 void showHelp()
 {
     std::cout<<"Usage: synergy-core <server | client> [...options]"<<std::endl;
-    std::cout<<"sever - start as a server (synergys)"<<std::endl;
+    std::cout<<"server - start as a server (synergys)"<<std::endl;
     std::cout<<"client - start as a client (synergyc)"<<std::endl;
-    std::cout<<"use synergy-core <sever|client> --help for more information."<<std::endl;
+    std::cout<<"use synergy-core <server|client> --help for more information."<<std::endl;
 }
 
 bool isServer(int argc, char** argv)
diff --git a/src/cmd/synergy-core/synergy-core.exe.manifest b/src/cmd/synergy-core/synergy-core.exe.manifest
new file mode 100644
index 000000000..ecd2728a1
--- /dev/null
+++ b/src/cmd/synergy-core/synergy-core.exe.manifest
@@ -0,0 +1,17 @@
+<?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" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file