June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used

by Matteo Bruni (＠Mystral)

I think there is a typo in the first commit's message (sgl_drawable -> gl_drawable) but otherwise it looks good to me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/244#note_2347

June 20, 2022

Re: [PATCH v2 0/1] MR268: riched20: Commit and repaint after the SetFont method is called. (#53169)

by Jinoh Kang (＠iamahuman)

Superceded by MR !284. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/268#note_2345

June 20, 2022

Re: [PATCH v2 0/1] MR268: riched20: Commit and repaint after the SetFont method is called. (#53169) - closed

by Jinoh Kang (＠iamahuman)

This merge request was closed by Jinoh Kang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/268

June 20, 2022

Re: [PATCH v2 0/1] MR267: riched20: Commit and repaint after changing TextFont properties. (#53170) - closed

by Jinoh Kang (＠iamahuman)

This merge request was closed by Jinoh Kang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/267

June 20, 2022

Re: [PATCH v2 0/1] MR267: riched20: Commit and repaint after changing TextFont properties. (#53170)

by Jinoh Kang (＠iamahuman)

> (Yes, the repaint logic is a mess). My sincere apologies for my offensive comment. I'm aware that, by nature, any of my impression of the codebase is subjective, and I always recognize that there is nobody to blame for it given the current situation even if the code was, indeed, "a mess." Also, I'll try to refrain from using language that may sound to someone like I'm condemning them. > This also applies to MR 268. FWIW, it would be easier from a reviewer standpoint if these two MRs were merged into one MR containing two commits. ACK. I merged them into MR !284. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/267#note_2342

June 20, 2022

Re: [PATCH 2/2] ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117297 Your paranoid android. === w7u_2qxl (32 bit report) === ntdll: exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w7u_adm (32 bit report) === ntdll: exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w7u_el (32 bit report) === ntdll: exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w8 (32 bit report) === ntdll: exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w8adm (32 bit report) === ntdll: exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10724: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10731: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200

June 20, 2022

Re: [PATCH 1/2] ntdll/tests: Test for setting x86 / x64 EFLAGS register in context.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117296 Your paranoid android. === w7u_2qxl (32 bit report) === ntdll: exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w7u_adm (32 bit report) === ntdll: exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w7u_el (32 bit report) === ntdll: exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3f4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w8 (32 bit report) === ntdll: exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 === w8adm (32 bit report) === ntdll: exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200 exception.c:10725: Test failed: Expected EFlags to be 0x3f0fd7, got 0x3d4fd7 exception.c:10733: Test failed: Expected EFlags to be 0x3f0fd7, got 0x200

June 20, 2022

[PATCH 1/1] riched20: Commit and wrap paragraphs after changing text properties.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53170 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3d88b8a65b0..afecd34dc2a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -647,6 +647,9 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); } } @@ -805,6 +808,9 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); return S_OK; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/284

June 20, 2022

[PATCH 0/1] MR284: riched20: Commit and wrap paragraphs after changing text properties. (#53170)

by Jinoh Kang (＠iamahuman)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/284

June 20, 2022

[PATCH 2/2] ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/exception.c | 2 -- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- dlls/ntdll/unix/thread.c | 20 +++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 13 +++++++++++++ 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ee486380b8d..169045bf5e6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10721,7 +10721,6 @@ static void test_eflags_sanitization(void) ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", status); status = pNtGetContextThread(thread, &context); ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status); - todo_wine ok(context.EFlags == max_eflags, "Expected EFlags to be %#lx, got %#lx\n", max_eflags, context.EFlags); context.EFlags = 0; @@ -10729,7 +10728,6 @@ static void test_eflags_sanitization(void) ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", status); status = pNtGetContextThread(thread, &context); ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status); - todo_wine ok(context.EFlags == min_eflags, "Expected EFlags to be %#lx, got %#lx\n", max_eflags, context.EFlags); context.EFlags = old_eflags; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7be0c39c424..9be0769904d 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -941,7 +941,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) frame->esp = context->Esp; frame->ebp = context->Ebp; frame->eip = context->Eip; - frame->eflags = context->EFlags; + frame->eflags = arch_flags_reg_from_user( context->EFlags, IMAGE_FILE_MACHINE_I386 ); frame->cs = context->SegCs; frame->ss = context->SegSs; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6c87e347eac..c4f67a16cc9 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1788,7 +1788,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) frame->rsp = context->Rsp; frame->rbp = context->Rbp; frame->rip = context->Rip; - frame->eflags = context->EFlags; + frame->eflags = arch_flags_reg_from_user( context->EFlags, IMAGE_FILE_MACHINE_AMD64 ); frame->cs = context->SegCs; frame->ss = context->SegSs; } @@ -2002,7 +2002,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) wow_frame->Esp = context->Esp; wow_frame->Ebp = context->Ebp; wow_frame->Eip = context->Eip; - wow_frame->EFlags = context->EFlags; + wow_frame->EFlags = arch_flags_reg_from_user( context->EFlags, IMAGE_FILE_MACHINE_I386 ); wow_frame->SegCs = cs32_sel; wow_frame->SegSs = ds64_sel; cpu->Flags |= WOW64_CPURESERVED_FLAG_RESET_STATE; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index ad47a5fce74..e0d44bb4a38 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1663,13 +1663,31 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USHORT machine ) { context_t server_contexts[2]; - unsigned int count = 0; + unsigned int count = 0, i; NTSTATUS ret; context_to_server( &server_contexts[count++], native_machine, context, machine ); if (machine != native_machine) context_to_server( &server_contexts[count++], machine, context, machine ); + for (i = 0; i < count; i++) + { + unsigned int *flags_ptr; + if (!(server_contexts[i].flags & SERVER_CTX_CONTROL)) continue; + switch (server_contexts[i].machine) + { + case IMAGE_FILE_MACHINE_I386: + flags_ptr = &server_contexts[i].ctl.i386_regs.eflags; + break; + case IMAGE_FILE_MACHINE_AMD64: + flags_ptr = &server_contexts[i].ctl.x86_64_regs.flags; + break; + default: + continue; + } + *flags_ptr = arch_flags_reg_from_user( *flags_ptr, machine ); + } + SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 795fc148479..3558f898b36 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -458,4 +458,17 @@ static inline NTSTATUS map_section( HANDLE mapping, void **ptr, SIZE_T *size, UL 0, NULL, size, ViewShare, 0, protect ); } +static inline DWORD arch_flags_reg_from_user( DWORD flags, USHORT machine ) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: + return (flags & 0x003f0fd7) | 0x00000202; + case IMAGE_FILE_MACHINE_AMD64: + return (flags & 0x00210fd5) | 0x00000200; + default: + return flags; + } +} + #endif /* __NTDLL_UNIX_PRIVATE_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/283

June 20, 2022