May 2021 - Wine-Commits - list.winehq.org

Hugh McMaster : reg: Remove two unused string resources.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: e4f3d51fdde4b762d2317ce7b2aa140ac030989b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f3d51fdde4b762d2317ce7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:20 2021 +1000 reg: Remove two unused string resources. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 44 ++++++++++++++++---------------------------- po/ast.po | 42 ++++++++++++++++-------------------------- po/bg.po | 44 ++++++++++++++++---------------------------- po/ca.po | 44 ++++++++++++++++---------------------------- po/cs.po | 44 ++++++++++++++++---------------------------- po/da.po | 44 ++++++++++++++++---------------------------- po/de.po | 44 ++++++++++++++++---------------------------- po/el.po | 42 ++++++++++++++++-------------------------- po/en.po | 44 ++++++++++++++++---------------------------- po/en_US.po | 44 ++++++++++++++++---------------------------- po/eo.po | 44 ++++++++++++++++---------------------------- po/es.po | 42 ++++++++++++++++-------------------------- po/fa.po | 43 ++++++++++++++++--------------------------- po/fi.po | 44 ++++++++++++++++---------------------------- po/fr.po | 46 ++++++++++++++++------------------------------ po/he.po | 44 ++++++++++++++++---------------------------- po/hi.po | 42 ++++++++++++++++-------------------------- po/hr.po | 44 ++++++++++++++++---------------------------- po/hu.po | 44 ++++++++++++++++---------------------------- po/it.po | 44 ++++++++++++++++---------------------------- po/ja.po | 43 ++++++++++++++++--------------------------- po/ko.po | 43 ++++++++++++++++--------------------------- po/lt.po | 42 ++++++++++++++++-------------------------- po/ml.po | 42 ++++++++++++++++-------------------------- po/nb_NO.po | 44 ++++++++++++++++---------------------------- po/nl.po | 44 ++++++++++++++++---------------------------- po/or.po | 42 ++++++++++++++++-------------------------- po/pa.po | 42 ++++++++++++++++-------------------------- po/pl.po | 44 ++++++++++++++++---------------------------- po/pt_BR.po | 44 ++++++++++++++++---------------------------- po/pt_PT.po | 44 ++++++++++++++++---------------------------- po/rm.po | 43 ++++++++++++++++--------------------------- po/ro.po | 44 ++++++++++++++++---------------------------- po/ru.po | 42 ++++++++++++++++-------------------------- po/si.po | 42 ++++++++++++++++-------------------------- po/sk.po | 44 ++++++++++++++++---------------------------- po/sl.po | 44 ++++++++++++++++---------------------------- po/sr_RS(a)cyrillic.po | 44 ++++++++++++++++---------------------------- po/sr_RS(a)latin.po | 44 ++++++++++++++++---------------------------- po/sv.po | 43 ++++++++++++++++--------------------------- po/ta.po | 42 ++++++++++++++++-------------------------- po/te.po | 42 ++++++++++++++++-------------------------- po/th.po | 43 ++++++++++++++++--------------------------- po/tr.po | 42 ++++++++++++++++-------------------------- po/uk.po | 43 ++++++++++++++++--------------------------- po/wa.po | 43 ++++++++++++++++--------------------------- po/wine.pot | 42 ++++++++++++++++-------------------------- po/zh_CN.po | 42 ++++++++++++++++-------------------------- po/zh_TW.po | 44 ++++++++++++++++---------------------------- programs/reg/reg.rc | 2 -- programs/reg/resource.h | 2 -- 51 files changed, 784 insertions(+), 1340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f3d51fdde4b762d231…

1 0

