June 2024 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Fix numeric register offset for matrix components.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: ab01fedc5d9311ae0d0f95fdc407922aa99c8ce0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab01fedc5d9311ae0d0f95fdc4079… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 11 16:55:06 2024 -0400 vkd3d-shader/hlsl: Fix numeric register offset for matrix components. --- libs/vkd3d-shader/hlsl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 998d3d2a..d4180675 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -558,12 +558,14 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty switch (type->class) { - case HLSL_CLASS_SCALAR: case HLSL_CLASS_VECTOR: - case HLSL_CLASS_MATRIX: offset[HLSL_REGSET_NUMERIC] += idx; break; + case HLSL_CLASS_MATRIX: + offset[HLSL_REGSET_NUMERIC] += 4 * idx; + break; + case HLSL_CLASS_STRUCT: for (r = 0; r <= HLSL_REGSET_LAST; ++r) offset[r] += type->e.record.fields[idx].reg_offset[r]; @@ -594,6 +596,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty case HLSL_CLASS_PASS: case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: + case HLSL_CLASS_SCALAR: vkd3d_unreachable(); } type = next_type;

1 0

Francisco Casas : vkd3d-shader/hlsl: Reorder default values for matrices for SM4.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: f5bfa728eb82cbf0d3540251b200c43b6184b74f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f5bfa728eb82cbf0d3540251b200c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 12 17:22:45 2024 -0400 vkd3d-shader/hlsl: Reorder default values for matrices for SM4. Default value initializers behave differently than regular initializers for matrices on SM4 profiles. While regular initializers assign the rhs elements in reading-order (completing one row at the time), default initializers assing the rhs elements in Chinese reading-order (completing one column at the time). So after lowering a default value to a constant, the index of the component to which this default value is stored is computed to meet this expectation. This can be done because the default values. For reference, compiling this shader: row_major int2x3 m = {1, 2, 3, 4, 5, 6}; float4 main() : sv_target { return float4(m[0][0], 99, 99, 99); } gives the following buffer definition: // cbuffer $Globals // { // // row_major int2x3 m; // Offset: 0 Size: 28 // = 0x00000001 0x00000003 0x00000005 0x00000000 // 0x00000002 0x00000004 0x00000006 // // } Given that the matrix is column-major, m's default value is actually {{1, 3, 5}, {2, 4, 6}}, unlike the {{1, 2, 3}, {4, 5, 6}} one would expect in a regular initializer. SM1 profiles assign the elements in regular reading order. --- libs/vkd3d-shader/hlsl.y | 48 +++++++++++++++++++++++++++++++++++++++++++++++- tests/hlsl_d3d12.c | 2 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 66fed7ad..d2fc43b6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2079,6 +2079,50 @@ static bool add_increment(struct hlsl_ctx *ctx, struct hlsl_block *block, bool d return true; } +/* For some reason, for matrices, values from default value initializers end up in different + * components than from regular initializers. Default value initializers fill the matrix in + * vertical reading order (left-to-right top-to-bottom) instead of regular reading order + * (top-to-bottom left-to-right), so they have to be adjusted. */ +static unsigned int get_component_index_from_default_initializer_index(struct hlsl_ctx *ctx, + struct hlsl_type *type, unsigned int index) +{ + unsigned int element_comp_count, element, x, y, i; + unsigned int base = 0; + + if (ctx->profile->major_version < 4) + return index; + + switch (type->class) + { + case HLSL_CLASS_MATRIX: + x = index / type->dimy; + y = index % type->dimy; + return y * type->dimx + x; + + case HLSL_CLASS_ARRAY: + element_comp_count = hlsl_type_component_count(type->e.array.type); + element = index / element_comp_count; + base = element * element_comp_count; + return base + get_component_index_from_default_initializer_index(ctx, type->e.array.type, index - base); + + case HLSL_CLASS_STRUCT: + for (i = 0; i < type->e.record.field_count; ++i) + { + struct hlsl_type *field_type = type->e.record.fields[i].type; + + element_comp_count = hlsl_type_component_count(field_type); + if (index - base < element_comp_count) + return base + get_component_index_from_default_initializer_index(ctx, field_type, index - base); + base += element_comp_count; + } + break; + + default: + return index; + } + vkd3d_unreachable(); +} + static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *instrs, struct hlsl_ir_var *dst, unsigned int *store_index, struct hlsl_ir_node *src) { @@ -2102,12 +2146,14 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i if (dst->default_values) { struct hlsl_default_value default_value = {0}; + unsigned int dst_index; if (!hlsl_clone_block(ctx, &block, instrs)) return; default_value.value = evaluate_static_expression(ctx, &block, dst_comp_type, &src->loc); - dst->default_values[*store_index] = default_value; + dst_index = get_component_index_from_default_initializer_index(ctx, dst->data_type, *store_index); + dst->default_values[dst_index] = default_value; hlsl_block_cleanup(&block); } diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 1292e100..b579f305 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1872,7 +1872,7 @@ static void test_default_values_reflection(void) unsigned int var_val = *((unsigned int *)var_desc.DefaultValue + k); unsigned int expect_val = *((unsigned int *)expect->var_desc.DefaultValue + k); - todo_if(var_val != expect_val) ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", + ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", expect_val, var_val, 4 * k); } }

1 0

Jinoh Kang : user32/tests: Print regions in test_swp_paint_regions failure cases.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: 46f1931e562bb44b340c600439682e41b3e03336 URL: https://gitlab.winehq.org/wine/wine/-/commit/46f1931e562bb44b340c600439682e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jun 8 14:09:02 2024 +0900 user32/tests: Print regions in test_swp_paint_regions failure cases. --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5e69e196e80..60067b7ab02 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9356,7 +9356,7 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } - if (!rgn_ok && winetest_debug > 1) + if (!rgn_ok) { trace( "Expected parent update region: " ); dump_region( hrgn_expect ); @@ -9417,7 +9417,7 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare ok( !!rgn_ok, "Child update region shall match expected region\n" ); } - if (!rgn_ok && winetest_debug > 1) + if (!rgn_ok) { trace( "Expected child update region: " ); dump_region( hrgn_expect_child );

1 0

Rémi Bernon : win32u: Use window monitor DPI in get_windows_offset when dpi is 0.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: 0d8d99765b47b48e5429f7b50ce9dd2d1a2a009c URL: https://gitlab.winehq.org/wine/wine/-/commit/0d8d99765b47b48e5429f7b50ce9dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 10:20:03 2024 +0200 win32u: Use window monitor DPI in get_windows_offset when dpi is 0. The server path advertises doing a similar thing. --- dlls/win32u/window.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 51d8e0eb710..162b9e370dc 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2784,6 +2784,7 @@ static BOOL get_windows_offset( HWND hwnd_from, HWND hwnd_to, UINT dpi, BOOL *mi if (win == WND_OTHER_PROCESS) goto other_process; if (win != WND_DESKTOP) { + UINT dpi_from = dpi ? dpi : get_win_monitor_dpi( hwnd_from ); if (win->dwExStyle & WS_EX_LAYOUTRTL) { mirror_from = TRUE; @@ -2805,7 +2806,7 @@ static BOOL get_windows_offset( HWND hwnd_from, HWND hwnd_to, UINT dpi, BOOL *mi } } if (win && win != WND_DESKTOP) release_win_ptr( win ); - offset = map_dpi_point( offset, get_dpi_for_window( hwnd_from ), dpi ); + offset = map_dpi_point( offset, get_dpi_for_window( hwnd_from ), dpi_from ); } } @@ -2820,6 +2821,7 @@ static BOOL get_windows_offset( HWND hwnd_from, HWND hwnd_to, UINT dpi, BOOL *mi if (win == WND_OTHER_PROCESS) goto other_process; if (win != WND_DESKTOP) { + UINT dpi_to = dpi ? dpi : get_win_monitor_dpi( hwnd_to ); POINT pt = { 0, 0 }; if (win->dwExStyle & WS_EX_LAYOUTRTL) { @@ -2842,7 +2844,7 @@ static BOOL get_windows_offset( HWND hwnd_from, HWND hwnd_to, UINT dpi, BOOL *mi } } if (win && win != WND_DESKTOP) release_win_ptr( win ); - pt = map_dpi_point( pt, get_dpi_for_window( hwnd_to ), dpi ); + pt = map_dpi_point( pt, get_dpi_for_window( hwnd_to ), dpi_to ); offset.x -= pt.x; offset.y -= pt.y; }

1 0

Rémi Bernon : winex11: Use NtUserMapWindowPoints instead of NtUserScreenToClient.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: 74172e340ce151219f1140bc117236f7fad93e08 URL: https://gitlab.winehq.org/wine/wine/-/commit/74172e340ce151219f1140bc117236… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 11:36:12 2024 +0200 winex11: Use NtUserMapWindowPoints instead of NtUserScreenToClient. --- dlls/winex11.drv/event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 095820596de..9cfbfc813de 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1418,7 +1418,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) if (!(NtUserGetWindowLongW( hQueryWnd, GWL_STYLE ) & WS_MINIMIZE)) { POINT pt = *lpPt; - NtUserScreenToClient( hQueryWnd, &pt ); + NtUserMapWindowPoints( 0, hQueryWnd, &pt, 1 ); NtUserGetClientRect( hQueryWnd, &tempRect, dpi ); if (PtInRect( &tempRect, pt)) @@ -1435,7 +1435,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) if(!(NtUserGetWindowLongW( hQueryWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return 0; - NtUserScreenToClient( hQueryWnd, lpPt ); + NtUserMapWindowPoints( 0, hQueryWnd, lpPt, 1 ); return hQueryWnd; }

1 0

Rémi Bernon : win32u: Call NtUserMapWindowPoints with per-monitor DPI from the drivers.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: 8ba51a6f711c5466e060a5958cc15c31b2b2ac7d URL: https://gitlab.winehq.org/wine/wine/-/commit/8ba51a6f711c5466e060a5958cc15c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 10:46:44 2024 +0200 win32u: Call NtUserMapWindowPoints with per-monitor DPI from the drivers. --- dlls/user32/win.c | 3 ++- dlls/win32u/window.c | 3 +-- dlls/winemac.drv/event.c | 5 ++++- dlls/winemac.drv/window.c | 4 ++-- dlls/winex11.drv/event.c | 8 ++++---- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/window.c | 2 +- dlls/wow64win/user.c | 2 ++ include/ntuser.h | 4 +++- 9 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2aa06b1dccb..7a552b48db4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -760,7 +760,8 @@ HWND WINAPI ChildWindowFromPointEx( HWND parent, POINT pt, UINT flags ) */ INT WINAPI MapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) { - return NtUserMapWindowPoints( hwnd_from, hwnd_to, points, count ); + UINT dpi = NTUSER_DPI_CONTEXT_GET_DPI( (UINT_PTR)GetThreadDpiAwarenessContext() ); + return NtUserMapWindowPoints( hwnd_from, hwnd_to, points, count, dpi ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 162b9e370dc..c0ebeb6e8a9 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5585,8 +5585,7 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_MapWindowPoints: { struct map_window_points_params *params = (void *)param; - return map_window_points( hwnd, params->hwnd_to, params->points, params->count, - get_thread_dpi() ); + return map_window_points( hwnd, params->hwnd_to, params->points, params->count, params->dpi ); } case NtUserCallHwndParam_MirrorRgn: diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index ab31c9d22c7..1628745f2b7 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -315,7 +315,10 @@ BOOL query_ime_char_rect(macdrv_query* query) if (NtUserGetGUIThreadInfo(0, &info)) { - NtUserMapWindowPoints(info.hwndCaret, 0, (POINT*)&info.rcCaret, 2); + /* NtUserGetGUIThreadInfo always return client-relative rcCaret in window DPI */ + NtUserMapWindowPoints(info.hwndCaret, 0, (POINT *)&info.rcCaret, 2, NtUserGetDpiForWindow(info.hwndCaret)); + NtUserLogicalToPerMonitorDPIPhysicalPoint(info.hwndCaret, (POINT *)&info.rcCaret.left); + NtUserLogicalToPerMonitorDPIPhysicalPoint(info.hwndCaret, (POINT *)&info.rcCaret.right); if (range->length && info.rcCaret.left == info.rcCaret.right) info.rcCaret.right++; query->ime_char_rect.rect = cgrect_from_rect(info.rcCaret); ret = TRUE; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 79f1e493eb7..32e544d733b 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2230,7 +2230,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) rect = rect_from_cgrect(event->window_frame_changed.frame); macdrv_mac_to_window_rect(data, &rect); - NtUserMapWindowPoints(0, parent, (POINT *)&rect, 2); + NtUserMapWindowPoints(0, parent, (POINT *)&rect, 2, 0 /* per-monitor DPI */); width = rect.right - rect.left; height = rect.bottom - rect.top; @@ -2465,7 +2465,7 @@ void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) rect = rect_from_cgrect(event->window_restore_requested.frame); macdrv_mac_to_window_rect(data, &rect); - NtUserMapWindowPoints(0, parent, (POINT *)&rect, 2); + NtUserMapWindowPoints(0, parent, (POINT *)&rect, 2, 0 /* per-monitor DPI */); release_win_data(data); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 9cfbfc813de..3c4a5254b33 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -917,7 +917,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) if (NtUserGetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); abs_rect = rect; - NtUserMapWindowPoints( hwnd, 0, (POINT *)&abs_rect, 2 ); + NtUserMapWindowPoints( hwnd, 0, (POINT *)&abs_rect, 2, 0 /* per-monitor DPI */ ); SERVER_START_REQ( update_window_zorder ) { @@ -1088,7 +1088,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) else pos = root_to_virtual_screen( x, y ); X11DRV_X_to_window_rect( data, &rect, pos.x, pos.y, event->width, event->height ); - if (root_coords) NtUserMapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + if (root_coords) NtUserMapWindowPoints( 0, parent, (POINT *)&rect, 2, 0 /* per-monitor DPI */ ); TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", hwnd, data->whole_window, (int)rect.left, (int)rect.top, @@ -1418,7 +1418,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) if (!(NtUserGetWindowLongW( hQueryWnd, GWL_STYLE ) & WS_MINIMIZE)) { POINT pt = *lpPt; - NtUserMapWindowPoints( 0, hQueryWnd, &pt, 1 ); + NtUserMapWindowPoints( 0, hQueryWnd, &pt, 1, 0 /* per-monitor DPI */ ); NtUserGetClientRect( hQueryWnd, &tempRect, dpi ); if (PtInRect( &tempRect, pt)) @@ -1435,7 +1435,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) if(!(NtUserGetWindowLongW( hQueryWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return 0; - NtUserMapWindowPoints( 0, hQueryWnd, lpPt, 1 ); + NtUserMapWindowPoints( 0, hQueryWnd, lpPt, 1, 0 /* per-monitor DPI */ ); return hQueryWnd; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index dce3c888170..30444de0cdf 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -519,7 +519,7 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x if (NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - NtUserMapWindowPoints( hwnd, 0, &pt, 1 ); + NtUserMapWindowPoints( hwnd, 0, &pt, 1, 0 /* per-monitor DPI */ ); } release_win_data( data ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ef2f80ba02f..d24b1c08184 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2442,7 +2442,7 @@ void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, if (escape.drawable) { POINT pt = { 0, 0 }; - NtUserMapWindowPoints( 0, parent, &pt, 1 ); + NtUserMapWindowPoints( 0, parent, &pt, 1, 0 /* per-monitor DPI */ ); escape.dc_rect = *win_rect; OffsetRect( &escape.dc_rect, pt.x, pt.y ); if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 35bcbdf6c3e..2f41820abbd 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1717,12 +1717,14 @@ NTSTATUS WINAPI wow64_NtUserCallHwndParam( UINT *args ) ULONG hwnd_to; ULONG points; UINT count; + UINT dpi; } *params32 = UlongToPtr( param ); struct map_window_points_params params; params.hwnd_to = LongToHandle( params32->hwnd_to ); params.points = UlongToPtr( params32->points ); params.count = params32->count; + params.dpi = params32->dpi; return NtUserCallHwndParam( hwnd, (UINT_PTR)&params, code ); } diff --git a/include/ntuser.h b/include/ntuser.h index 507ed2e47ec..10afabfdc60 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1414,14 +1414,16 @@ struct map_window_points_params HWND hwnd_to; POINT *points; UINT count; + UINT dpi; }; -static inline int NtUserMapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) +static inline int NtUserMapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count, UINT dpi ) { struct map_window_points_params params; params.hwnd_to = hwnd_to; params.points = points; params.count = count; + params.dpi = dpi; return NtUserCallHwndParam( hwnd_from, (UINT_PTR)&params, NtUserCallHwndParam_MapWindowPoints ); }

