February 2024 - Wine-commits

Tag wine-9.2 : Alexandre Julliard : Release 9.2
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: refs/tags/wine-9.2 Tag: ed1975f21f33bfd880859a2c6d69f9eb015cdced URL: https://gitlab.winehq.org/wine/wine/-/tags/ed1975f21f33bfd880859a2c6d69f9eb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 22:46:52 2024 +0100 Release 9.2

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Free the individual attributes in func_prototype (Valgrind).
by Alexandre Julliard 09 Feb '24

09 Feb '24

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 09 Feb '24

09 Feb '24

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 : tests: Release the code blob in test_thread_id() (Valgrind).
by Alexandre Julliard 09 Feb '24

09 Feb '24

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 variable identifiers in primary_expr (Valgrind).
by Alexandre Julliard 09 Feb '24

09 Feb '24

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 09 Feb '24

09 Feb '24

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 09 Feb '24

09 Feb '24

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

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

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

Marc-Aurel Zent : ntdll: Fix DW_OP_abs absolute value warning on labs() for clang.
by Alexandre Julliard 08 Feb '24

08 Feb '24

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