wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Alex Henrie : explorer: Handle the back and forward buttons of a 5-button mouse.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: 48440d2446738573bbea67c5c7711a6778ecd240 URL: https://gitlab.winehq.org/wine/wine/-/commit/48440d2446738573bbea67c5c7711a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 7 21:51:25 2024 -0700 explorer: Handle the back and forward buttons of a 5-button mouse. --- programs/explorer/explorer.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 26f3c8d6d9c..7652abaf653 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -744,6 +744,17 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L } } break; + case WM_APPCOMMAND: + switch(GET_APPCOMMAND_LPARAM(lParam)) + { + case APPCOMMAND_BROWSER_BACKWARD: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_NAVIGATEBACK); + break; + case APPCOMMAND_BROWSER_FORWARD: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_NAVIGATEFORWARD); + break; + } + break; case WM_SIZE: update_window_size(info,HIWORD(lParam),LOWORD(lParam)); break;

1 0

Alexandros Frantzis : win32u: Use consistent locking order for display related mutexes.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: 26e3d2ecedb4f48d0002b7e75dd4d80eb00b54a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/26e3d2ecedb4f48d0002b7e75dd4d8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Feb 6 18:01:59 2024 +0200 win32u: Use consistent locking order for display related mutexes. Most paths that hold both the display_lock and the display_devices_init mutex acquire them in the order just mentioned. However, there are two cases where these are acquired in the opposite order, which with unfortunate thread interactions and timings can lead to a deadlock. Fix these cases to use the same order as the rest of the code. --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9a43de8fd76..673082056b1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1251,8 +1251,8 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) if (!ctx->mutex) { - ctx->mutex = get_display_device_init_mutex(); pthread_mutex_lock( &display_lock ); + ctx->mutex = get_display_device_init_mutex(); prepare_devices(); } @@ -1717,8 +1717,8 @@ static BOOL update_display_cache_from_registry(void) if (key.LastWriteTime.QuadPart <= last_query_display_time) return TRUE; - mutex = get_display_device_init_mutex(); pthread_mutex_lock( &display_lock ); + mutex = get_display_device_init_mutex(); clear_display_devices();

1 0

