- Wine-Devel - list.winehq.org

[PATCH 2/5] win32u: Move NtUserSetProp implementation from user32.
by Jacek Caban Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/property.c | 15 ++------------- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 21 +++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 3 +++ 8 files changed, 60 insertions(+), 14 deletions(-)

2 2

[PATCH] ucrtbase: Later printf width specifiers should override earlier ones
by David Gow Nov. 8, 2021

Nov. 8, 2021

In ucrtbase (but not in msvcrt), when a printf format specifier has two width specifiers (both a '*' and an explicit number), only the latter should take effect. (In msvcrt, the width of one is combined with the other). This patch builds on the prior patch which implements the msvcrt behaviour, and needs to be applied on top of it: msvcrt: The '*' character should be interpreted as the beginning of the width specification[1,2] It also supercedes the previous (incorrect) patch which used the ucrtbase behaviour on msvcrt as well: msvcrt: printf: Later width specifiers should override earlier ones[3] For further details, see [4], [5], and [6]. [1]: https://source.winehq.org/patches/data/218904 [2]: https://www.winehq.org/pipermail/wine-devel/2021-November/200009.html [3]: https://www.winehq.org/pipermail/wine-devel/2021-November/200040.html [4]: https://www.winehq.org/pipermail/wine-devel/2021-November/200039.html [5]: https://github.com/ValveSoftware/Proton/issues/5258#issuecomment-962423092 [6]: https://www.winehq.org/pipermail/wine-devel/2021-November/200063.html Signed-off-by: David Gow <david(a)davidgow.net> --- dlls/msvcrt/printf.h | 6 ++++++ dlls/ucrtbase/tests/printf.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 40a8a13d861..52dec97f8bc 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,6 +1050,12 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } + + /* On ucrtbase, we ignore all but the last specifier. */ +#if _MSVCR_VER >= 140 + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; +#endif } while (*p >= '0' && *p <= '9') { diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 4f20ccff9a4..328300d7827 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -845,6 +845,35 @@ static void test_printf_fp(void) } } +static void test_printf_width_specifiers(void) +{ + char buf[150]; + int r; + + /* In msvcrt, multiple width specifiers will 'stack', producing + * a longer width. In ucrtbase, only the last width specifier will + * take effect. */ + r = vsprintf_wrapper(0, buf, sizeof(buf), "%0*02d", 1, 0); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buf, "00"), "failed: \"%s\"\n", buf); + + r = vsprintf_wrapper(0, buf, sizeof(buf), "%0*02d", 2, 17); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buf, "17"), "failed: \"%s\"\n", buf); + + r = vsprintf_wrapper(0, buf, sizeof(buf), "%*1d", 1, 3); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buf, "3"), "failed: \"%s\"\n", buf); + + r = vsprintf_wrapper(0, buf, sizeof(buf), "%0*0d", 1, 2); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buf, "2"), "failed: \"%s\"\n", buf); + + r = vsprintf_wrapper(0, buf, sizeof(buf), "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buf, " 7"), "failed: \"%s\"\n", buf); +} + START_TEST(printf) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -862,4 +891,5 @@ START_TEST(printf) test_printf_c99(); test_printf_natural_string(); test_printf_fp(); + test_printf_width_specifiers(); } -- 2.32.0

3 2

[PATCH 1/2] ntdll: Explicitly clobber X16/X17 registers on ARM64 syscall return.
by Jinoh Kang Nov. 8, 2021

Nov. 8, 2021