Rémi Bernon : server: Send HID report data with the WM_INPUT messages.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: fc64aa7e7cdf715738ed411afb4da69064939a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc64aa7e7cdf715738ed411a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 16:12:21 2021 +0200 server: Send HID report data with the WM_INPUT messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 5 ++++- dlls/user32/rawinput.c | 4 ++-- include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 3 +++ server/queue.c | 15 ++++++++++++++- server/request.h | 6 +++--- server/trace.c | 5 +++-- tools/make_requests | 2 +- 8 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 886c10e36bd..6f0f58a5f3f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3298,11 +3298,14 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r switch (rawinput->header.dwType) { case RIM_TYPEHID: - assert( rawinput->data.hid.dwCount <= 1 ); 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.count = rawinput->data.hid.dwCount; + req->input.hw.rawinput.hid.length = rawinput->data.hid.dwSizeHid; + wine_server_add_data( req, rawinput->data.hid.bRawData, + rawinput->data.hid.dwCount * rawinput->data.hid.dwSizeHid ); break; default: assert( 0 ); diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 87f7175a6c1..41d627c62c2 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -397,8 +397,8 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms rawinput->header.hDevice = ULongToHandle( msg_data->rawinput.hid.device ); rawinput->header.wParam = 0; - rawinput->data.hid.dwCount = 0; - rawinput->data.hid.dwSizeHid = 0; + rawinput->data.hid.dwCount = msg_data->rawinput.hid.count; + rawinput->data.hid.dwSizeHid = msg_data->rawinput.hid.length; memcpy( rawinput->data.hid.bRawData, msg_data + 1, size ); } else diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 96b91c503a9..83b6bdb3e22 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -286,6 +286,8 @@ union rawinput unsigned int param; unsigned short usage_page; unsigned short usage; + unsigned int count; + unsigned int length; } hid; }; @@ -2763,7 +2765,8 @@ struct send_hardware_message_request user_handle_t win; hw_input_t input; unsigned int flags; - char __pad_52[4]; + /* VARARG(report,bytes); */ + char __pad_60[4]; }; struct send_hardware_message_reply { @@ -6309,7 +6312,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 709 +#define SERVER_PROTOCOL_VERSION 710 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 142064d30d3..8a68c9a5eb7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -302,6 +302,8 @@ union rawinput unsigned int param; /* rawinput message param */ unsigned short usage_page;/* HID usage page */ unsigned short usage; /* HID usage */ + unsigned int count; /* HID report count */ + unsigned int length; /* HID report length */ } hid; }; @@ -2068,6 +2070,7 @@ enum message_type user_handle_t win; /* window handle */ hw_input_t input; /* input data */ unsigned int flags; /* flags (see below) */ + VARARG(report,bytes); /* HID report data */ @REPLY int wait; /* do we need to wait for a reply? */ int prev_x; /* previous cursor position */ diff --git a/server/queue.c b/server/queue.c index 76ee469ffef..e4903bcb79f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1995,6 +1995,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ struct hardware_msg_data *msg_data; struct rawinput_message raw_msg; struct message *msg; + data_size_t report_size = 0; switch (input->hw.msg) { @@ -2007,9 +2008,21 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ raw_msg.message = input->hw.msg; raw_msg.hid_report = NULL; + 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; + } + + if (report_size != get_req_data_size()) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + msg_data = &raw_msg.data; msg_data->info = 0; - msg_data->size = sizeof(*msg_data); + msg_data->size = sizeof(*msg_data) + report_size; msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; diff --git a/server/request.h b/server/request.h index cd65f79c757..ddf356c3e3f 100644 --- a/server/request.h +++ b/server/request.h @@ -693,7 +693,7 @@ C_ASSERT( sizeof(client_ptr_t) == 8 ); C_ASSERT( sizeof(data_size_t) == 4 ); C_ASSERT( sizeof(file_pos_t) == 8 ); C_ASSERT( sizeof(generic_map_t) == 16 ); -C_ASSERT( sizeof(hw_input_t) == 32 ); +C_ASSERT( sizeof(hw_input_t) == 40 ); C_ASSERT( sizeof(int) == 4 ); C_ASSERT( sizeof(ioctl_code_t) == 4 ); C_ASSERT( sizeof(irp_params_t) == 32 ); @@ -1355,8 +1355,8 @@ C_ASSERT( FIELD_OFFSET(struct post_quit_message_request, exit_code) == 12 ); C_ASSERT( sizeof(struct post_quit_message_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, win) == 12 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, input) == 16 ); -C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, flags) == 48 ); -C_ASSERT( sizeof(struct send_hardware_message_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, flags) == 56 ); +C_ASSERT( sizeof(struct send_hardware_message_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, prev_x) == 12 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, prev_y) == 16 ); diff --git a/server/trace.c b/server/trace.c index cebcc217e3a..8bfc9e56cc5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -404,9 +404,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}", + 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.usage, rawinput->hid.count, rawinput->hid.length ); break; default: fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type ); @@ -2727,6 +2727,7 @@ static void dump_send_hardware_message_request( const struct send_hardware_messa fprintf( stderr, " win=%08x", req->win ); dump_hw_input( ", input=", &req->input ); fprintf( stderr, ", flags=%08x", req->flags ); + dump_varargs_bytes( ", report=", cur_size ); } static void dump_send_hardware_message_reply( const struct send_hardware_message_reply *req ) diff --git a/tools/make_requests b/tools/make_requests index a70b29df3d2..1c4e5977c8b 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -52,7 +52,7 @@ my %formats = "luid_t" => [ 8, 4, "&dump_luid" ], "generic_map_t" => [ 16, 4, "&dump_generic_map" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], - "hw_input_t" => [ 32, 8, "&dump_hw_input" ], + "hw_input_t" => [ 40, 8, "&dump_hw_input" ], ); my @requests = ();

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 96ab7b4430011153734119b3ef969f363aef0634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ab7b4430011153734119b3… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat May 29 16:51:39 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Bob <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 633 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 330 insertions(+), 303 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96ab7b44300111537341…

1 0

Piotr Caban : msvcrt: Import tanh implementation from musl.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 3171dccbef835f85852c50e3dc3f37337e76932c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3171dccbef835f85852c50e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:52 2021 +0200 msvcrt: Import tanh implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 44 +++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 05571a7fe20..6d60a6fa086 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2834,9 +2834,47 @@ double CDECL tan( double x ) */ double CDECL tanh( double x ) { - double ret = unix_funcs->tanh(x); - if (isnan(x)) return math_error(_DOMAIN, "tanh", x, 0, ret); - return ret; + UINT64 ui = *(UINT64*)&x; + UINT32 w; + int sign; + double t; + + /* x = |x| */ + sign = ui >> 63; + ui &= (UINT64)-1 / 2; + x = *(double*)&ui; + w = ui >> 32; + + if (w > 0x3fe193ea) { + /* |x| > log(3)/2 ~= 0.5493 or nan */ + if (w > 0x40340000) { +#if _MSVCR_VER < 140 + if (isnan(x)) + return math_error(_DOMAIN, "tanh", x, 0, x); +#endif + /* |x| > 20 or nan */ + /* note: this branch avoids raising overflow */ + fp_barrier(x + 0x1p120f); + t = 1 - 0 / x; + } else { + t = __expm1(2 * x); + t = 1 - 2 / (t + 2); + } + } else if (w > 0x3fd058ae) { + /* |x| > log(5/3)/2 ~= 0.2554 */ + t = __expm1(2 * x); + t = t / (t + 2); + } else if (w >= 0x00100000) { + /* |x| >= 0x1p-1022, up to 2ulp error in [0.1,0.2554] */ + t = __expm1(-2 * x); + t = -t / (t + 2); + } else { + /* |x| is subnormal */ + /* note: the branch above would not raise underflow in [0x1p-1023,0x1p-1022) */ + fp_barrier((float)x); + t = x; + } + return sign ? -t : t; } diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 918c7e6ed71..ce4a3eed094 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * tanh - */ -static double CDECL unix_tanh( double x ) -{ - return tanh( x ); -} - /********************************************************************* * tanhf */ @@ -335,7 +327,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_tanh, unix_tanhf, unix_tgamma, unix_tgammaf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 0e3074be0c5..a95aae74dea 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x);

1 0

Rémi Bernon : server: Support variable sized hardware_msg_data allocation.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 109de6087374459d7656ab45240d2e2edae64a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=109de6087374459d7656ab45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 16:12:20 2021 +0200 server: Support variable sized hardware_msg_data allocation. The RIM_TYPEHID messages will have to carry the variable length HID report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/server/queue.c b/server/queue.c index 6c59b02a9b6..76ee469ffef 100644 --- a/server/queue.c +++ b/server/queue.c @@ -348,13 +348,13 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ /* allocate a hardware message and its data */ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_source source, - unsigned int time ) + unsigned int time, data_size_t extra_size ) { struct hardware_msg_data *msg_data; struct message *msg; if (!(msg = mem_alloc( sizeof(*msg) ))) return NULL; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) + if (!(msg_data = mem_alloc( sizeof(*msg_data) + extra_size ))) { free( msg ); return NULL; @@ -363,9 +363,9 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour msg->type = MSG_HARDWARE; msg->time = time; msg->data = msg_data; - msg->data_size = sizeof(*msg_data); + msg->data_size = sizeof(*msg_data) + extra_size; - memset( msg_data, 0, sizeof(*msg_data) ); + memset( msg_data, 0, sizeof(*msg_data) + extra_size ); msg_data->info = info; msg_data->size = msg->data_size; msg_data->source = source; @@ -399,7 +399,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) return; } - if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; msg->msg = WM_MOUSEMOVE; msg->x = x; @@ -1665,6 +1665,7 @@ struct rawinput_message unsigned int time; unsigned int message; struct hardware_msg_data data; + const void *hid_report; }; /* check if process is supposed to receive a WM_INPUT message and eventually queue it */ @@ -1676,6 +1677,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) struct desktop *target_desktop = NULL, *desktop = NULL; struct thread *target_thread = NULL, *foreground = NULL; struct message *msg; + data_size_t report_size; int wparam = RIM_INPUT; if (raw_msg->data.rawinput.type == RIM_TYPEMOUSE) @@ -1703,7 +1705,10 @@ static int queue_rawinput_message( struct process* process, void *arg ) wparam = RIM_INPUTSINK; } - if (!(msg = alloc_hardware_message( raw_msg->data.info, raw_msg->source, raw_msg->time ))) + 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; msg->win = device->target; @@ -1711,6 +1716,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) 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) { @@ -1792,6 +1798,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; + raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = input->mouse.info; @@ -1818,7 +1825,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (!(flags & (1 << i))) continue; flags &= ~(1 << i); - if (!(msg = alloc_hardware_message( input->mouse.info, source, time ))) return 0; + if (!(msg = alloc_hardware_message( input->mouse.info, source, time, 0 ))) return 0; msg_data = msg->data; msg->win = get_user_full_handle( win ); @@ -1928,6 +1935,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; + raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = input->kbd.info; @@ -1948,7 +1956,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c return 0; } - if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0; msg_data = msg->data; msg->win = get_user_full_handle( win ); @@ -1997,6 +2005,7 @@ 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; + raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = 0; @@ -2010,7 +2019,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ return; } - if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; msg->win = get_user_full_handle( win ); msg->msg = input->hw.msg;

