merge with notentered

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_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 {};
@@ -162,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;
   }
 

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;
   }
 }