Synchronize syscall_frame to match the actual state on syscall return. This is required for a follow-up patch that addresses incorrect behaviour of __wine_syscall_dispatcher, specifically unconditional clobbering of X16 and X17 registers, while minimizing the performance impact. (Hence the "fastpath") Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm64.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index fa402a7a83e..da5739b6f1c 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -324,6 +324,17 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON } +/*********************************************************************** + * syscall_frame_fixup_for_fastpath + * + * Clobbers the frame's X16 and X17 register values. + */ +static void syscall_frame_fixup_for_fastpath( struct syscall_frame *frame ) +{ + frame->x[16] = frame->pc; + frame->x[17] = frame->sp; +} + /*********************************************************************** * save_context * @@ -686,6 +697,7 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a frame->x[3] = arg3; frame->x[4] = (ULONG64)func; frame->restore_flags |= CONTEXT_CONTROL | CONTEXT_INTEGER; + syscall_frame_fixup_for_fastpath( frame ); return status; } @@ -718,6 +730,7 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context frame->lr = lr; frame->sp = sp; frame->restore_flags |= CONTEXT_INTEGER | CONTEXT_CONTROL; + syscall_frame_fixup_for_fastpath( frame ); return status; } @@ -757,6 +770,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.restore_flags = CONTEXT_INTEGER; callback_frame.frame.syscall_table = frame->syscall_table; callback_frame.frame.prev_frame = frame; + syscall_frame_fixup_for_fastpath( &callback_frame.frame ); arm64_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -1187,6 +1201,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; frame->syscall_table = KeServiceDescriptorTable; + syscall_frame_fixup_for_fastpath( frame ); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); -- 2.33.1

1 1

[PATCH] riched20: Check font_cache in select_style() too. --- Like the other release_font_cache() calls.
by Serge Gautherie Nov. 8, 2021

Nov. 8, 2021

Addendum to wine-4.14-26-g6f1cc1f. ReactOS-Bug: https://jira.reactos.org/browse/CORE-17843 --- dlls/riched20/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 917a5bd..266bb93 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -429,7 +429,7 @@ void select_style( ME_Context *c, ME_Style *s ) c->orig_font = NULL; } - if (c->current_style) + if (c->current_style && c->current_style->font_cache) { release_font_cache( c->current_style->font_cache ); c->current_style->font_cache = NULL; -- 2.10.0.windows.1

1 0

[PATCH 5/5] win32u: Don't use free_region in alloc_region.
by Jacek Caban Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes GCC warning. dlls/win32u/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 00/13] Series short description
by Eric Pouech Nov. 8, 2021

Nov. 8, 2021

The following series: - replace quite a few uses of debugger's CPU with debuggee's one (of interest for WoW64 debugging where they're different) - support more pdb entries (inline sites, new local variable information) A+ --- Eric Pouech (13): tools/winedump/pdb: fix computation of signed integers in codeview symbol's annotations dbghelp: check that we don't add same line number twice dbghelp: attach a struct cpu* to every module dbghelp: use module's cpu word size instead of sizeof(void*) or sizeof(DWORD_PTR) dbghelp: rather use cpu from debuggee's modules than debugger's dbghelp/pdb: added new basic type to represent char8_t introduced in C++20 dbghelp/pdb: properly handle S_LOCAL codeview entries dbghelp/pdb: implement loc_compute for pdb backend dbghelp/pdb: introduce codeview_init_type_parse() to handle init of type streams dbghelp/pdb: let codeview_snarf() handle all module debug information dbghelp/pdb: added support for inline sites dbghelp/pdb: handle when a block in DEBUG_S_LINES subsection spreads across several symbols dbghelp/pdb: add line number to inline sites dlls/dbghelp/dbghelp_private.h | 3 + dlls/dbghelp/dwarf.c | 57 ++- dlls/dbghelp/module.c | 9 +- dlls/dbghelp/msc.c | 812 ++++++++++++++++++++++++++++----- dlls/dbghelp/stabs.c | 6 +- dlls/dbghelp/symbol.c | 5 + include/cvconst.h | 3 +- include/wine/mscvpdb.h | 13 +- tools/winedump/msc.c | 9 +- 9 files changed, 755 insertions(+), 162 deletions(-)

1 13

[PATCH vkd3d 3/3] vkd3d-shader/spirv: Ignore break instructions outside active blocks.
by Henri Verbeet Nov. 8, 2021

Nov. 8, 2021

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Minor adjustments to the commit message and comment. libs/vkd3d-shader/spirv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e5b9ef03..698c3054 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7802,8 +7802,10 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c } else if (breakable_cf_info->current_block == VKD3D_BLOCK_SWITCH) { - assert(breakable_cf_info->inside_block); - vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id); + /* The current case block may have already been ended by an + * unconditional continue instruction. */ + if (breakable_cf_info->inside_block) + vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id); } cf_info->inside_block = false; -- 2.20.1

1 0

[PATCH vkd3d 2/3] tests: Add a test for an unconditional break instruction at the end of a loop block.
by Henri Verbeet Nov. 8, 2021