Rémi Bernon : server: Stop using hardware_msg_data in rawinput_message.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: c8bf3ba2daebc667344f36559859c4815273c988 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8bf3ba2daebc667344f36559859c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 13:35:35 2024 +0100 server: Stop using hardware_msg_data in rawinput_message. --- include/wine/server_protocol.h | 4 +-- server/protocol.def | 2 +- server/queue.c | 79 ++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 45 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 96a21e25e09..80cc8bd3bd5 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -284,7 +284,7 @@ union rawinput { int type; unsigned int device; - unsigned int param; + unsigned int wparam; unsigned int usage; unsigned int count; unsigned int length; @@ -6512,7 +6512,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 790 +#define SERVER_PROTOCOL_VERSION 791 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6ffed5deb01..e896f6cb72a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -300,7 +300,7 @@ union rawinput { int type; /* RIM_TYPEHID */ unsigned int device; /* rawinput device index */ - unsigned int param; /* rawinput message param */ + unsigned int wparam; /* rawinput message wparam */ unsigned int usage; /* HID device usage */ unsigned int count; /* HID report count */ unsigned int length; /* HID report length */ diff --git a/server/queue.c b/server/queue.c index dad51e06ceb..07870f98711 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1789,7 +1789,9 @@ struct rawinput_message struct hw_msg_source source; unsigned int time; unsigned int message; - struct hardware_msg_data data; + lparam_t info; + unsigned int flags; + union rawinput rawinput; const void *hid_report; }; @@ -1800,16 +1802,17 @@ static int queue_rawinput_message( struct process* process, void *arg ) const struct rawinput_device *device = NULL; struct desktop *target_desktop = NULL, *desktop = NULL; struct thread *target_thread = NULL, *foreground = NULL; + struct hardware_msg_data *msg_data; struct message *msg; data_size_t report_size; int wparam = RIM_INPUT; - if (raw_msg->data.rawinput.type == RIM_TYPEMOUSE) + if (raw_msg->rawinput.type == RIM_TYPEMOUSE) device = process->rawinput_mouse; - else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) + else if (raw_msg->rawinput.type == RIM_TYPEKEYBOARD) device = process->rawinput_kbd; else - device = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage ); + device = find_rawinput_device( process, raw_msg->rawinput.hid.usage ); if (!device) return 0; if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return 0; @@ -1829,23 +1832,24 @@ static int queue_rawinput_message( struct process* process, void *arg ) wparam = RIM_INPUTSINK; } - if (raw_msg->data.rawinput.type != RIM_TYPEHID || !raw_msg->hid_report) report_size = 0; - else report_size = raw_msg->data.size - sizeof(raw_msg->data); - - if (!(msg = alloc_hardware_message( raw_msg->data.info, raw_msg->source, raw_msg->time, report_size ))) - goto done; + if (raw_msg->rawinput.type != RIM_TYPEHID || !raw_msg->hid_report) report_size = 0; + else report_size = raw_msg->rawinput.hid.count * raw_msg->rawinput.hid.length; + if (!(msg = alloc_hardware_message( raw_msg->info, raw_msg->source, raw_msg->time, report_size ))) goto done; msg->win = device->target; msg->msg = raw_msg->message; msg->wparam = wparam; msg->lparam = 0; - memcpy( msg->data, &raw_msg->data, sizeof(raw_msg->data) ); - if (report_size) memcpy( (struct hardware_msg_data *)msg->data + 1, raw_msg->hid_report, report_size ); - if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && raw_msg->data.rawinput.type == RIM_TYPEHID) + msg_data = msg->data; + msg_data->flags = raw_msg->flags; + msg_data->rawinput = raw_msg->rawinput; + if (report_size) memcpy( msg_data + 1, raw_msg->hid_report, report_size ); + + if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && raw_msg->rawinput.type == RIM_TYPEHID) { - msg->wparam = raw_msg->data.rawinput.hid.param; - msg->lparam = raw_msg->data.rawinput.hid.device; + msg->wparam = raw_msg->rawinput.hid.wparam; + msg->lparam = raw_msg->rawinput.hid.device; } queue_hardware_message( desktop, msg, 1 ); @@ -1924,14 +1928,12 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons raw_msg.time = time; raw_msg.message = WM_INPUT; - msg_data = &raw_msg.data; - msg_data->info = input->mouse.info; - msg_data->size = sizeof(*msg_data); - msg_data->flags = flags; - msg_data->rawinput.type = RIM_TYPEMOUSE; - msg_data->rawinput.mouse.x = x - desktop->cursor.x; - msg_data->rawinput.mouse.y = y - desktop->cursor.y; - msg_data->rawinput.mouse.data = input->mouse.data; + raw_msg.info = input->mouse.info; + raw_msg.flags = flags; + raw_msg.rawinput.type = RIM_TYPEMOUSE; + raw_msg.rawinput.mouse.x = x - desktop->cursor.x; + raw_msg.rawinput.mouse.y = y - desktop->cursor.y; + raw_msg.rawinput.mouse.data = input->mouse.data; enum_processes( queue_rawinput_message, &raw_msg ); release_object( foreground ); @@ -2062,14 +2064,12 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c raw_msg.time = time; raw_msg.message = WM_INPUT; - msg_data = &raw_msg.data; - msg_data->info = input->kbd.info; - msg_data->size = sizeof(*msg_data); - msg_data->flags = input->kbd.flags; - msg_data->rawinput.type = RIM_TYPEKEYBOARD; - msg_data->rawinput.kbd.message = message_code; - msg_data->rawinput.kbd.vkey = vkey; - msg_data->rawinput.kbd.scan = input->kbd.scan; + raw_msg.info = input->kbd.info; + raw_msg.flags = input->kbd.flags; + raw_msg.rawinput.type = RIM_TYPEKEYBOARD; + raw_msg.rawinput.kbd.message = message_code; + raw_msg.rawinput.kbd.vkey = vkey; + raw_msg.rawinput.kbd.scan = input->kbd.scan; enum_processes( queue_rawinput_message, &raw_msg ); release_object( foreground ); @@ -2117,10 +2117,8 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; - struct hardware_msg_data *msg_data; struct rawinput_message raw_msg; struct message *msg; - data_size_t report_size = 0; switch (input->hw.msg) { @@ -2131,21 +2129,18 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ raw_msg.time = get_tick_count(); raw_msg.message = input->hw.msg; raw_msg.hid_report = get_req_data(); - report_size = input->hw.hid.length * input->hw.hid.count; - if (report_size != get_req_data_size()) + if (input->hw.hid.length * input->hw.hid.count != get_req_data_size()) { set_error( STATUS_INVALID_PARAMETER ); return; } - msg_data = &raw_msg.data; - msg_data->size = sizeof(*msg_data) + report_size; - msg_data->rawinput.hid.type = RIM_TYPEHID; - msg_data->rawinput.hid.device = input->hw.hid.device; - msg_data->rawinput.hid.param = input->hw.wparam; - msg_data->rawinput.hid.usage = input->hw.hid.usage; - msg_data->rawinput.hid.count = input->hw.hid.count; - msg_data->rawinput.hid.length = input->hw.hid.length; + raw_msg.rawinput.hid.type = RIM_TYPEHID; + raw_msg.rawinput.hid.device = input->hw.hid.device; + raw_msg.rawinput.hid.wparam = input->hw.wparam; + raw_msg.rawinput.hid.usage = input->hw.hid.usage; + raw_msg.rawinput.hid.count = input->hw.hid.count; + raw_msg.rawinput.hid.length = input->hw.hid.length; enum_processes( queue_rawinput_message, &raw_msg ); return;

1 0

Rémi Bernon : server: Stop using union rawinput in hw_input_t.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: f86cca3897463b5c589e4f6bc18378ae1d53083f URL: https://gitlab.winehq.org/wine/wine/-/commit/f86cca3897463b5c589e4f6bc18378… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 6 11:04:49 2024 +0100 server: Stop using union rawinput in hw_input_t. --- dlls/win32u/message.c | 11 +++++------ include/wine/server_protocol.h | 11 +++++++++-- server/protocol.def | 11 +++++++++-- server/queue.c | 18 +++++++++--------- server/trace.c | 32 ++++++++------------------------ 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 068f258e103..08222fd460f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3549,15 +3549,14 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r { case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: - req->input.hw.rawinput.type = rawinput->header.dwType; switch (rawinput->header.dwType) { case RIM_TYPEHID: - req->input.hw.rawinput.hid.device = HandleToUlong( rawinput->header.hDevice ); - req->input.hw.rawinput.hid.param = rawinput->header.wParam; - req->input.hw.rawinput.hid.usage = MAKELONG(hid_usage, hid_usage_page); - req->input.hw.rawinput.hid.count = rawinput->data.hid.dwCount; - req->input.hw.rawinput.hid.length = rawinput->data.hid.dwSizeHid; + req->input.hw.wparam = rawinput->header.wParam; + req->input.hw.hid.device = HandleToUlong( rawinput->header.hDevice ); + req->input.hw.hid.usage = MAKELONG(hid_usage, hid_usage_page); + req->input.hw.hid.count = rawinput->data.hid.dwCount; + req->input.hw.hid.length = rawinput->data.hid.dwSizeHid; wine_server_add_data( req, rawinput->data.hid.bRawData, rawinput->data.hid.dwCount * rawinput->data.hid.dwSizeHid ); break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d475fdbbfd..96a21e25e09 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -343,8 +343,15 @@ typedef union { int type; unsigned int msg; + lparam_t wparam; lparam_t lparam; - union rawinput rawinput; + struct + { + unsigned int device; + unsigned int usage; + unsigned int count; + unsigned int length; + } hid; } hw; } hw_input_t; @@ -6505,7 +6512,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 789 +#define SERVER_PROTOCOL_VERSION 790 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index d00f037afb9..6ffed5deb01 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -359,8 +359,15 @@ typedef union { int type; /* INPUT_HARDWARE */ unsigned int msg; /* message code */ - lparam_t lparam; /* message param */ - union rawinput rawinput;/* rawinput message data */ + lparam_t wparam; /* parameters */ + lparam_t lparam; /* parameters */ + struct + { + unsigned int device; /* rawinput device index */ + unsigned int usage; /* HID device usage */ + unsigned int count; /* HID report count */ + unsigned int length; /* HID report length */ + } hid; } hw; } hw_input_t; diff --git a/server/queue.c b/server/queue.c index 349ad51e0f6..dad51e06ceb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2130,13 +2130,8 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ raw_msg.source = source; raw_msg.time = get_tick_count(); raw_msg.message = input->hw.msg; - - if (input->hw.rawinput.type == RIM_TYPEHID) - { - raw_msg.hid_report = get_req_data(); - report_size = input->hw.rawinput.hid.length * input->hw.rawinput.hid.count; - } - + raw_msg.hid_report = get_req_data(); + report_size = input->hw.hid.length * input->hw.hid.count; if (report_size != get_req_data_size()) { set_error( STATUS_INVALID_PARAMETER ); @@ -2144,8 +2139,13 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ } msg_data = &raw_msg.data; - msg_data->size = sizeof(*msg_data) + report_size; - msg_data->rawinput = input->hw.rawinput; + msg_data->size = sizeof(*msg_data) + report_size; + msg_data->rawinput.hid.type = RIM_TYPEHID; + msg_data->rawinput.hid.device = input->hw.hid.device; + msg_data->rawinput.hid.param = input->hw.wparam; + msg_data->rawinput.hid.usage = input->hw.hid.usage; + msg_data->rawinput.hid.count = input->hw.hid.count; + msg_data->rawinput.hid.length = input->hw.hid.length; enum_processes( queue_rawinput_message, &raw_msg ); return; diff --git a/server/trace.c b/server/trace.c index ccb251cbc4b..fdd192e1749 100644 --- a/server/trace.c +++ b/server/trace.c @@ -421,29 +421,6 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) } } -static void dump_rawinput( const char *prefix, const union rawinput *rawinput ) -{ - switch (rawinput->type) - { - case RIM_TYPEMOUSE: - fprintf( stderr, "%s{type=MOUSE,x=%d,y=%d,data=%08x}", prefix, rawinput->mouse.x, - rawinput->mouse.y, rawinput->mouse.data ); - break; - case RIM_TYPEKEYBOARD: - fprintf( stderr, "%s{type=KEYBOARD,message=%04x,vkey=%04hx,scan=%04hx}", prefix, - rawinput->kbd.message, rawinput->kbd.vkey, rawinput->kbd.scan ); - break; - case RIM_TYPEHID: - fprintf( stderr, "%s{type=HID,device=%04x,param=%04x,usage=%04x:%04x,count=%u,length=%u}", - prefix, rawinput->hid.device, rawinput->hid.param, HIWORD(rawinput->hid.usage), - LOWORD(rawinput->hid.usage), rawinput->hid.count, rawinput->hid.length ); - break; - default: - fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type ); - break; - } -} - static void dump_hw_input( const char *prefix, const hw_input_t *input ) { switch (input->type) @@ -463,12 +440,19 @@ static void dump_hw_input( const char *prefix, const hw_input_t *input ) break; case INPUT_HARDWARE: fprintf( stderr, "%s{type=HARDWARE,msg=%04x", prefix, input->hw.msg ); + dump_uint64( ",wparam=", &input->hw.wparam ); dump_uint64( ",lparam=", &input->hw.lparam ); switch (input->hw.msg) { case WM_INPUT: + fprintf( stderr, "%s{type=HID,device=%04x,usage=%04x:%04x,count=%u,length=%u}", + prefix, input->hw.hid.device, HIWORD(input->hw.hid.usage), LOWORD(input->hw.hid.usage), + input->hw.hid.count, input->hw.hid.length ); + break; case WM_INPUT_DEVICE_CHANGE: - dump_rawinput( ",rawinput=", &input->hw.rawinput ); + fprintf( stderr, "%s{type=HID,device=%04x,usage=%04x:%04x}", + prefix, input->hw.hid.device, HIWORD(input->hw.hid.usage), LOWORD(input->hw.hid.usage) ); + break; } fputc( '}', stderr ); break;

1 0

Rémi Bernon : server: Combine HID usage page and usage together.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: c62ca2e1aa8f7fe0da906000957dd2af71976af0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c62ca2e1aa8f7fe0da906000957dd2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 6 10:50:32 2024 +0100 server: Combine HID usage page and usage together. --- dlls/win32u/message.c | 3 +-- dlls/win32u/rawinput.c | 3 +-- include/wine/server_protocol.h | 8 +++----- server/protocol.def | 6 ++---- server/queue.c | 11 ++++++----- server/trace.c | 10 +++++----- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0cd20684b4e..068f258e103 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3555,8 +3555,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r case RIM_TYPEHID: req->input.hw.rawinput.hid.device = HandleToUlong( rawinput->header.hDevice ); req->input.hw.rawinput.hid.param = rawinput->header.wParam; - req->input.hw.rawinput.hid.usage_page = hid_usage_page; - req->input.hw.rawinput.hid.usage = hid_usage; + req->input.hw.rawinput.hid.usage = MAKELONG(hid_usage, hid_usage_page); req->input.hw.rawinput.hid.count = rawinput->data.hid.dwCount; req->input.hw.rawinput.hid.length = rawinput->data.hid.dwSizeHid; wine_server_add_data( req, rawinput->data.hid.bRawData, diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index e6c442c6ba6..3ea29f2da77 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -899,8 +899,7 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d for (i = 0; i < device_count; ++i) { - server_devices[i].usage_page = registered_devices[i].usUsagePage; - server_devices[i].usage = registered_devices[i].usUsage; + server_devices[i].usage = MAKELONG(registered_devices[i].usUsage, registered_devices[i].usUsagePage); server_devices[i].flags = registered_devices[i].dwFlags; server_devices[i].target = wine_server_user_handle( registered_devices[i].hwndTarget ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e039cf59e72..1d475fdbbfd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -285,8 +285,7 @@ union rawinput int type; unsigned int device; unsigned int param; - unsigned short usage_page; - unsigned short usage; + unsigned int usage; unsigned int count; unsigned int length; } hid; @@ -863,8 +862,7 @@ typedef struct struct rawinput_device { - unsigned short usage_page; - unsigned short usage; + unsigned int usage; unsigned int flags; user_handle_t target; }; @@ -6507,7 +6505,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 788 +#define SERVER_PROTOCOL_VERSION 789 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 3c452e08e2a..d00f037afb9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -301,8 +301,7 @@ union rawinput int type; /* RIM_TYPEHID */ unsigned int device; /* rawinput device index */ unsigned int param; /* rawinput message param */ - unsigned short usage_page;/* HID usage page */ - unsigned short usage; /* HID usage */ + unsigned int usage; /* HID device usage */ unsigned int count; /* HID report count */ unsigned int length; /* HID report length */ } hid; @@ -879,8 +878,7 @@ typedef struct struct rawinput_device { - unsigned short usage_page; - unsigned short usage; + unsigned int usage; unsigned int flags; user_handle_t target; }; diff --git a/server/queue.c b/server/queue.c index cd913ae03e5..349ad51e0f6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -35,6 +35,7 @@ #include "winuser.h" #include "winternl.h" #include "ntuser.h" +#include "hidusage.h" #include "handle.h" #include "file.h" @@ -1637,13 +1638,13 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) +static struct rawinput_device *find_rawinput_device( struct process *process, unsigned int usage ) { struct rawinput_device *device, *end; for (device = process->rawinput_devices, end = device + process->rawinput_device_count; device != end; device++) { - if (device->usage_page != usage_page || device->usage != usage) continue; + if (device->usage != usage) continue; return device; } @@ -1808,7 +1809,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) device = process->rawinput_kbd; else - device = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage_page, raw_msg->data.rawinput.hid.usage ); + device = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage ); if (!device) return 0; if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return 0; @@ -3505,6 +3506,6 @@ DECL_HANDLER(update_rawinput_devices) process->rawinput_device_count = device_count; memcpy( process->rawinput_devices, devices, size ); - process->rawinput_mouse = find_rawinput_device( process, 1, 2 ); - process->rawinput_kbd = find_rawinput_device( process, 1, 6 ); + process->rawinput_mouse = find_rawinput_device( process, MAKELONG(HID_USAGE_GENERIC_MOUSE, HID_USAGE_PAGE_GENERIC) ); + process->rawinput_kbd = find_rawinput_device( process, MAKELONG(HID_USAGE_GENERIC_KEYBOARD, HID_USAGE_PAGE_GENERIC) ); } diff --git a/server/trace.c b/server/trace.c index a29041031df..ccb251cbc4b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -434,9 +434,9 @@ static void dump_rawinput( const char *prefix, const union rawinput *rawinput ) rawinput->kbd.message, rawinput->kbd.vkey, rawinput->kbd.scan ); break; case RIM_TYPEHID: - fprintf( stderr, "%s{type=HID,device=%04x,param=%04x,page=%04hx,usage=%04hx,count=%u,length=%u}", - prefix, rawinput->hid.device, rawinput->hid.param, rawinput->hid.usage_page, - rawinput->hid.usage, rawinput->hid.count, rawinput->hid.length ); + fprintf( stderr, "%s{type=HID,device=%04x,param=%04x,usage=%04x:%04x,count=%u,length=%u}", + prefix, rawinput->hid.device, rawinput->hid.param, HIWORD(rawinput->hid.usage), + LOWORD(rawinput->hid.usage), rawinput->hid.count, rawinput->hid.length ); break; default: fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type ); @@ -1357,8 +1357,8 @@ static void dump_varargs_rawinput_devices(const char *prefix, data_size_t size ) while (size >= sizeof(*device)) { device = cur_data; - fprintf( stderr, "{usage_page=%04x,usage=%04x,flags=%08x,target=%08x}", - device->usage_page, device->usage, device->flags, device->target ); + fprintf( stderr, "{usage=%08x,flags=%08x,target=%08x}", + device->usage, device->flags, device->target ); size -= sizeof(*device); remove_data( sizeof(*device) ); if (size) fputc( ',', stderr );

1 0

Rémi Bernon : mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: 3c644480377a4aac6bcc0b23b79f726366346c7a URL: https://gitlab.winehq.org/wine/wine/-/commit/3c644480377a4aac6bcc0b23b79f72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 1 09:37:30 2024 +0100 mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING. --- dlls/mfreadwrite/tests/mfplat.c | 202 ++++++++++++++++++++++++++++++++++------ 1 file changed, 173 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: b37a16c7f39c7054238570d714c56d31af6c5f7d URL: https://gitlab.winehq.org/wine/wine/-/commit/b37a16c7f39c7054238570d714c56d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 20:24:28 2024 +0100 mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING. --- dlls/mfreadwrite/tests/mfplat.c | 134 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 121 insertions(+), 13 deletions(-)

1 0

Rémi Bernon : mfreadwrite/tests: Test source reader exposed transforms and types.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: f5daee4a2fb50760347cbeeed5fe39049841aef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5daee4a2fb50760347cbeeed5fe39… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 18:05:44 2024 +0100 mfreadwrite/tests: Test source reader exposed transforms and types. --- dlls/mfreadwrite/tests/Makefile.in | 2 +- dlls/mfreadwrite/tests/mfplat.c | 385 +++++++++++++++++++++++++++++++++++++ 2 files changed, 386 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : mfreadwrite/tests: Initialize test source stream types from descriptors.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: 5122f6ad9f2271844531410805bd7a918b9d95c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5122f6ad9f2271844531410805bd7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 18:04:49 2024 +0100 mfreadwrite/tests: Initialize test source stream types from descriptors. --- dlls/mfreadwrite/tests/mfplat.c | 179 ++++++++++++++++++++++++++++------------ 1 file changed, 126 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : ntdll: Fix RtlWow64GetCurrentMachine() result on ARM64EC.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: cf7c48e0366ec27dd946f2fcec12cb66f2e0cb23 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf7c48e0366ec27dd946f2fcec12cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 16:30:24 2024 +0100 ntdll: Fix RtlWow64GetCurrentMachine() result on ARM64EC. --- dlls/ntdll/loader.c | 5 ----- dlls/ntdll/ntdll_misc.h | 12 ++++++++++++ dlls/ntdll/process.c | 9 +++++---- dlls/ntdll/tests/wow64.c | 38 ++++++++++++++++---------------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4fc8af2662e..55065117a01 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -51,19 +51,14 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #ifdef __i386__ static const WCHAR pe_dir[] = L"\\i386-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_I386; #elif defined __x86_64__ static const WCHAR pe_dir[] = L"\\x86_64-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __arm__ static const WCHAR pe_dir[] = L"\\arm-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ static const WCHAR pe_dir[] = L"\\aarch64-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; #else static const WCHAR pe_dir[] = L""; -static const USHORT current_machine = IMAGE_FILE_MACHINE_UNKNOWN; #endif /* we don't want to include winuser.h */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e4094d341d8..58e29837cd0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -41,6 +41,18 @@ #define NTDLL_TLS_ERRNO 16 /* TLS slot for _errno() */ +#ifdef __i386__ +static const USHORT current_machine = IMAGE_FILE_MACHINE_I386; +#elif defined(__x86_64__) +static const USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined(__arm__) +static const USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined(__aarch64__) +static const USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; +#else +static const USHORT current_machine = IMAGE_FILE_MACHINE_UNKNOWN; +#endif + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) static const UINT_PTR page_size = 0x1000; #else diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index dcdb26f81d1..102e0c930a9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -94,10 +94,11 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) */ USHORT WINAPI RtlWow64GetCurrentMachine(void) { - USHORT current, native; - - RtlWow64GetProcessMachines( GetCurrentProcess(), &current, &native ); - return current ? current : native; + USHORT machine = current_machine; +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) RtlWow64GetCurrentCpuArea( &machine, NULL, NULL ); +#endif + return machine; } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index a1beb9a4997..aebff700940 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -289,7 +289,7 @@ static void test_query_architectures(void) STARTUPINFOA si = { sizeof(si) }; NTSTATUS status; HANDLE process; - ULONG len; + ULONG i, len; #ifdef __arm64ec__ BOOL is_arm64ec = TRUE; #else @@ -383,27 +383,21 @@ static void test_query_architectures(void) } if (pRtlWow64IsWowGuestMachineSupported) { - BOOLEAN ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_I386, &ret ); - ok( !status, "failed %lx\n", status ); - ok( ret == (native_machine == IMAGE_FILE_MACHINE_AMD64 || - native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARMNT, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret || native_machine == IMAGE_FILE_MACHINE_ARM64, "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_AMD64, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret || native_machine == IMAGE_FILE_MACHINE_ARM64, "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARM64, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret, "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( 0xdead, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret, "wrong result %u\n", ret ); + static const WORD machines[] = { IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_ARMNT, + IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_ARM64, 0xdead }; + + for (i = 0; i < ARRAY_SIZE(machines); i++) + { + BOOLEAN ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( machines[i], &ret ); + ok( !status, "failed %lx\n", status ); + if (is_machine_32bit( machines[i] ) && !is_machine_32bit( native_machine )) + ok( ret || machines[i] == IMAGE_FILE_MACHINE_ARMNT || + broken(current_machine == IMAGE_FILE_MACHINE_I386), /* win10-1607 wow64 */ + "%04x: got %u\n", machines[i], ret ); + else + ok( !ret, "%04x: got %u\n", machines[i], ret ); + } } }

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024