Rebase against d41a1f0183f5686fa3ed1b42c4de07e393833925.

This commit is contained in:
Alistair Leslie-Hughes
2024-05-22 07:49:58 +10:00
parent 791a70faf0
commit 68925c8f61
3 changed files with 88 additions and 90 deletions

View File

@@ -1,7 +1,7 @@
From 5e9af0573526693cbc98ad8282b5f2023c6b5bf7 Mon Sep 17 00:00:00 2001
From b08aae4c2d967c0c66f4349584d2e33de353b5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 26 Aug 2019 14:37:20 +0200
Subject: [PATCH 4/7] server: Add send_hardware_message flags for rawinput
Subject: [PATCH] server: Add send_hardware_message flags for rawinput
translation.
---
@@ -26,10 +26,10 @@ index f947fec7fea..4ded432bd99 100644
{
UINT flags;
diff --git a/server/protocol.def b/server/protocol.def
index 7b21aa16636..8e483bf3bbf 100644
index 054d47eb81f..d847f046eeb 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2126,7 +2126,7 @@ enum message_type
@@ -2164,7 +2164,7 @@ enum message_type
@REQ(send_hardware_message)
user_handle_t win; /* window handle */
hw_input_t input; /* input data */
@@ -38,7 +38,7 @@ index 7b21aa16636..8e483bf3bbf 100644
VARARG(report,bytes); /* HID report data */
@REPLY
int wait; /* do we need to wait for a reply? */
@@ -2135,7 +2135,6 @@ enum message_type
@@ -2173,7 +2173,6 @@ enum message_type
int new_x; /* new cursor position */
int new_y;
@END
@@ -47,10 +47,10 @@ index 7b21aa16636..8e483bf3bbf 100644
/* Get a message from the current queue */
diff --git a/server/queue.c b/server/queue.c
index 67c03c10b40..0687a7feac1 100644
index 938e3e310e5..eb3a2b0326e 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1983,7 +1983,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
@@ -2027,7 +2027,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
/* queue a hardware message for a mouse event */
static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
@@ -59,7 +59,7 @@ index 67c03c10b40..0687a7feac1 100644
{
const struct rawinput_device *device;
struct hardware_msg_data *msg_data;
@@ -2038,7 +2038,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
@@ -2082,7 +2082,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
y = desktop->cursor.y;
}
@@ -68,7 +68,7 @@ index 67c03c10b40..0687a7feac1 100644
{
memset( &raw_msg, 0, sizeof(raw_msg) );
raw_msg.foreground = foreground;
@@ -2060,6 +2060,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
@@ -2104,6 +2104,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
return 0;
}
@@ -77,7 +77,7 @@ index 67c03c10b40..0687a7feac1 100644
for (i = 0; i < ARRAY_SIZE( messages ); i++)
{
if (!messages[i]) continue;
@@ -2091,7 +2093,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
@@ -2135,7 +2137,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
/* queue a hardware message for a keyboard event */
static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
@@ -86,8 +86,8 @@ index 67c03c10b40..0687a7feac1 100644
{
struct hw_msg_source source = { IMDT_KEYBOARD, origin };
const struct rawinput_device *device;
@@ -2168,7 +2170,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
break;
@@ -2234,7 +2236,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
}
}
- if ((foreground = get_foreground_thread( desktop, win )))
@@ -95,7 +95,7 @@ index 67c03c10b40..0687a7feac1 100644
{
struct rawinput_message raw_msg = {0};
raw_msg.foreground = foreground;
@@ -2189,6 +2191,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
@@ -2255,6 +2257,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
return 0;
}
@@ -104,7 +104,7 @@ index 67c03c10b40..0687a7feac1 100644
if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0;
msg_data = msg->data;
@@ -2936,10 +2940,10 @@ DECL_HANDLER(send_hardware_message)
@@ -3010,10 +3014,10 @@ DECL_HANDLER(send_hardware_message)
switch (req->input.type)
{
case INPUT_MOUSE: