November 2023 - Wine-commits

Eric Pouech : kernel32/tests: Add more tests about CreateProcess.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 000f7faaa24d8391c8bea222717681e25517a180 URL: https://gitlab.winehq.org/wine/wine/-/commit/000f7faaa24d8391c8bea222717681… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 30 18:38:53 2023 +0100 kernel32/tests: Add more tests about CreateProcess. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ee2ba99d8f4..2fd55e8dc4a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3134,6 +3134,8 @@ static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst #define H_CONSOLE 0 #define H_DISK 1 +#define H_CHAR 2 +#define H_PIPE 3 #define ARG_STD 0x80000000 #define ARG_STARTUPINFO 0x00000000 @@ -3171,7 +3173,7 @@ static BOOL build_startupinfo( STARTUPINFOA *startup, unsigned args, HANDLE hstd { SECURITY_ATTRIBUTES inherit_sa = { sizeof(inherit_sa), NULL, TRUE }; SECURITY_ATTRIBUTES *psa; - BOOL needs_close = FALSE; + BOOL ret, needs_close = FALSE; psa = (args & ARG_HANDLE_INHERIT) ? &inherit_sa : NULL; @@ -3194,6 +3196,18 @@ static BOOL build_startupinfo( STARTUPINFOA *startup, unsigned args, HANDLE hstd ok(hstd[1] != INVALID_HANDLE_VALUE, "Couldn't create input to file %s\n", std_handle_file); needs_close = TRUE; break; + case H_CHAR: + hstd[0] = CreateFileA("NUL", GENERIC_READ, 0, psa, OPEN_EXISTING, 0, 0); + ok(hstd[0] != INVALID_HANDLE_VALUE, "Couldn't create input to NUL\n"); + hstd[1] = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, psa, OPEN_EXISTING, 0, 0); + ok(hstd[1] != INVALID_HANDLE_VALUE, "Couldn't create input to NUL\n"); + needs_close = TRUE; + break; + case H_PIPE: + ret = CreatePipe(&hstd[0], &hstd[1], psa, 0); + ok(ret, "Couldn't create anon pipe\n"); + needs_close = TRUE; + break; default: ok(0, "Unsupported handle type %x\n", args & ARG_HANDLE_MASK); return FALSE; @@ -3233,6 +3247,32 @@ static void test_StdHandleInheritance(void) int i, j; static const struct std_handle_test + nothing_cui[] = + { + /* all others handles type behave as H_DISK */ +/* 0*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 6}, + + /* all others handles type behave as H_DISK */ + {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 6}, + }, + nothing_gui[] = + { + /* testing all types because of discrepancies */ +/* 0*/ {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK, .is_todo = 6}, + {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_PIPE, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_PIPE}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_PIPE, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_PIPE, .is_todo = 6}, + {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CHAR, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_CHAR}, +/* 5*/ {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CHAR, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_CHAR, .is_todo = 6}, + {ARG_STARTUPINFO | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + + /* all others handles type behave as H_DISK */ + {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 7, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_todo = 7}, + }, detached_cui[] = { {ARG_STD | ARG_CP_INHERIT | ARG_HANDLE_INHERIT | H_CONSOLE, HATTR_NULL, .is_todo = 4}, @@ -3260,6 +3300,8 @@ static void test_StdHandleInheritance(void) tests[] = { #define X(d, cg, s) {(d), (cg), s, ARRAY_SIZE(s), #s} + X(0, TRUE, nothing_cui), + X(0, FALSE, nothing_gui), X(DETACHED_PROCESS, TRUE, detached_cui), X(DETACHED_PROCESS, FALSE, detached_gui), #undef X

1 0

Alexandre Julliard : ntdll: Call Wow64PrepareForException directly from KiUserExceptionDispatcher.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 334f54c255d045f0f07b9e1cdf9b5aef8a30b88f URL: https://gitlab.winehq.org/wine/wine/-/commit/334f54c255d045f0f07b9e1cdf9b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 11:25:23 2023 +0100 ntdll: Call Wow64PrepareForException directly from KiUserExceptionDispatcher. This requires moving the stack switch to Wow64PrepareForException. Based on a patch by Paul Gofman. --- dlls/ntdll/signal_x86_64.c | 34 ++++++++--------------------- dlls/ntdll/tests/wow64.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.c | 35 +++++++++++++++++++++++++++++- dlls/wow64/wow64.spec | 2 +- 4 files changed, 97 insertions(+), 27 deletions(-)

1 0

Alexandre Julliard : ntdll: Allow unwind rules to override the default stack pointer assignment.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 93a3a6c03f4114ec05fbd26cb684d0859575f5b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/93a3a6c03f4114ec05fbd26cb684d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 11:23:29 2023 +0100 ntdll: Allow unwind rules to override the default stack pointer assignment. --- dlls/ntdll/unix/dwarf.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index 8deb845ca13..51102cd4a7e 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -980,6 +980,12 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state, } if (!cfa) return; +#ifdef __x86_64__ + new_context.Rsp = cfa; +#elif defined(__aarch64__) + new_context.Sp = cfa; +#endif + for (i = 0; i < NB_FRAME_REGS; i++) { switch (state->rules[i]) @@ -1004,11 +1010,6 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state, break; } } -#ifdef __x86_64__ - new_context.Rsp = cfa; -#elif defined(__aarch64__) - new_context.Sp = cfa; -#endif *context = new_context; }

1 0

Alexandre Julliard : ntdll/tests: Simplify the KiUserExceptionDispatcher tests a little.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 8164c7087fc80e03c9daeac04e4dffc1b8f5aa6e URL: https://gitlab.winehq.org/wine/wine/-/commit/8164c7087fc80e03c9daeac04e4dff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 10:48:31 2023 +0100 ntdll/tests: Simplify the KiUserExceptionDispatcher tests a little. --- dlls/ntdll/tests/exception.c | 59 ++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 94dcb495f7a..573db254738 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -34,6 +34,7 @@ #include "intrin.h" static void *code_mem; +static HMODULE hntdll; static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); @@ -78,6 +79,8 @@ static BOOL (WINAPI *pSetXStateFeaturesMask)(CONTEXT *context, DWORD64 feat static BOOL (WINAPI *pGetXStateFeaturesMask)(CONTEXT *context, DWORD64 *feature_mask); static BOOL (WINAPI *pWaitForDebugEventEx)(DEBUG_EVENT *, DWORD); +static void *pKiUserExceptionDispatcher; + #define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 typedef struct _RTL_UNLOAD_EVENT_TRACE @@ -1833,7 +1836,6 @@ static void test_thread_context(void) } static BYTE saved_KiUserExceptionDispatcher_bytes[7]; -static void *pKiUserExceptionDispatcher; static BOOL hook_called; static void *hook_KiUserExceptionDispatcher_eip; static void *dbg_except_continue_handler_eip; @@ -1891,7 +1893,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE /* XP and Vista+ have ExceptionAddress == Eip + 1, Eip is adjusted even * for software raised breakpoint exception. * Win2003 has Eip not adjusted and matching ExceptionAddress. - * Win2008 has Eip not adjuated and ExceptionAddress not filled for + * Win2008 has Eip not adjusted and ExceptionAddress not filled for * software raised exception. */ context->Eip = (ULONG_PTR)rec->ExceptionAddress; } @@ -1900,7 +1902,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE } /* Use CDECL to leave arguments on stack. */ -static void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +static void * CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); trace("context->Eip %#lx, context->Esp %#lx, ContextFlags %#lx.\n", @@ -1915,12 +1917,12 @@ static void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT hook_exception_address = rec->ExceptionAddress; memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, sizeof(saved_KiUserExceptionDispatcher_bytes)); + return pKiUserExceptionDispatcher; } -static void test_kiuserexceptiondispatcher(void) +static void test_KiUserExceptionDispatcher(void) { PVOID vectored_handler; - HMODULE hntdll = GetModuleHandleA("ntdll.dll"); static BYTE except_code[] = { 0xb9, /* mov imm32, %ecx */ @@ -1959,28 +1961,17 @@ static void test_kiuserexceptiondispatcher(void) { 0xff, 0x15, /* offset: 2 bytes */ - 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ - - 0xff, 0x25, - /* offset: 8 bytes */ - 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + 0x00, 0x00, 0x00, 0x00, /* call *addr */ /* call hook implementation. */ + 0xff, 0xe0, /* jmp *%eax */ }; void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; BYTE patched_KiUserExceptionDispatcher_bytes[7]; - void *phook_trampoline = hook_trampoline; DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; void *bpt_address; BYTE *ptr; BOOL ret; - pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); - if (!pKiUserExceptionDispatcher) - { - win_skip("KiUserExceptionDispatcher is not available.\n"); - return; - } - if (!pRtlUnwind) { win_skip("RtlUnwind is not available.\n"); @@ -1991,7 +1982,6 @@ static void test_kiuserexceptiondispatcher(void) *(DWORD *)(except_code + 0x1d) = (DWORD)&test_kiuserexceptiondispatcher_regs.new_eax; *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; - *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); @@ -2004,9 +1994,9 @@ static void test_kiuserexceptiondispatcher(void) sizeof(saved_KiUserExceptionDispatcher_bytes)); ptr = patched_KiUserExceptionDispatcher_bytes; - /* mov hook_trampoline, %eax */ - *ptr++ = 0xa1; - *(void **)ptr = &phook_trampoline; + /* mov $hook_trampoline, %eax */ + *ptr++ = 0xb8; + *(void **)ptr = hook_trampoline; ptr += sizeof(void *); /* jmp *eax */ *ptr++ = 0xff; @@ -4631,7 +4621,6 @@ done: } static BYTE saved_KiUserExceptionDispatcher_bytes[12]; -static void *pKiUserExceptionDispatcher; static BOOL hook_called; static void *hook_KiUserExceptionDispatcher_rip; static void *dbg_except_continue_handler_rip; @@ -4698,7 +4687,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE return EXCEPTION_CONTINUE_EXECUTION; } -static void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +static void * WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); trace("context->Rip %#Ix, context->Rsp %#Ix, ContextFlags %#lx.\n", @@ -4713,12 +4702,12 @@ static void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT hook_exception_address = rec->ExceptionAddress; memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, sizeof(saved_KiUserExceptionDispatcher_bytes)); + return pKiUserExceptionDispatcher; } -static void test_kiuserexceptiondispatcher(void) +static void test_KiUserExceptionDispatcher(void) { LPVOID vectored_handler; - HMODULE hntdll = GetModuleHandleA("ntdll.dll"); static BYTE except_code[] = { 0x48, 0xb9, /* mov imm64, %rcx */ @@ -4762,8 +4751,6 @@ static void test_kiuserexceptiondispatcher(void) 0xff, 0xd0, /* callq *rax */ 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ - 0x48, 0xb8, /* movabs pKiUserExceptionDispatcher,%rax */ - 0,0,0,0,0,0,0,0, /* offset 34 */ 0xff, 0xe0, /* jmpq *rax */ }; @@ -4776,18 +4763,10 @@ static void test_kiuserexceptiondispatcher(void) BYTE *ptr; BOOL ret; - pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); - if (!pKiUserExceptionDispatcher) - { - win_skip("KiUserExceptionDispatcher is not available.\n"); - return; - } - *(ULONG64 *)(except_code + 2) = (ULONG64)&test_kiuserexceptiondispatcher_regs; *(ULONG64 *)(except_code + 0x2a) = (ULONG64)&test_kiuserexceptiondispatcher_regs.new_rax; *(ULONG_PTR *)(hook_trampoline + 16) = (ULONG_PTR)hook_KiUserExceptionDispatcher; - *(ULONG_PTR *)(hook_trampoline + 34) = (ULONG_PTR)pKiUserExceptionDispatcher; trampoline_ptr = (char *)code_mem + 1024; memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); @@ -5144,7 +5123,6 @@ static void test_syscall_clobbered_regs(void) NTSTATUS (WINAPI *func)(void *arg1, void *arg2, struct regs *, void *call_addr); NTSTATUS (WINAPI *pNtCancelTimer)(HANDLE, BOOLEAN *); - HMODULE hntdll = GetModuleHandleA("ntdll.dll"); struct regs regs; CONTEXT context; NTSTATUS status; @@ -11421,11 +11399,11 @@ static void test_set_live_context(void) START_TEST(exception) { - HMODULE hntdll = GetModuleHandleA("ntdll.dll"); HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); #if defined(__x86_64__) HMODULE hmsvcrt = LoadLibraryA("msvcrt.dll"); #endif + hntdll = GetModuleHandleA("ntdll.dll"); my_argc = winetest_get_mainargs( &my_argv ); @@ -11475,6 +11453,7 @@ START_TEST(exception) X(RtlGetExtendedFeaturesMask); X(RtlCopyContext); X(RtlCopyExtendedContext); + X(KiUserExceptionDispatcher); #undef X #define X(f) p##f = (void*)GetProcAddress(hkernel32, #f) @@ -11597,7 +11576,7 @@ START_TEST(exception) test_fpu_exceptions(); test_dpe_exceptions(); test_prot_fault(); - test_kiuserexceptiondispatcher(); + test_KiUserExceptionDispatcher(); test_extended_context(); test_copy_context(); test_set_live_context(); @@ -11634,7 +11613,7 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); - test_kiuserexceptiondispatcher(); + test_KiUserExceptionDispatcher(); test_nested_exception(); test_collided_unwind();

1 0

Alexandre Julliard : ntdll: Add a machine frame to the KiUserExceptionDispatcher stack on x86-64.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 061c612b5e7bf87c7241540b8577a40722a68be7 URL: https://gitlab.winehq.org/wine/wine/-/commit/061c612b5e7bf87c7241540b8577a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 16:30:37 2023 +0100 ntdll: Add a machine frame to the KiUserExceptionDispatcher stack on x86-64. --- dlls/ntdll/signal_x86_64.c | 49 ++++++++++++----------- dlls/ntdll/tests/exception.c | 23 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 86 +++++++++++++++++++++-------------------- dlls/wow64cpu/cpu.c | 12 ++++++ 4 files changed, 105 insertions(+), 65 deletions(-)

1 0

Alexandre Julliard : ntdll: Add a machine frame to the KiUserApcDispatcher stack on x86-64.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 8b24139fa730ccc8e921b0a8622872e5a8df6d7f URL: https://gitlab.winehq.org/wine/wine/-/commit/8b24139fa730ccc8e921b0a8622872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 16:44:52 2023 +0100 ntdll: Add a machine frame to the KiUserApcDispatcher stack on x86-64. --- dlls/ntdll/signal_x86_64.c | 56 ++++++++++++++----------- dlls/ntdll/tests/exception.c | 91 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 37 ++++++++--------- 3 files changed, 142 insertions(+), 42 deletions(-)

1 0

Alexandre Julliard : ntdll: Add a machine frame to the KiUserCallbackDispatcher stack on x86-64.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 0690851c9b52bbcd40b2e2e20a51ea555debe940 URL: https://gitlab.winehq.org/wine/wine/-/commit/0690851c9b52bbcd40b2e2e20a51ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 16:56:23 2023 +0100 ntdll: Add a machine frame to the KiUserCallbackDispatcher stack on x86-64. --- dlls/ntdll/signal_x86_64.c | 16 ++++++-- dlls/ntdll/tests/exception.c | 82 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 50 +++++++++++++++---------- 3 files changed, 126 insertions(+), 22 deletions(-)

1 0

