From: Armin Novak <armin.novak@thincast.com>
Date: Tue, 10 Sep 2019 06:52:37 +0000 (+0200)
Subject: Fix windows shadow server issues reported in #5577
X-Git-Tag: 2.0.0~341^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1d42b17f61ec3d507cfc310faf6b301d96dbfba;p=platform%2Fupstream%2Ffreerdp.git

Fix windows shadow server issues reported in #5577
---

diff --git a/server/shadow/Win/win_shadow.c b/server/shadow/Win/win_shadow.c
index 04de71c..e01f7b8 100644
--- a/server/shadow/Win/win_shadow.c
+++ b/server/shadow/Win/win_shadow.c
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+#include <windows.h>
+
 #include <winpr/crt.h>
 #include <winpr/synch.h>
 #include <winpr/sysinfo.h>
@@ -28,15 +30,17 @@
 
 #define TAG SERVER_TAG("shadow.win")
 
-static int win_shadow_input_synchronize_event(rdpShadowSubsystem* subsystem,
+static BOOL win_shadow_input_synchronize_event(rdpShadowSubsystem* subsystem,
         rdpShadowClient* client, UINT32 flags)
 {
-	return 0;
+	WLog_WARN(TAG, "%s: TODO: Implement!", __FUNCTION__);
+	return TRUE;
 }
 
-static int win_shadow_input_keyboard_event(rdpShadowSubsystem* subsystem,
+static BOOL win_shadow_input_keyboard_event(rdpShadowSubsystem* subsystem,
         rdpShadowClient* client, UINT16 flags, UINT16 code)
 {
+	UINT rc;
 	INPUT event;
 	event.type = INPUT_KEYBOARD;
 	event.ki.wVk = 0;
@@ -51,12 +55,16 @@ static int win_shadow_input_keyboard_event(rdpShadowSubsystem* subsystem,
 	if (flags & KBD_FLAGS_EXTENDED)
 		event.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
 
-	return SendInput(1, &event, sizeof(INPUT));
+	rc = SendInput(1, &event, sizeof(INPUT));
+	if (rc == 0)
+		return FALSE;
+	return TRUE;
 }
 
-static int win_shadow_input_unicode_keyboard_event(rdpShadowSubsystem* subsystem,
+static BOOL win_shadow_input_unicode_keyboard_event(rdpShadowSubsystem* subsystem,
         rdpShadowClient* client, UINT16 flags, UINT16 code)
 {
+	UINT rc;
 	INPUT event;
 	event.type = INPUT_KEYBOARD;
 	event.ki.wVk = 0;
@@ -68,27 +76,34 @@ static int win_shadow_input_unicode_keyboard_event(rdpShadowSubsystem* subsystem
 	if (flags & KBD_FLAGS_RELEASE)
 		event.ki.dwFlags |= KEYEVENTF_KEYUP;
 
-	return SendInput(1, &event, sizeof(INPUT));
+	rc = SendInput(1, &event, sizeof(INPUT));
+	if (rc == 0)
+		return FALSE;
+	return TRUE;
 }
 
-static int win_shadow_input_mouse_event(rdpShadowSubsystem* subsystem,
+static BOOL win_shadow_input_mouse_event(rdpShadowSubsystem* subsystem,
                                         rdpShadowClient* client, UINT16 flags, UINT16 x, UINT16 y)
 {
+	UINT rc = 1;
 	INPUT event;
 	float width;
 	float height;
 	ZeroMemory(&event, sizeof(INPUT));
 	event.type = INPUT_MOUSE;
 
-	if (flags & PTR_FLAGS_WHEEL)
+	if (flags & (PTR_FLAGS_WHEEL | PTR_FLAGS_HWHEEL))
 	{
-		event.mi.dwFlags = MOUSEEVENTF_WHEEL;
+		if (flags & PTR_FLAGS_WHEEL)
+			event.mi.dwFlags = MOUSEEVENTF_WHEEL;
+		else
+			event.mi.dwFlags = MOUSEEVENTF_HWHEEL;
 		event.mi.mouseData = flags & WheelRotationMask;
 
 		if (flags & PTR_FLAGS_WHEEL_NEGATIVE)
 			event.mi.mouseData *= -1;
 
-		SendInput(1, &event, sizeof(INPUT));
+		rc = SendInput(1, &event, sizeof(INPUT));
 	}
 	else
 	{
@@ -101,7 +116,9 @@ static int win_shadow_input_mouse_event(rdpShadowSubsystem* subsystem,
 		if (flags & PTR_FLAGS_MOVE)
 		{
 			event.mi.dwFlags |= MOUSEEVENTF_MOVE;
-			SendInput(1, &event, sizeof(INPUT));
+			rc = SendInput(1, &event, sizeof(INPUT));
+			if (rc == 0)
+				return FALSE;
 		}
 
 		event.mi.dwFlags = MOUSEEVENTF_ABSOLUTE;
@@ -113,7 +130,7 @@ static int win_shadow_input_mouse_event(rdpShadowSubsystem* subsystem,
 			else
 				event.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
 
-			SendInput(1, &event, sizeof(INPUT));
+			rc = SendInput(1, &event, sizeof(INPUT));
 		}
 		else if (flags & PTR_FLAGS_BUTTON2)
 		{
@@ -122,7 +139,7 @@ static int win_shadow_input_mouse_event(rdpShadowSubsystem* subsystem,
 			else
 				event.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
 
-			SendInput(1, &event, sizeof(INPUT));
+			rc = SendInput(1, &event, sizeof(INPUT));
 		}
 		else if (flags & PTR_FLAGS_BUTTON3)
 		{
@@ -131,16 +148,19 @@ static int win_shadow_input_mouse_event(rdpShadowSubsystem* subsystem,
 			else
 				event.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
 
-			SendInput(1, &event, sizeof(INPUT));
+			rc = SendInput(1, &event, sizeof(INPUT));
 		}
 	}
 
-	return 0;
+	if (rc == 0)
+		return FALSE;
+	return TRUE;
 }
 
-static int win_shadow_input_extended_mouse_event(rdpShadowSubsystem* subsystem,
+static BOOL win_shadow_input_extended_mouse_event(rdpShadowSubsystem* subsystem,
         rdpShadowClient* client, UINT16 flags, UINT16 x, UINT16 y)
 {
+	UINT rc = 1;
 	INPUT event;
 	float width;
 	float height;
@@ -157,7 +177,9 @@ static int win_shadow_input_extended_mouse_event(rdpShadowSubsystem* subsystem,
 			event.mi.dx = (LONG)((float) x * (65535.0f / width));
 			event.mi.dy = (LONG)((float) y * (65535.0f / height));
 			event.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
-			SendInput(1, &event, sizeof(INPUT));
+			rc = SendInput(1, &event, sizeof(INPUT));
+			if (rc == 0)
+				return FALSE;
 		}
 
 		event.mi.dx = event.mi.dy = event.mi.dwFlags = 0;
@@ -172,10 +194,12 @@ static int win_shadow_input_extended_mouse_event(rdpShadowSubsystem* subsystem,
 		else if (flags & PTR_XFLAGS_BUTTON2)
 			event.mi.mouseData = XBUTTON2;
 
-		SendInput(1, &event, sizeof(INPUT));
+		rc = SendInput(1, &event, sizeof(INPUT));
 	}
 
-	return 0;
+	if (rc == 0)
+		return FALSE;
+	return TRUE;
 }