February 2024 - Wine-Commits

Rémi Bernon : win32u: Get rid of the rawinput thread data and buffer.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 87e5bdaa4a0442c0bf2829a86d86b548d912a3ef URL: https://gitlab.winehq.org/wine/wine/-/commit/87e5bdaa4a0442c0bf2829a86d86b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 1 08:42:33 2024 +0100 win32u: Get rid of the rawinput thread data and buffer. --- dlls/win32u/ntuser_private.h | 12 +--- dlls/win32u/rawinput.c | 142 +++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 97 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 11bb7f4baf6..3b6cab5bdc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,16 +38,6 @@ enum system_timer_id SYSTEM_TIMER_KEY_REPEAT = 0xfff0, }; -struct rawinput_thread_data -{ - UINT hw_id; /* current rawinput message id */ - RAWINPUT buffer[1]; /* rawinput message data buffer */ -}; - -/* on windows the buffer capacity is quite large as well, enough to */ -/* hold up to 10s of 1kHz mouse rawinput events */ -#define RAWINPUT_BUFFER_SIZE (512 * 1024) - struct user_object { HANDLE handle; @@ -133,7 +123,7 @@ struct user_thread_info MSG key_repeat_msg; /* Last WM_KEYDOWN message to repeat */ HKL kbd_layout; /* Current keyboard layout */ UINT kbd_layout_id; /* Current keyboard layout ID */ - struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ + struct hardware_msg_data *rawinput; /* Current rawinput message data */ UINT spy_indent; /* Current spy indent */ BOOL clipping_cursor; /* thread is currently clipping */ DWORD clipping_reset; /* time when clipping was last reset */ diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index e4f43091b9b..1120ce053aa 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -52,51 +52,6 @@ typedef struct } RAWINPUTHEADER64; #endif -static struct rawinput_thread_data *get_rawinput_thread_data(void) -{ - struct user_thread_info *thread_info = get_user_thread_info(); - struct rawinput_thread_data *data = thread_info->rawinput; - if (data) return data; - data = thread_info->rawinput = calloc( 1, RAWINPUT_BUFFER_SIZE + sizeof(struct user_thread_info) ); - return data; -} - -static BOOL rawinput_from_hardware_message( RAWINPUT *rawinput, const struct hardware_msg_data *msg_data ) -{ - SIZE_T size = msg_data->size - sizeof(*msg_data); - if (sizeof(RAWINPUTHEADER) + size > rawinput->header.dwSize) return FALSE; - - rawinput->header.dwType = msg_data->rawinput.type; - rawinput->header.dwSize = sizeof(RAWINPUTHEADER) + size; - rawinput->header.hDevice = UlongToHandle( msg_data->rawinput.device ); - rawinput->header.wParam = msg_data->rawinput.wparam; - - if (msg_data->rawinput.type == RIM_TYPEMOUSE) - { - if (size != sizeof(RAWMOUSE)) return FALSE; - rawinput->data.mouse = *(RAWMOUSE *)(msg_data + 1); - } - else if (msg_data->rawinput.type == RIM_TYPEKEYBOARD) - { - if (size != sizeof(RAWKEYBOARD)) return FALSE; - rawinput->data.keyboard = *(RAWKEYBOARD *)(msg_data + 1); - } - else if (msg_data->rawinput.type == RIM_TYPEHID) - { - RAWHID *hid = (RAWHID *)(msg_data + 1); - if (size < offsetof(RAWHID, bRawData[0])) return FALSE; - if (size != offsetof(RAWHID, bRawData[hid->dwCount * hid->dwSizeHid])) return FALSE; - memcpy( &rawinput->data.hid, msg_data + 1, size ); - } - else - { - FIXME( "Unhandled rawinput type %#x.\n", msg_data->rawinput.type ); - return FALSE; - } - - return TRUE; -} - struct device { HANDLE file; @@ -552,69 +507,83 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade /********************************************************************** * NtUserGetRawInputData (win32u.@) */ -UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, UINT *data_size, UINT header_size ) +UINT WINAPI NtUserGetRawInputData( HRAWINPUT handle, UINT command, void *data, UINT *data_size, UINT header_size ) { - struct rawinput_thread_data *thread_data; - UINT size; - - TRACE( "rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", - rawinput, command, data, data_size, header_size ); + struct user_thread_info *thread_info = get_user_thread_info(); + struct hardware_msg_data *msg_data; + RAWINPUT *rawinput = data; + UINT size = 0; - if (!(thread_data = get_rawinput_thread_data())) - { - RtlSetLastWin32Error( ERROR_OUTOFMEMORY ); - return ~0u; - } + TRACE( "handle %p, command %#x, data %p, data_size %p, header_size %u.\n", + handle, command, data, data_size, header_size ); - if (!rawinput || thread_data->hw_id != (UINT_PTR)rawinput) + if (!(msg_data = thread_info->rawinput) || msg_data->hw_id != (UINT_PTR)handle) { RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); - return ~0u; + return -1; } if (header_size != sizeof(RAWINPUTHEADER)) { WARN( "Invalid structure size %u.\n", header_size ); RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); - return ~0u; - } - - switch (command) - { - case RID_INPUT: - size = thread_data->buffer->header.dwSize; - break; - - case RID_HEADER: - size = sizeof(RAWINPUTHEADER); - break; - - default: - RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); - return ~0u; + return -1; } + if (command != RID_HEADER && command != RID_INPUT) goto failed; + if (command == RID_INPUT) size = msg_data->size - sizeof(*msg_data); if (!data) { - *data_size = size; + *data_size = sizeof(RAWINPUTHEADER) + size; return 0; } - if (*data_size < size) + if (*data_size < sizeof(RAWINPUTHEADER) + size) { RtlSetLastWin32Error( ERROR_INSUFFICIENT_BUFFER ); - return ~0u; + return -1; + } + + rawinput->header.dwType = msg_data->rawinput.type; + rawinput->header.dwSize = sizeof(RAWINPUTHEADER) + msg_data->size - sizeof(*msg_data); + rawinput->header.hDevice = UlongToHandle( msg_data->rawinput.device ); + rawinput->header.wParam = msg_data->rawinput.wparam; + if (command == RID_HEADER) return sizeof(RAWINPUTHEADER); + + if (msg_data->rawinput.type == RIM_TYPEMOUSE) + { + if (size != sizeof(RAWMOUSE)) goto failed; + rawinput->data.mouse = *(RAWMOUSE *)(msg_data + 1); + } + else if (msg_data->rawinput.type == RIM_TYPEKEYBOARD) + { + if (size != sizeof(RAWKEYBOARD)) goto failed; + rawinput->data.keyboard = *(RAWKEYBOARD *)(msg_data + 1); + } + else if (msg_data->rawinput.type == RIM_TYPEHID) + { + RAWHID *hid = (RAWHID *)(msg_data + 1); + if (size < offsetof(RAWHID, bRawData[0])) goto failed; + if (size != offsetof(RAWHID, bRawData[hid->dwCount * hid->dwSizeHid])) goto failed; + memcpy( &rawinput->data.hid, msg_data + 1, size ); + } + else + { + FIXME( "Unhandled rawinput type %#x.\n", msg_data->rawinput.type ); + goto failed; } - memcpy( data, thread_data->buffer, size ); - return size; + + return rawinput->header.dwSize; + +failed: + WARN( "Invalid command %u or data size %u.\n", command, size ); + RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + return -1; } BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) { - struct rawinput_thread_data *thread_data; - - if (!(thread_data = get_rawinput_thread_data())) - return FALSE; + struct user_thread_info *thread_info = get_user_thread_info(); if (msg->message == WM_INPUT_DEVICE_CHANGE) { @@ -624,9 +593,10 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d } else { - 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; + struct hardware_msg_data *tmp; + if (!(tmp = realloc( thread_info->rawinput, msg_data->size ))) return FALSE; + memcpy( tmp, msg_data, msg_data->size ); + thread_info->rawinput = tmp; msg->lParam = (LPARAM)hw_id; }

