wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against upstream changes.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-04-27 23:02:33 +02:00
parent 90eb3105b8
commit 040fd28c00
7 changed files with 288 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server-Key_State/0001-server-Introduce-a-helper-function-to-update-the-thr.patch
View File

@@ -1,4 +1,4 @@
From b575a8659eb9daa7af14c15f9f564a19e4b5dbd5 Mon Sep 17 00:00:00 2001
From 8ba268938be7e8f4c749be14decc23ebc67bcbc4 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 12 Mar 2015 00:44:25 +0100
Subject: server: Introduce a helper function to update the thread_input key
@@ -9,10 +9,10 @@ Subject: server: Introduce a helper function to update the thread_input key
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/server/queue.c b/server/queue.c
index 3a321cd..85c0786 100644
index 350d45a..5031ac4 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1215,9 +1215,9 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int
@@ -1238,9 +1238,9 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int
else keystate[key] &= ~0x80;
}
@@ -25,7 +25,7 @@ index 3a321cd..85c0786 100644
{
unsigned char key;
int down = 0;
@@ -1279,6 +1279,12 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys
@@ -1302,6 +1302,12 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys
}
}
@@ -38,7 +38,7 @@ index 3a321cd..85c0786 100644
/* release the hardware message currently being processed by the given thread */
static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id,
int remove )
@@ -1309,7 +1315,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i
@@ -1332,7 +1338,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i
}
if (clr_bit) clear_queue_bits( queue, clr_bit );
@@ -47,16 +47,16 @@ index 3a321cd..85c0786 100644
list_remove( &msg->entry );
free_message( msg );
}
@@ -1430,7 +1436,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
@@ -1451,7 +1457,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
struct thread_input *input;
unsigned int msg_code;
struct hardware_msg_data *data = msg->data;
- update_input_key_state( desktop, desktop->keystate, msg );
+ update_key_state( desktop, desktop->keystate, msg );
last_input_time = get_tick_count();
if (msg->msg != WM_MOUSEMOVE) always_queue = 1;
@@ -1473,7 +1479,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
@@ -1494,7 +1500,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread );
if (!win || !thread)
{
@@ -65,7 +65,7 @@ index 3a321cd..85c0786 100644
free_message( msg );
return;
}
@@ -1911,7 +1917,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -1936,7 +1942,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
if (!win || !win_thread)
{
/* no window at all, remove it */
@@ -74,7 +74,7 @@ index 3a321cd..85c0786 100644
list_remove( &msg->entry );
free_message( msg );
continue;
@@ -1927,7 +1933,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -1952,7 +1958,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
else
{
/* for another thread input, drop it */
@@ -84,5 +84,5 @@ index 3a321cd..85c0786 100644
free_message( msg );
}
--
2.3.1
2.3.5