force merge

sunshine/platform/windows/desktop.h

@@ -0,0 +1,18 @@
+namespace platf {
+    using namespace std::literals;
+    inline auto pairInputDesktop(){
+        auto hDesk = OpenInputDesktop(DF_ALLOWOTHERACCOUNTHOOK, FALSE, GENERIC_ALL);
+        if (NULL == hDesk) {
+            auto err = GetLastError();
+            BOOST_LOG(error) << "Failed to OpenInputDesktop [0x"sv << util::hex(err).to_string_view() << ']';
+        } else {
+            BOOST_LOG(info) << std::endl << "Opened desktop [0x"sv << util::hex(hDesk).to_string_view() << ']';
+            if (!SetThreadDesktop(hDesk) ) {
+            auto err = GetLastError();
+            BOOST_LOG(error) << "Failed to SetThreadDesktop [0x"sv << util::hex(err).to_string_view() << ']';
+            }
+            CloseDesktop(hDesk);
+        }
+        return hDesk;
+    };
+};

sunshine/platform/windows/display.h

@@ -84,6 +84,19 @@ public:
 
   DXGI_FORMAT format;
   D3D_FEATURE_LEVEL feature_level;
+
+  typedef enum _D3DKMT_SCHEDULINGPRIORITYCLASS
+  {
+    D3DKMT_SCHEDULINGPRIORITYCLASS_IDLE,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_BELOW_NORMAL,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_NORMAL,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_ABOVE_NORMAL,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_HIGH,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_REALTIME
+  }
+  D3DKMT_SCHEDULINGPRIORITYCLASS;
+
+  typedef NTSTATUS WINAPI (*PD3DKMTSetProcessSchedulingPriorityClass)(HANDLE, D3DKMT_SCHEDULINGPRIORITYCLASS);
 };
 
 class display_ram_t : public display_base_t {

sunshine/platform/windows/display_base.cpp

@@ -10,6 +10,8 @@
 
 #include "display.h"
 
+#include "desktop.h"
+
 namespace platf {
 using namespace std::literals;
 }
@@ -90,6 +92,8 @@ int display_base_t::init() {
     FreeLibrary(user32);
   });
 */
+  pairInputDesktop();
+  
   dxgi::factory1_t::pointer   factory_p {};
   dxgi::adapter_t::pointer    adapter_p {};
   dxgi::output_t::pointer     output_p {};
