- Wine-Commits - list.winehq.org

Francisco Casas : tests: Test default values using reflection.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: b44a25ce191afb2464b14c81ac88d22d552b8b64 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b44a25ce191afb2464b14c81ac88d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 16 14:17:06 2024 -0400 tests: Test default values using reflection. --- tests/hlsl_d3d12.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 215d624a..c06693cf 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1698,6 +1698,201 @@ static void test_reflection(void) } } +static void test_default_values_reflection(void) +{ + unsigned int refcount; + HRESULT hr; + + static const char ps1_source[] = + "struct\n" + "{\n" + " float2 aa;\n" + " float2x1 bb;\n" + " int3 cc, dd;\n" + " float2x3 ee;\n" + " row_major float2x3 ff;\n" + " struct {\n" + " float2 aa[3];\n" + " float3 bb;\n" + " } gg;\n" + "} st = {1, 2, 3, 4, 5, 6, 7, 8, float4(9.5, 10.6, 11, 12), 13, 14, 15, 16, 17, 18,\n" + " 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};\n" + "float2 unused = {1, 2};\n" + "float3x2 another = {1, 2, 3, 4, 5, 6};\n" + "cbuffer b1\n" + "{\n" + " float2 hh = {1, 2};\n" + " float3x2 ii[2] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};\n" + "}\n" + "cbuffer b2_unused\n" + "{\n" + " float jj = {5};\n" + "}\n" + "float nondefault_unused;\n" + "float nondefault;\n" + "float4 main() : sv_target\n" + "{\n" + " return another[0][1] + st.gg.aa[1].y + nondefault + hh.y;\n" + "}"; + + struct shader_variable + { + D3D12_SHADER_VARIABLE_DESC var_desc; + }; + + struct shader_buffer + { + D3D12_SHADER_BUFFER_DESC desc; + const struct shader_variable *vars; + }; + + static const unsigned int ps1_globals_st_default_value[] = + { + 0x3f800000, 0x40000000, 0x40400000, 0x40800000, + 0x00000005, 0x00000006, 0x00000007, 0x00000000, + 0x00000008, 0x00000009, 0x0000000a, 0x00000000, + 0x41300000, 0x41400000, 0x00000000, 0x00000000, + 0x41500000, 0x41600000, 0x00000000, 0x00000000, + 0x41700000, 0x41800000, 0x00000000, 0x00000000, + 0x41880000, 0x41980000, 0x41a80000, 0x00000000, + 0x41900000, 0x41a00000, 0x41b00000, 0x00000000, + 0x41b80000, 0x41c00000, 0x00000000, 0x00000000, + 0x41c80000, 0x41d00000, 0x00000000, 0x00000000, + 0x41d80000, 0x41e00000, 0x00000000, 0x00000000, + 0x41e80000, 0x41f00000, 0x41f80000, + }; + + static const unsigned int ps1_globals_unused_default_value[] = + { + 0x3f800000, 0x40000000, + }; + + static const unsigned int ps1_globals_another_default_value[] = + { + 0x3f800000, 0x40000000, 0x40400000, 0x00000000, + 0x40800000, 0x40a00000, 0x40c00000, + }; + + static const struct shader_variable ps1_globals_vars[] = + { + {{"st", 0, 188, D3D_SVF_USED, (void *)ps1_globals_st_default_value}}, + {{"unused", 192, 8, 0, (void *)ps1_globals_unused_default_value}}, + {{"another", 208, 28, D3D_SVF_USED, (void *)ps1_globals_another_default_value}}, + {{"nondefault_unused", 236, 4, 0, NULL}}, + {{"nondefault", 240, 4, D3D_SVF_USED, NULL}}, + }; + + static const unsigned int ps1_b1_hh_default_value[] = + { + 0x3f800000, 0x40000000, + }; + + static const unsigned int ps1_b1_ii_default_value[] = + { + 0x3f800000, 0x40000000, 0x40400000, 0x00000000, + 0x40800000, 0x40a00000, 0x40c00000, 0x00000000, + 0x40e00000, 0x41000000, 0x41100000, 0x00000000, + 0x41200000, 0x41300000, 0x41400000, + }; + + static const struct shader_variable ps1_b1_vars[] = + { + {{"hh", 0, 8, D3D_SVF_USED, (void *)ps1_b1_hh_default_value}}, + {{"ii", 16, 60, 0, (void *)ps1_b1_ii_default_value}}, + }; + + static const struct shader_buffer ps1_buffers[] = + { + {{"$Globals", D3D_CT_CBUFFER, ARRAY_SIZE(ps1_globals_vars), 256}, ps1_globals_vars}, + {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(ps1_b1_vars), 80}, ps1_b1_vars}, + }; + + static const struct + { + const char *source; + const char *profile; + const struct shader_buffer *buffers; + size_t buffer_count; + } + tests[] = + { + {ps1_source, "ps_5_0", ps1_buffers, ARRAY_SIZE(ps1_buffers)}, + }; + + for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) + { + ID3D10Blob *code = compile_shader_flags(tests[t].source, + tests[t].profile, D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + ID3D12ShaderReflection *reflection; + D3D12_SHADER_DESC shader_desc; + + hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + &IID_ID3D12ShaderReflection, (void **)&reflection); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12ShaderReflection_GetDesc(reflection, &shader_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(shader_desc.ConstantBuffers == tests[t].buffer_count, "Got %u buffers.\n", shader_desc.ConstantBuffers); + + for (unsigned int i = 0; i < shader_desc.ConstantBuffers; ++i) + { + const struct shader_buffer *expect_buffer = &tests[t].buffers[i]; + ID3D12ShaderReflectionConstantBuffer *cbuffer; + D3D12_SHADER_BUFFER_DESC buffer_desc; + + vkd3d_test_push_context("Buffer %u", i); + + cbuffer = ID3D12ShaderReflection_GetConstantBufferByIndex(reflection, i); + hr = ID3D12ShaderReflectionConstantBuffer_GetDesc(cbuffer, &buffer_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(buffer_desc.Type == expect_buffer->desc.Type, "Got type %#x.\n", buffer_desc.Type); + ok(buffer_desc.Variables == expect_buffer->desc.Variables, "Got %u variables.\n", buffer_desc.Variables); + + for (unsigned int j = 0; j < buffer_desc.Variables; ++j) + { + const struct shader_variable *expect = &expect_buffer->vars[j]; + ID3D12ShaderReflectionVariable *var; + D3D12_SHADER_VARIABLE_DESC var_desc; + + vkd3d_test_push_context("Variable %u", j); + + var = ID3D12ShaderReflectionConstantBuffer_GetVariableByIndex(cbuffer, j); + hr = ID3D12ShaderReflectionVariable_GetDesc(var, &var_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(var_desc.Size == expect->var_desc.Size, "Got size %u.\n", var_desc.Size); + + if (expect->var_desc.DefaultValue) + { + todo ok(var_desc.DefaultValue, "Didn't get default value.\n"); + + if (var_desc.DefaultValue && var_desc.Size == expect->var_desc.Size) + { + for (unsigned int k = 0; k < var_desc.Size/4; ++k) + { + unsigned int var_val = *((unsigned int *)var_desc.DefaultValue + k); + unsigned int expect_val = *((unsigned int *)expect->var_desc.DefaultValue + k); + + ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", + expect_val, var_val, 4 * k); + } + } + } + else + { + ok(!var_desc.DefaultValue, "Got default value %p.\n", var_desc.DefaultValue); + } + + vkd3d_test_pop_context(); + } + vkd3d_test_pop_context(); + } + + ID3D10Blob_Release(code); + refcount = ID3D12ShaderReflection_Release(reflection); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + } +} + static void check_signature_element_(int line, const D3D12_SIGNATURE_PARAMETER_DESC *desc, const D3D12_SIGNATURE_PARAMETER_DESC *expect) { @@ -2002,6 +2197,7 @@ START_TEST(hlsl_d3d12) run_test(test_create_blob); run_test(test_get_blob_part); run_test(test_reflection); + run_test(test_default_values_reflection); run_test(test_signature_reflection); run_test(test_disassemble_shader); }

1 0

Francisco Casas : vkd3d-shader/hlsl: Initialize default values with braceless initializers.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: 099a64aeb23b63bc92fd4558c049485d18538104 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/099a64aeb23b63bc92fd4558c0494… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 11 13:34:13 2024 -0400 vkd3d-shader/hlsl: Initialize default values with braceless initializers. It is hard to initialize default values on add_assignment() and calling add_assignment() for initializers is not really necessary: the only thing we need from it the implicit cast. --- libs/vkd3d-shader/hlsl.y | 38 +++++++++++++++++------------------ tests/hlsl/default-values.shader_test | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4da802a0..66fed7ad 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2418,7 +2418,11 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var if (v->initializer.args_count) { - bool is_default_values_initializer = (ctx->cur_buffer != ctx->globals_buffer) + unsigned int store_index = 0; + bool is_default_values_initializer; + unsigned int size, k; + + is_default_values_initializer = (ctx->cur_buffer != ctx->globals_buffer) || (var->storage_modifiers & HLSL_STORAGE_UNIFORM); if (is_default_values_initializer) @@ -2431,33 +2435,29 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var } } - if (v->initializer.braces) + if (!v->initializer.braces) { - unsigned int size = initializer_size(&v->initializer); - unsigned int store_index = 0; - unsigned int k; - - if (component_count != size) + if (!(add_implicit_conversion(ctx, v->initializer.instrs, v->initializer.args[0], type, &v->loc))) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", component_count, size); free_parse_variable_def(v); continue; } - for (k = 0; k < v->initializer.args_count; ++k) - { - initialize_var_components(ctx, v->initializer.instrs, var, - &store_index, v->initializer.args[k]); - } + v->initializer.args[0] = node_from_block(v->initializer.instrs); } - else + + size = initializer_size(&v->initializer); + if (component_count != size) { - struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, &var->loc); + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", component_count, size); + free_parse_variable_def(v); + continue; + } - assert(v->initializer.args_count == 1); - hlsl_block_add_instr(v->initializer.instrs, &load->node); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + for (k = 0; k < v->initializer.args_count; ++k) + { + initialize_var_components(ctx, v->initializer.instrs, var, &store_index, v->initializer.args[k]); } if (is_default_values_initializer) diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test index f7590b5d..0339fbd6 100644 --- a/tests/hlsl/default-values.shader_test +++ b/tests/hlsl/default-values.shader_test @@ -21,7 +21,7 @@ todo(glsl) draw quad probe all rgba (10, 20, 50, 60) -[pixel shader fail(sm<6) todo] +[pixel shader fail(sm<6)] float a = 7; float4 b = a; // initial value must be a literal expression. @@ -138,7 +138,7 @@ todo(glsl) draw quad probe all rgba (10, 20, 50, 60) -[pixel shader fail(sm<6) todo] +[pixel shader fail(sm<6)] cbuffer buff { float a = 7;

1 0

Francisco Casas : vkd3d-shader/hlsl: Record default values for uniforms and constant buffers.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: e8dbc36bd2c9f560431f0d959403062de28bd966 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e8dbc36bd2c9f560431f0d9594030… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Apr 8 16:15:20 2024 -0400 vkd3d-shader/hlsl: Record default values for uniforms and constant buffers. --- libs/vkd3d-shader/fx.c | 5 ++ libs/vkd3d-shader/hlsl.c | 30 +++++++++++ libs/vkd3d-shader/hlsl.h | 27 +++++++--- libs/vkd3d-shader/hlsl.y | 93 ++++++++++++++++++++++++++--------- libs/vkd3d-shader/hlsl_codegen.c | 8 +++ tests/hlsl/default-values.shader_test | 26 +++++----- tests/hlsl/strings.shader_test | 2 +- 7 files changed, 147 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : win32u: Call NtUserMapWindowPoints with per-monitor DPI from the drivers.
by Alexandre Julliard June 10, 2024

June 10, 2024

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

Rémi Bernon : winex11: Use NtUserMapWindowPoints instead of NtUserScreenToClient.
by Alexandre Julliard June 10, 2024

June 10, 2024

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: Use window monitor DPI in get_windows_offset when dpi is 0.
by Alexandre Julliard June 10, 2024

June 10, 2024

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

Jinoh Kang : user32/tests: Print regions in test_swp_paint_regions failure cases.
by Alexandre Julliard June 10, 2024

June 10, 2024

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

Esme Povirk : win32u: Implement EVENT_OBJECT_LOCATIONCHANGE.
by Alexandre Julliard June 10, 2024

June 10, 2024

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

Eric Pouech : kernelbase/tests: Fix typo in tests.
by Alexandre Julliard June 10, 2024

June 10, 2024

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

Alexandre Julliard : winex11: Fix build error when XShm is missing.
by Alexandre Julliard June 10, 2024

June 10, 2024

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