1 0

Giovanni Mascellani : tests: Release the code blob in test_thread_id() (Valgrind).
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: vkd3d Branch: master Commit: 2359ebc976c0882092825c5ddac757dd138fe48c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2359ebc976c0882092825c5ddac75… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 1 12:56:27 2024 +0100 tests: Release the code blob in test_thread_id() (Valgrind). --- tests/hlsl_d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 28007e3a..b2273ffb 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -525,6 +525,7 @@ static void test_thread_id(void) cs_code = compile_shader(cs_source, "cs_5_0"); context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, shader_bytecode(ID3D10Blob_GetBufferPointer(cs_code), ID3D10Blob_GetBufferSize(cs_code))); + ID3D10Blob_Release(cs_code); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Free the individual attributes in func_prototype (Valgrind).
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: vkd3d Branch: master Commit: a10de1b239f543dafd555d341a00efc7a1324a7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a10de1b239f543dafd555d341a00e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 1 12:46:01 2024 +0100 vkd3d-shader/hlsl: Free the individual attributes in func_prototype (Valgrind). --- libs/vkd3d-shader/hlsl.y | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6249808a..06aa51a8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5807,7 +5807,11 @@ func_prototype: } else { - free($1.attrs); + unsigned int i; + + for (i = 0; i < $1.count; ++i) + hlsl_free_attribute((void *)$1.attrs[i]); + vkd3d_free($1.attrs); } $$ = $2; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Free the selector in postfix_expr (Valgrind).
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: vkd3d Branch: master Commit: 5905489b7f617e5e517b9a1f3b510e4d3b72e465 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5905489b7f617e5e517b9a1f3b510… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 1 12:52:40 2024 +0100 vkd3d-shader/hlsl: Free the selector in postfix_expr (Valgrind). --- libs/vkd3d-shader/hlsl.y | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 06aa51a8..5f6334a4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -7073,12 +7073,17 @@ postfix_expr: if (!(field = get_struct_field(type->e.record.fields, type->e.record.field_count, $3))) { hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Field \"%s\" is not defined.", $3); + vkd3d_free($3); YYABORT; } field_idx = field - type->e.record.fields; if (!add_record_access(ctx, $1, node, field_idx, &@2)) + { + vkd3d_free($3); YYABORT; + } + vkd3d_free($3); $$ = $1; } else if (hlsl_is_numeric_type(node->data_type)) @@ -7088,14 +7093,17 @@ postfix_expr: if (!(swizzle = get_swizzle(ctx, node, $3, &@3))) { hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid swizzle \"%s\".", $3); + vkd3d_free($3); YYABORT; } hlsl_block_add_instr($1, swizzle); + vkd3d_free($3); $$ = $1; } else { hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid subscript \"%s\".", $3); + vkd3d_free($3); YYABORT; } }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Free variable identifiers in primary_expr (Valgrind).
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: vkd3d Branch: master Commit: 521082afbeecf95feb8ff0f9681aa09c9f5be92e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/521082afbeecf95feb8ff0f9681aa… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 1 12:18:33 2024 +0100 vkd3d-shader/hlsl: Free variable identifiers in primary_expr (Valgrind). --- libs/vkd3d-shader/hlsl.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8dc353e1..5926f495 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6992,8 +6992,10 @@ primary_expr: if (!(var = hlsl_get_var(ctx->cur_scope, $1))) { hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Variable \"%s\" is not defined.", $1); + vkd3d_free($1); YYABORT; } + vkd3d_free($1); if (!(load = hlsl_new_var_load(ctx, var, &@1))) YYABORT; if (!($$ = make_block(ctx, &load->node)))

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Free the parse initializer in attribute (Valgrind).
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: vkd3d Branch: master Commit: 049327a2701409640f9787350cfaeac4efbf6a1a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/049327a2701409640f9787350cfae… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 1 12:45:17 2024 +0100 vkd3d-shader/hlsl: Free the parse initializer in attribute (Valgrind). --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5926f495..6249808a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5572,11 +5572,11 @@ attribute: $$->name = $2; hlsl_block_init(&$$->instrs); hlsl_block_add_block(&$$->instrs, $4.instrs); - vkd3d_free($4.instrs); $$->loc = @$; $$->args_count = $4.args_count; for (i = 0; i < $4.args_count; ++i) hlsl_src_from_node(&$$->args[i], $4.args[i]); + free_parse_initializer(&$4); } attribute_list:

1 0

Ivo Ivanov : winebus.sys: Prefer hidraw if it is the only backend enabled.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 9a0e244d518f61101370ef8238b7afd4e973ad5a URL: https://gitlab.winehq.org/wine/wine/-/commit/9a0e244d518f61101370ef8238b7af… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Feb 3 18:18:36 2024 +0200 winebus.sys: Prefer hidraw if it is the only backend enabled. --- dlls/winebus.sys/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2476e3a9cdb..fa0a9a998d7 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -412,6 +412,9 @@ static BOOL is_hidraw_enabled(WORD vid, WORD pid) if (check_bus_option(L"DisableHidraw", FALSE)) return FALSE; + if (!check_bus_option(L"Enable SDL", 1) && check_bus_option(L"DisableInput", 0)) + prefer_hidraw = TRUE; + if (is_dualshock4_gamepad(vid, pid)) prefer_hidraw = TRUE; if (is_dualsense_gamepad(vid, pid)) prefer_hidraw = TRUE;

1 0

Marc-Aurel Zent : ntdll: Fix DW_OP_abs absolute value warning on labs() for clang.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: 51b6a0fe129aa5382e96b8455e81449edfd8f46d URL: https://gitlab.winehq.org/wine/wine/-/commit/51b6a0fe129aa5382e96b8455e8144… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Thu Feb 8 13:22:18 2024 +0100 ntdll: Fix DW_OP_abs absolute value warning on labs() for clang. --- dlls/ntdll/unix/dwarf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index 73beeda51fc..166b5e64983 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -912,7 +912,7 @@ static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context, case DW_OP_pick: stack[sp + 1] = stack[sp - dwarf_get_u1(&p)]; sp++; break; case DW_OP_swap: tmp = stack[sp]; stack[sp] = stack[sp-1]; stack[sp-1] = tmp; break; case DW_OP_rot: tmp = stack[sp]; stack[sp] = stack[sp-1]; stack[sp-1] = stack[sp-2]; stack[sp-2] = tmp; break; - case DW_OP_abs: stack[sp] = labs(stack[sp]); break; + case DW_OP_abs: stack[sp] = labs((LONG_PTR)stack[sp]); break; case DW_OP_neg: stack[sp] = -stack[sp]; break; case DW_OP_not: stack[sp] = ~stack[sp]; break; case DW_OP_and: stack[sp-1] &= stack[sp]; sp--; break;

1 0

Alex Henrie : explorer: Handle the back and forward buttons of a 5-button mouse.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

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

Yuxuan Shui : mf: Only preroll when starting from stopped state.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: 97d4c7fe3f5a4743f5949e8544c88a807ecebb42 URL: https://gitlab.winehq.org/wine/wine/-/commit/97d4c7fe3f5a4743f5949e8544c88a… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Feb 7 15:38:26 2024 +0000 mf: Only preroll when starting from stopped state. Stream sink such as evr can't be prerolled a second time, and when we are restarting from a paused state, those stream sink will already be prerolled so don't preroll them again. Otherwise we will be waiting for Prerolled events that will never come. --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b5472569595..9074ad2de25 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2979,7 +2979,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn return; } - if (session->presentation.flags & SESSION_FLAG_NEEDS_PREROLL) + if ((session->presentation.flags & SESSION_FLAG_NEEDS_PREROLL) && session_is_output_nodes_state(session, OBJ_STATE_STOPPED)) { MFTIME preroll_time = 0;

1 0