Piotr Caban : gdi32: Add ETO_PDY flag support in EMFDC_ExtTextOut.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 4446db72ebdaa768ba218940dd286c0edaedf6e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4446db72ebdaa768ba218940dd286c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 29 20:48:55 2023 +0100 gdi32: Add ETO_PDY flag support in EMFDC_ExtTextOut. --- dlls/gdi32/emfdc.c | 38 +++++++++++++++++++++++++++----------- dlls/gdi32/tests/metafile.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 63110f57eeb..b2d1c894359 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1336,13 +1336,15 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *r HDC hdc = dc_attr_handle( dc_attr ); FLOAT ex_scale, ey_scale; EMREXTTEXTOUTW *emr; - int text_height = 0; + int text_height = 0, top = y, bottom = y; int text_width = 0; TEXTMETRICW tm; - DWORD size; + DWORD dx_len, size; BOOL ret; - size = sizeof(*emr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT); + if (!dx && flags & ETO_PDY) return FALSE; + dx_len = flags & ETO_PDY ? count * 2 : count; + size = sizeof(*emr) + ((count+1) & ~1) * sizeof(WCHAR) + dx_len * sizeof(INT); TRACE( "%s %s count %d size = %ld\n", debugstr_wn(str, count), wine_dbgstr_rect(rect), count, size ); @@ -1399,10 +1401,24 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *r { UINT i; SIZE str_size; - memcpy( (char*)emr + emr->emrtext.offDx, dx, count * sizeof(INT) ); - for (i = 0; i < count; i++) text_width += dx[i]; + memcpy( (char*)emr + emr->emrtext.offDx, dx, dx_len * sizeof(INT) ); if (GetTextExtentPoint32W( hdc, str, count, &str_size )) text_height = str_size.cy; + if (flags & ETO_PDY) + { + int cur_y = y; + for (i = 0; i < count; i++) + { + top = min( top, cur_y ); + bottom = max( bottom, cur_y ); + text_width += dx[2 * i]; + cur_y -= dx[2 * i + 1]; + } + } + else + { + for (i = 0; i < count; i++) text_width += dx[i]; + } } else { @@ -1451,18 +1467,18 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *r if (!GetTextMetricsW( hdc, &tm )) tm.tmDescent = 0; /* Play safe here... it's better to have a bounding box */ /* that is too big than too small. */ - emr->rclBounds.top = y - text_height - 1; - emr->rclBounds.bottom = y + tm.tmDescent + 1; + emr->rclBounds.top = top - text_height - 1; + emr->rclBounds.bottom = bottom + tm.tmDescent + 1; break; case TA_BOTTOM: - emr->rclBounds.top = y - text_height - 1; - emr->rclBounds.bottom = y; + emr->rclBounds.top = top - text_height - 1; + emr->rclBounds.bottom = bottom; break; default: /* TA_TOP */ - emr->rclBounds.top = y; - emr->rclBounds.bottom = y + text_height + 1; + emr->rclBounds.top = top; + emr->rclBounds.bottom = bottom + text_height + 1; } emfdc_update_bounds( emf, &emr->rclBounds ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9abd98b0f92..ab7882f9641 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -141,10 +141,23 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(emr_ExtTextOutW->rclBounds.bottom != -1, "emr_ExtTextOutW->rclBounds.bottom = %ld\n", emr_ExtTextOutW->rclBounds.bottom); - for(i = 0; i < emr_ExtTextOutW->emrtext.nChars; i++) + if(emr_ExtTextOutW->emrtext.fOptions & ETO_PDY) { - ok(orig_dx[i] == dx[i], "pass %d: dx[%ld] (%d) didn't match %d\n", - n_record, i, dx[i], orig_dx[i]); + ok(emr_ExtTextOutW->rclBounds.top < 0, "emr_ExtTextOutW->rclBounds.top = %ld\n", + emr_ExtTextOutW->rclBounds.top); + for(i = 0; i < emr_ExtTextOutW->emrtext.nChars * 2; i++) + { + ok(orig_dx[i] == dx[i], "pass %d: dx[%ld] (%d) didn't match %d\n", + n_record, i, dx[i], orig_dx[i]); + } + } + else + { + for(i = 0; i < emr_ExtTextOutW->emrtext.nChars; i++) + { + ok(orig_dx[2 * i] == dx[i], "pass %d: dx[%ld] (%d) didn't match %d\n", + n_record, i, dx[i], orig_dx[i]); + } } n_record++; emr_processed = TRUE; @@ -214,10 +227,21 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 0, 0, &rc, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %ld\n", GetLastError()); + ret = ExtTextOutA(hdcMetafile, 0, 0, ETO_PDY, &rc, text, len, NULL); + ok( !ret, "ExtTextOutA succeeded\n"); + /* 2. pass custom lpDx */ ret = ExtTextOutA(hdcMetafile, 0, 20, 0, &rc, text, lstrlenA(text), dx); ok( ret, "ExtTextOutA error %ld\n", GetLastError()); + for (i = len - 1; i >= 0; i--) + { + dx[2 * i] = dx[i]; + dx[2 * i + 1] = 1; + } + ret = ExtTextOutA(hdcMetafile, 0, 20, ETO_PDY, &rc, text, len, dx); + ok( ret, "ExtTextOutA error %ld\n", GetLastError()); + /* 3. pass NULL lprc */ ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %ld\n", GetLastError());

