- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Mark a failing test as todo.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 13b0f22cf9c1b6f22dcede70f40244b486b9e2e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/13b0f22cf9c1b6f22dcede70f40244… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 17:59:46 2024 +0100 ntdll/tests: Mark a failing test as todo. --- dlls/ntdll/tests/wow64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index aebff700940..e0dd7bab13b 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1700,6 +1700,7 @@ static void check_module( ULONG64 base, const WCHAR *name ) else CHECK_MODULE(wow64cpu); #undef CHECK_MODULE + todo_wine_if( !wcscmp( name, L"win32u.dll" )) ok( 0, "unknown module %s %s found\n", wine_dbgstr_longlong(base), wine_dbgstr_w(name)); }

1 0

Rémi Bernon : server: Fix rawinput buffer sizes and alignment on WoW64.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 1664ad7d50110902f85af07564ef1505af9cc062 URL: https://gitlab.winehq.org/wine/wine/-/commit/1664ad7d50110902f85af07564ef15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 11:25:41 2024 +0100 server: Fix rawinput buffer sizes and alignment on WoW64. --- dlls/user32/tests/input.c | 3 -- dlls/win32u/rawinput.c | 103 +++++------------------------------------ include/wine/server_protocol.h | 6 +-- server/protocol.def | 4 +- server/queue.c | 96 ++++++++++++++++++++++++-------------- server/request.h | 4 +- server/trace.c | 4 +- 7 files changed, 82 insertions(+), 138 deletions(-)

1 0

Rémi Bernon : server: Move rawinput message conversion from win32u.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 2eb8950392996283192250691b005e2df65ab7b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2eb8950392996283192250691b005e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 09:28:46 2024 +0100 server: Move rawinput message conversion from win32u. Appending the entire RAWMOUSE / RAWKEYBOARD / RAWHID + report structs after the hardware message data, instead of using a custom intermediate structure. --- dlls/user32/tests/input.c | 11 +-- dlls/win32u/rawinput.c | 127 +++++------------------------ include/wine/server_protocol.h | 34 ++------ server/protocol.def | 32 ++------ server/queue.c | 180 +++++++++++++++++++++++++++++++++-------- server/request.h | 2 +- tools/make_requests | 2 +- 7 files changed, 183 insertions(+), 205 deletions(-)

1 0

Alexandre Julliard : uxtheme: Use BOOLEAN instead of BOOL in ordinal functions.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 3bd1d1c60d10e96caef40dae6dde8da5f9d03da7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bd1d1c60d10e96caef40dae6dde8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 11:48:46 2024 +0100 uxtheme: Use BOOLEAN instead of BOOL in ordinal functions. This should fix test failures on Windows. --- dlls/uxtheme/system.c | 8 ++++---- dlls/uxtheme/tests/system.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 3c0eb3c66f4..371e23b5474 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1268,7 +1268,7 @@ void WINAPI RefreshImmersiveColorPolicyState(void) * RETURNS * Whether or not the system should use dark mode. */ -BOOL WINAPI ShouldSystemUseDarkMode(void) +BOOLEAN WINAPI ShouldSystemUseDarkMode(void) { DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); @@ -1285,7 +1285,7 @@ BOOL WINAPI ShouldSystemUseDarkMode(void) * RETURNS * Whether or not apps should use dark mode. */ -BOOL WINAPI ShouldAppsUseDarkMode(void) +BOOLEAN WINAPI ShouldAppsUseDarkMode(void) { DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); @@ -1300,7 +1300,7 @@ BOOL WINAPI ShouldAppsUseDarkMode(void) * AllowDarkModeForWindow (UXTHEME.133) * */ -BOOL WINAPI AllowDarkModeForWindow(HWND hwnd, BOOL allow) +BOOLEAN WINAPI AllowDarkModeForWindow(HWND hwnd, BOOLEAN allow) { FIXME("%p %d: stub\n", hwnd, allow); return FALSE; @@ -1320,7 +1320,7 @@ int WINAPI SetPreferredAppMode(int app_mode) * IsDarkModeAllowedForWindow (UXTHEME.137) * */ -BOOL WINAPI IsDarkModeAllowedForWindow(HWND hwnd) +BOOLEAN WINAPI IsDarkModeAllowedForWindow(HWND hwnd) { FIXME("%p: stub\n", hwnd); return FALSE; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 36740fe2664..30c5fbce161 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -50,8 +50,8 @@ static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); -static BOOL (WINAPI *pShouldSystemUseDarkMode)(void); -static BOOL (WINAPI *pShouldAppsUseDarkMode)(void); +static BOOLEAN (WINAPI *pShouldSystemUseDarkMode)(void); +static BOOLEAN (WINAPI *pShouldAppsUseDarkMode)(void); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -2680,7 +2680,7 @@ static void test_theme(void) static void test_ShouldSystemUseDarkMode(void) { DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; - BOOL result; + BOOLEAN result; LSTATUS ls; if (!pShouldSystemUseDarkMode) @@ -2709,7 +2709,7 @@ static void test_ShouldSystemUseDarkMode(void) static void test_ShouldAppsUseDarkMode(void) { DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; - BOOL result; + BOOLEAN result; LSTATUS ls; if (!pShouldAppsUseDarkMode)

1 0

Alexandre Julliard : gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows.
by Alexandre Julliard Feb. 9, 2024

Feb. 9, 2024

Module: wine Branch: master Commit: 525835897b9378ec736e60e6898a9c9ffd597ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/525835897b9378ec736e60e6898a9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 12:34:04 2024 +0100 gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows. --- dlls/gdi32/tests/font.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 76ea0ac7de7..0513c2b2ca8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6527,7 +6527,7 @@ static void test_max_height(void) DeleteObject(SelectObject(hdc, hfont_old)); /* test the largest value */ - lf.lfHeight = -((1 << 16) - 1); + lf.lfHeight = -((1 << 14) - 1); hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); memset(&tm, 0, sizeof(tm)); @@ -6547,12 +6547,15 @@ static void test_max_height(void) hfont_old = SelectObject(hdc, hfont); memset(&tm, 0, sizeof(tm)); r = GetTextMetricsA(hdc, &tm); - ok(r, "GetTextMetrics failed\n"); - ok(tm.tmHeight == tm1.tmHeight, - "expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight); - ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, - "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); - DeleteObject(SelectObject(hdc, hfont_old)); + if (r) + { + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight == tm1.tmHeight, + "expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, + "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + } winetest_pop_context(); }

1 0

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