@@ -150,8 +154,6 @@ int display_base_t::init() {
   }
 
   D3D_FEATURE_LEVEL featureLevels[] {
-    D3D_FEATURE_LEVEL_12_1,
-    D3D_FEATURE_LEVEL_12_0,
     D3D_FEATURE_LEVEL_11_1,
     D3D_FEATURE_LEVEL_11_0,
     D3D_FEATURE_LEVEL_10_1,
@@ -164,7 +166,6 @@ int display_base_t::init() {
   status = adapter->QueryInterface(IID_IDXGIAdapter, (void**)&adapter_p);
   if(FAILED(status)) {
     BOOST_LOG(error) << "Failed to query IDXGIAdapter interface"sv;
-
     return -1;
   }
 
@@ -206,6 +207,36 @@ int display_base_t::init() {
 
   // Bump up thread priority
   {
+    const DWORD flags = TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY;
+    TOKEN_PRIVILEGES tp;
+    HANDLE token;
+    LUID val;
+
+    if (OpenProcessToken(GetCurrentProcess(), flags, &token) &&
+       !!LookupPrivilegeValue(NULL, SE_INC_BASE_PRIORITY_NAME, &val)) {
+      tp.PrivilegeCount = 1;
+      tp.Privileges[0].Luid = val;
+      tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+      if (!AdjustTokenPrivileges(token, false, &tp, sizeof(tp), NULL, NULL)) {
+        BOOST_LOG(error) << "Could not set privilege to increase GPU priority";
+      }
+    }
+
+    CloseHandle(token);
+
+    HMODULE gdi32 = GetModuleHandleA("GDI32");
+    if (gdi32) {
+      PD3DKMTSetProcessSchedulingPriorityClass fn =
+        (PD3DKMTSetProcessSchedulingPriorityClass)GetProcAddress(gdi32, "D3DKMTSetProcessSchedulingPriorityClass");
+      if (fn) {
+        status = fn(GetCurrentProcess(), D3DKMT_SCHEDULINGPRIORITYCLASS_REALTIME);
+        if (FAILED(status)) {
+          BOOST_LOG(error) << "Failed to set realtime GPU priority. Please run application as administrator for optimal performance.";
+        }
+      }
+    }
+
     dxgi::dxgi_t::pointer dxgi_p {};
     status = device->QueryInterface(IID_IDXGIDevice, (void**)&dxgi_p);
     dxgi::dxgi_t dxgi { dxgi_p };

sunshine/platform/windows/input.cpp

@@ -12,11 +12,15 @@
 #include "sunshine/main.h"
 #include "sunshine/platform/common.h"
 
+#include "desktop.h"
+
 namespace platf {
 using namespace std::literals;
 
 using adapteraddrs_t = util::c_ptr<IP_ADAPTER_ADDRESSES>;
 
+volatile HDESK _lastKnownInputDesktop = NULL; 
+
 class vigem_t {
 public:
   using client_t = util::safe_ptr<_VIGEM_CLIENT_T, vigem_free>;
@@ -171,9 +175,15 @@ void move_mouse(input_t &input, int deltaX, int deltaY) {
   mi.dwFlags = MOUSEEVENTF_MOVE;
   mi.dx = deltaX;
   mi.dy = deltaY;
-
+  
+retry:
   auto send = SendInput(1, &i, sizeof(INPUT));
   if(send != 1) {
+    auto hDesk = pairInputDesktop();
+    if (_lastKnownInputDesktop != hDesk) {
+      _lastKnownInputDesktop = hDesk;
+      goto retry;
+    }
     BOOST_LOG(warning) << "Couldn't send mouse movement input"sv;
   }
 }
@@ -218,8 +228,14 @@ void button_mouse(input_t &input, int button, bool release) {
     return;
   }
 
+retry:
   auto send = SendInput(1, &i, sizeof(INPUT));
   if(send != 1) {
+    auto hDesk = pairInputDesktop();
+    if (_lastKnownInputDesktop != hDesk) {
+      _lastKnownInputDesktop = hDesk;
+      goto retry;
+    }
     BOOST_LOG(warning) << "Couldn't send mouse button input"sv;
   }
 }
@@ -233,9 +249,15 @@ void scroll(input_t &input, int distance) {
   mi.dwFlags = MOUSEEVENTF_WHEEL;
   mi.mouseData = distance;
 
+retry:
   auto send = SendInput(1, &i, sizeof(INPUT));
   if(send != 1) {
-    BOOST_LOG(warning) << "Couldn't send moue movement input"sv;
+    auto hDesk = pairInputDesktop();
+    if (_lastKnownInputDesktop != hDesk) {
+      _lastKnownInputDesktop = hDesk;
+      goto retry;
+    }
+    BOOST_LOG(warning) << "Couldn't send mouse scroll input"sv;
   }
 }
 
@@ -282,9 +304,15 @@ void keyboard(input_t &input, uint16_t modcode, bool release) {
     ki.dwFlags |= KEYEVENTF_KEYUP;
   }
 
+retry:
   auto send = SendInput(1, &i, sizeof(INPUT));
   if(send != 1) {
-    BOOST_LOG(warning) << "Couldn't send moue movement input"sv;
+    auto hDesk = pairInputDesktop();
+    if (_lastKnownInputDesktop != hDesk) {
+      _lastKnownInputDesktop = hDesk;
+      goto retry;
+    }
+    BOOST_LOG(warning) << "Couldn't send keyboard input"sv;
   }
 }