1 0

Rémi Bernon : user32: Implement WM_INPUT / RIM_TYPEHID message dispatch.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 1128a37e77bd02e43d0612e506a743508f8ecd4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1128a37e77bd02e43d0612e5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 16:12:19 2021 +0200 user32: Implement WM_INPUT / RIM_TYPEHID message dispatch. Without any HID report data for now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 9 +++++++++ dlls/user32/rawinput.c | 30 ++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ server/queue.c | 1 + server/trace.c | 1 + 5 files changed, 43 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index be178072e6f..886c10e36bd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3255,6 +3255,14 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r hid_usage_page = ((USAGE *)rawinput->data.hid.bRawData)[0]; hid_usage = ((USAGE *)rawinput->data.hid.bRawData)[1]; } + if (input->u.hi.uMsg == WM_INPUT) + { + if (!rawinput_device_get_usages( rawinput->header.hDevice, &hid_usage_page, &hid_usage )) + { + WARN( "unable to get HID usages for device %p\n", rawinput->header.hDevice ); + return STATUS_INVALID_HANDLE; + } + } } SERVER_START_REQ( send_hardware_message ) @@ -3284,6 +3292,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); switch (input->u.hi.uMsg) { + case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: req->input.hw.rawinput.type = rawinput->header.dwType; switch (rawinput->header.dwType) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index efc736625d5..87f7175a6c1 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -267,6 +267,21 @@ static struct device *find_device_from_handle(HANDLE handle) } +BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage) +{ + struct device *device; + + *usage_page = *usage = 0; + + if (!(device = find_device_from_handle(handle))) return FALSE; + if (device->info.dwType != RIM_TYPEHID) return FALSE; + + *usage_page = device->info.u.hid.usUsagePage; + *usage = device->info.u.hid.usUsage; + return TRUE; +} + + struct rawinput_thread_data *rawinput_thread_data(void) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -280,6 +295,8 @@ struct rawinput_thread_data *rawinput_thread_data(void) BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data) { + SIZE_T size; + rawinput->header.dwType = msg_data->rawinput.type; if (msg_data->rawinput.type == RIM_TYPEMOUSE) { @@ -371,6 +388,19 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms rawinput->data.keyboard.Message = msg_data->rawinput.kbd.message; rawinput->data.keyboard.ExtraInformation = msg_data->info; } + else if (msg_data->rawinput.type == RIM_TYPEHID) + { + size = msg_data->size - sizeof(*msg_data); + if (size > rawinput->header.dwSize - sizeof(*rawinput)) return FALSE; + + rawinput->header.dwSize = FIELD_OFFSET( RAWINPUT, data.hid.bRawData ) + size; + rawinput->header.hDevice = ULongToHandle( msg_data->rawinput.hid.device ); + rawinput->header.wParam = 0; + + rawinput->data.hid.dwCount = 0; + rawinput->data.hid.dwSizeHid = 0; + memcpy( rawinput->data.hid.bRawData, msg_data + 1, size ); + } else { FIXME("Unhandled rawinput type %#x.\n", msg_data->rawinput.type); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index cb780f0c963..0838ba28b32 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -28,6 +28,7 @@ #include "winuser.h" #include "winreg.h" #include "winternl.h" +#include "hidusage.h" #include "wine/heap.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) @@ -239,6 +240,7 @@ struct tagWND; struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); +extern BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage); extern struct rawinput_thread_data *rawinput_thread_data(void); extern void keyboard_init(void) DECLSPEC_HIDDEN; diff --git a/server/queue.c b/server/queue.c index 07d4c7e0885..6c59b02a9b6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1990,6 +1990,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ switch (input->hw.msg) { + case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: raw_msg.foreground = NULL; raw_msg.desktop = NULL; diff --git a/server/trace.c b/server/trace.c index 7125c6f4370..cebcc217e3a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -436,6 +436,7 @@ static void dump_hw_input( const char *prefix, const hw_input_t *input ) dump_uint64( ",lparam=", &input->hw.lparam ); switch (input->hw.msg) { + case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: dump_rawinput( ",rawinput=", &input->hw.rawinput ); }

1 0

Rémi Bernon : user32: Inform rawinput_from_hardware_message of available buffer size.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: ae7458aca6d174212b03d37e7daabb8deafb5e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7458aca6d174212b03d37e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 16:12:18 2021 +0200 user32: Inform rawinput_from_hardware_message of available buffer size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 1 + dlls/user32/rawinput.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9af33c3291e..be178072e6f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2292,6 +2292,7 @@ static BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardwar if (msg->message == WM_INPUT) { + thread_data->buffer->header.dwSize = RAWINPUT_BUFFER_SIZE; if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; thread_data->hw_id = hw_id; msg->lParam = (LPARAM)hw_id; diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 115513ea144..efc736625d5 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -564,7 +564,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, struct hardware_msg_data *msg_data; struct rawinput_thread_data *thread_data; RAWINPUT *rawinput; - UINT count = 0, rawinput_size, next_size, overhead; + UINT count = 0, remaining, rawinput_size, next_size, overhead; BOOL is_wow64; int i; @@ -617,12 +617,15 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, } SERVER_END_REQ; + remaining = *data_size; for (i = 0; i < count; ++i) { - rawinput_from_hardware_message(data, msg_data); + data->header.dwSize = remaining; + if (!rawinput_from_hardware_message(data, msg_data)) break; if (overhead) memmove((char *)&data->data + overhead, &data->data, data->header.dwSize - sizeof(RAWINPUTHEADER)); data->header.dwSize += overhead; + remaining -= data->header.dwSize; data = NEXTRAWINPUTBLOCK(data); msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size); }

1 0

Rémi Bernon : dinput: Factor out device creation interface queries.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 17958bc8631c574df3cf83343d3a813d2bc81128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17958bc8631c574df3cf8334… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:55 2021 +0200 dinput: Factor out device creation interface queries. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 32 +++++++++++++++----------------- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick_linux.c | 34 ++++------------------------------ dlls/dinput/joystick_linuxinput.c | 34 ++++------------------------------ dlls/dinput/joystick_osx.c | 33 ++++----------------------------- dlls/dinput/keyboard.c | 35 ++++------------------------------- dlls/dinput/mouse.c | 34 ++++------------------------------ 7 files changed, 36 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17958bc8631c574df3cf…

1 0

Rémi Bernon : server: Add hardware_msg_data size for variable size messages.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: e8498788e8dd8be128d3425806dd47315d04f6b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8498788e8dd8be128d34258… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 28 16:12:17 2021 +0200 server: Add hardware_msg_data size for variable size messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 +- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/queue.c | 15 ++++++++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e4e7bad508f..115513ea144 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -624,7 +624,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, data->header.dwSize - sizeof(RAWINPUTHEADER)); data->header.dwSize += overhead; data = NEXTRAWINPUTBLOCK(data); - msg_data++; + msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size); } if (count == 0 && next_size == 0) *data_size = 0; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e200bd670fc..96b91c503a9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -292,6 +292,8 @@ union rawinput struct hardware_msg_data { lparam_t info; + data_size_t size; + int __pad; unsigned int hw_id; unsigned int flags; struct hw_msg_source source; @@ -6307,7 +6309,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 708 +#define SERVER_PROTOCOL_VERSION 709 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 93e2f56e037..142064d30d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -308,6 +308,8 @@ union rawinput struct hardware_msg_data { lparam_t info; /* extra info */ + data_size_t size; /* size of hardware message data */ + int __pad; unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ diff --git a/server/queue.c b/server/queue.c index 5d65e030112..07d4c7e0885 100644 --- a/server/queue.c +++ b/server/queue.c @@ -367,6 +367,7 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour memset( msg_data, 0, sizeof(*msg_data) ); msg_data->info = info; + msg_data->size = msg->data_size; msg_data->source = source; return msg; } @@ -1794,6 +1795,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons 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; @@ -1929,6 +1931,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c 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; @@ -1996,6 +1999,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data = &raw_msg.data; msg_data->info = 0; + msg_data->size = sizeof(*msg_data); msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; @@ -3295,16 +3299,17 @@ DECL_HANDLER(get_rawinput_buffer) { struct message *msg = LIST_ENTRY( ptr, struct message, entry ); struct hardware_msg_data *data = msg->data; + data_size_t extra_size = data->size - sizeof(*data); ptr = list_next( &input->msg_list, ptr ); if (msg->msg != WM_INPUT) continue; - next_size = req->rawinput_size; + next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + sizeof(*data) > buf + get_reply_max_size()) break; - if (cur + sizeof(*data) > buf + buf_size) + if (cur + data->size > buf + get_reply_max_size()) break; + if (cur + data->size > buf + buf_size) { - buf_size += buf_size / 2; + buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { set_error( STATUS_NO_MEMORY ); @@ -3314,7 +3319,7 @@ DECL_HANDLER(get_rawinput_buffer) buf = tmp; } - memcpy(cur, data, sizeof(*data)); + memcpy( cur, data, data->size ); list_remove( &msg->entry ); free_message( msg );

1 0

Piotr Caban : msvcrt: Import tanhf implementation from musl.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: bb9f97c4d13151d05ebb6aa24c3e0f6b8cab7bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9f97c4d13151d05ebb6aa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:55 2021 +0200 msvcrt: Import tanhf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6d60a6fa086..0bace98cd7d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1512,9 +1512,43 @@ float CDECL tanf( float x ) */ float CDECL tanhf( float x ) { - float ret = unix_funcs->tanhf(x); - if (!isfinite(x)) return math_error(_DOMAIN, "tanhf", x, 0, ret); - return ret; + UINT32 ui = *(UINT32*)&x; + int sign; + float t; + + /* x = |x| */ + sign = ui >> 31; + ui &= 0x7fffffff; + x = *(float*)&ui; + + if (ui > 0x3f0c9f54) { + /* |x| > log(3)/2 ~= 0.5493 or nan */ + if (ui > 0x41200000) { +#if _MSVCR_VER < 140 + if (isnan(x)) + return math_error(_DOMAIN, "tanhf", x, 0, x); +#endif + /* |x| > 10 */ + fp_barrierf(x + 0x1p120f); + t = 1 + 0 / x; + } else { + t = __expm1f(2 * x); + t = 1 - 2 / (t + 2); + } + } else if (ui > 0x3e82c578) { + /* |x| > log(5/3)/2 ~= 0.2554 */ + t = __expm1f(2 * x); + t = t / (t + 2); + } else if (ui >= 0x00800000) { + /* |x| >= 0x1p-126 */ + t = __expm1f(-2 * x); + t = -t / (t + 2); + } else { + /* |x| is subnormal */ + fp_barrierf(x * x); + t = x; + } + return sign ? -t : t; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index ce4a3eed094..d92203c1ab7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * tanhf - */ -static float CDECL unix_tanhf( float x ) -{ - return tanhf( x ); -} - /********************************************************************* * tgamma */ @@ -327,7 +319,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_tanhf, unix_tgamma, unix_tgammaf, }; diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a95aae74dea..a01ce285106 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); };

1 0