1 0

Eric Pouech : kernelbase/tests: Fix typo in tests.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: 1cbf6c67db8234a44d9a7e589139c2aa02da8ce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cbf6c67db8234a44d9a7e589139c2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 12:32:03 2024 +0200 kernelbase/tests: Fix typo in tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 0ef809d66aa..36e00e0d9ef 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1218,7 +1218,7 @@ static void test_PathCchCanonicalizeEx(void) path_outW[0] = 0xff; hr = pPathCchCanonicalizeEx(path_outW, 0, path_inW, 0); ok(hr == E_INVALIDARG, "expect hr %#lx, got %#lx\n", E_INVALIDARG, hr); - ok(path_outW[0] = 0xff, "expect path_outW unchanged\n"); + ok(path_outW[0] == 0xff, "expect path_outW unchanged\n"); /* Test path length */ hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, PATHCCH_ALLOW_LONG_PATHS);

1 0

Esme Povirk : win32u: Implement EVENT_OBJECT_LOCATIONCHANGE.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: 479e0b27c8fe3eb658cef0246267d63596e557ac URL: https://gitlab.winehq.org/wine/wine/-/commit/479e0b27c8fe3eb658cef0246267d6… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Jun 8 19:58:16 2024 +0000 win32u: Implement EVENT_OBJECT_LOCATIONCHANGE. --- dlls/user32/tests/msg.c | 160 +++++++++++++++++++++++++++--------------------- dlls/win32u/window.c | 4 ++ 2 files changed, 95 insertions(+), 69 deletions(-)

1 0

Alexandre Julliard : winex11: Fix build error when XShm is missing.
by Alexandre Julliard 10 Jun '24

10 Jun '24

Module: wine Branch: master Commit: acd7862a0ea41b36b86056ed63ddb0ac37163dfd URL: https://gitlab.winehq.org/wine/wine/-/commit/acd7862a0ea41b36b86056ed63ddb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 9 22:29:46 2024 +0200 winex11: Fix build error when XShm is missing. --- dlls/winex11.drv/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e1a05cf612b..11ba34739c3 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1861,7 +1861,7 @@ static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, return NULL; } -static BOOL destroy_shm_image( XImage *image ) +static BOOL destroy_shm_image( XImage *image, x11drv_xshm_info_t *shminfo ) { return FALSE; }

1 0

Rémi Bernon : winevulkan: Remove some unnecessary casts.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 1a4cbba795c09e421a89d852ed2b68f5e48012b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a4cbba795c09e421a89d852ed2b68… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 7 15:24:35 2024 +0200 winevulkan: Remove some unnecessary casts. Later, for void pointers, the casts would be (const PTR32 *) and fail to assign. --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 438 ++++++++++++++++++++-------------------- 2 files changed, 223 insertions(+), 221 deletions(-)

1 0