Nov. 8, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Move the test after the corresponding fix. tests/d3d12.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d69b151a..8071faf0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7919,6 +7919,45 @@ static void test_shader_instructions(void) 0x00000000, 0x0100003e, }; static struct named_shader ps_loop_break = {"loop_break", ps_loop_break_code, sizeof(ps_loop_break_code)}; + static const DWORD ps_loop_end_break_code[] = + { +#if 0 + float4 src0; + + void main(out float4 dst : SV_Target) + { + float tmp = 0.0f; + for (int i = 0; i < src0.x; ++i) + { + if (i != src0.y) + { + tmp += 1.0f; + continue; + } + tmp = 1.0f; + break; + } + + dst = float4(tmp, 0, 0, 0); + } +#endif + 0x43425844, 0x0239f900, 0x5b94f73f, 0x68b75aa3, 0x27d353d2, 0x00000001, 0x000001e0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000168, 0x00000050, 0x0000005a, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x01000030, 0x0500002b, 0x00100042, 0x00000000, 0x0010001a, 0x00000000, + 0x0800001d, 0x00100082, 0x00000000, 0x0010002a, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x03040003, 0x0010003a, 0x00000000, 0x08000039, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, + 0x0020801a, 0x00000000, 0x00000000, 0x0304001f, 0x0010002a, 0x00000000, 0x07000000, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0700001e, 0x00100042, 0x00000000, + 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100086, + 0x00000000, 0x01000007, 0x01000015, 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x3f800000, + 0x01000002, 0x01000016, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, + 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static struct named_shader ps_loop_end_break = {"loop_end_break", ps_loop_end_break_code, sizeof(ps_loop_end_break_code)}; static const DWORD ps_loop_ret_code[] = { #if 0 @@ -9730,6 +9769,8 @@ static void test_shader_instructions(void) {&ps_loop_break, {{7.0f, 8.0f}}, {{7.0f}}}, {&ps_loop_break, {{7.0f, 9.0f}}, {{7.0f}}}, + {&ps_loop_end_break, {{7.0f, 2.0f}}, {{1.0f}}}, + {&ps_loop_ret, {{0.0f, 0.0f}}, {{0.0f}}}, {&ps_loop_ret, {{1.0f, 9.0f}}, {{1.0f}}}, {&ps_loop_ret, {{2.0f, 2.0f}}, {{2.0f}}}, -- 2.20.1

1 0

[PATCH vkd3d 1/3] vkd3d-shader/spirv: Omit the "endloop" branch to the loop start if the loop block was previously ended.
by Henri Verbeet Nov. 8, 2021

Nov. 8, 2021

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Avoiding generation of invalid SPIR-V. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Move the corresponding test after this patch in the series. There's not much point in comitting the test first if we're just going to skip it. libs/vkd3d-shader/spirv.c | 6 +++++- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9f6eb886..e5b9ef03 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7661,6 +7661,7 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c cf_info->u.loop.continue_block_id = continue_block_id; cf_info->u.loop.merge_block_id = merge_block_id; cf_info->current_block = VKD3D_BLOCK_LOOP; + cf_info->inside_block = true; vkd3d_spirv_build_op_name(builder, loop_header_block_id, "loop%u_header", compiler->loop_id); vkd3d_spirv_build_op_name(builder, loop_body_block_id, "loop%u_body", compiler->loop_id); @@ -7673,7 +7674,10 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c assert(compiler->control_flow_depth); assert(cf_info->current_block == VKD3D_BLOCK_LOOP); - vkd3d_spirv_build_op_branch(builder, cf_info->u.loop.continue_block_id); + /* The loop block may have already been ended by an unconditional + * break instruction right before the end of the loop. */ + if (cf_info->inside_block) + vkd3d_spirv_build_op_branch(builder, cf_info->u.loop.continue_block_id); vkd3d_spirv_build_op_label(builder, cf_info->u.loop.continue_block_id); vkd3d_spirv_build_op_branch(builder, cf_info->u.loop.header_block_id); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index d2045332..3982d073 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -814,6 +814,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_LOOP: cf_info = vkd3d_shader_scan_push_cf_info(context); cf_info->type = VKD3D_SHADER_BLOCK_LOOP; + cf_info->inside_block = true; break; case VKD3DSIH_ENDLOOP: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_LOOP) -- 2.20.1

1 0

[PATCH 4/5] win32u: Move NtUserRemoveProp implementation from user32.
by Jacek Caban Nov. 8, 2021

Nov. 8, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/property.c | 13 +------------ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 6 ++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ 7 files changed, 42 insertions(+), 13 deletions(-)

1 0