1 0

Rémi Bernon : winevulkan: Use a local instance variable instead of phys_dev->instance.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 29e5b682c87dc10fdc84f79af5fbfe252789421c URL: https://gitlab.winehq.org/wine/wine/-/commit/29e5b682c87dc10fdc84f79af5fbfe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 13:17:18 2023 +0100 winevulkan: Use a local instance variable instead of phys_dev->instance. --- dlls/winevulkan/vulkan.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index df109e5c84a..41798034c4d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -735,6 +735,7 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre void *client_ptr) { struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(phys_dev_handle); + struct wine_instance *instance = phys_dev->instance; VkDevice device_handle = client_ptr; VkDeviceCreateInfo create_info_host; struct VkQueue_T *queue_handles; @@ -751,7 +752,7 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre { VkPhysicalDeviceProperties properties; - phys_dev->instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev->phys_dev, &properties); + instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev->phys_dev, &properties); TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID); @@ -766,10 +767,10 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre init_conversion_context(&ctx); res = wine_vk_device_convert_create_info(phys_dev, &ctx, create_info, &create_info_host); if (res == VK_SUCCESS) - res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, - &create_info_host, NULL /* allocator */, &object->device); + res = instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, &create_info_host, + NULL /* allocator */, &object->device); free_conversion_context(&ctx); - WINE_VK_ADD_DISPATCHABLE_MAPPING(phys_dev->instance, device_handle, object->device, object); + WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, device_handle, object->device, object); if (res != VK_SUCCESS) { WARN("Failed to create device, res=%d.\n", res); @@ -815,7 +816,7 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre next_queue += queue_count; } - device_handle->quirks = phys_dev->instance->quirks; + device_handle->quirks = instance->quirks; device_handle->base.unix_handle = (uintptr_t)object; *ret_device = device_handle; TRACE("Created device %p (native device %p).\n", object, object->device);

1 0

Rémi Bernon : winevulkan: Search for debug report callback from the start of the chain.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: bfb5064f505d3252aa695aaff723deff148508bb URL: https://gitlab.winehq.org/wine/wine/-/commit/bfb5064f505d3252aa695aaff723de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 24 17:08:35 2023 +0100 winevulkan: Search for debug report callback from the start of the chain. --- dlls/winevulkan/vulkan.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 41798034c4d..b748f8cba98 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -512,9 +512,7 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context * debug_utils_messenger->pUserData = &object->utils_messengers[i]; } - debug_report_callback = find_next_struct(header->pNext, - VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT); - if (debug_report_callback) + if ((debug_report_callback = find_next_struct(dst->pNext, VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT))) { object->default_callback.instance = object; object->default_callback.debug_callback = VK_NULL_HANDLE;

1 0