- Wine-Commits - list.winehq.org

Giovanni Mascellani : vkd3d-shader/ir: Dump the control flow graph in the GraphViz format.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: 2573d86ccf2027e946372040e1b57d867e5ab848 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2573d86ccf2027e946372040e1b57… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 14:59:52 2024 +0100 vkd3d-shader/ir: Dump the control flow graph in the GraphViz format. --- libs/vkd3d-shader/ir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 4da8c0cb..646a71a2 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3106,6 +3106,43 @@ static enum vkd3d_result vsir_cfg_add_edge(struct vsir_cfg *cfg, struct vsir_blo return VKD3D_OK; } +static void vsir_cfg_dump_dot(struct vsir_cfg *cfg) +{ + size_t i, j; + + TRACE("digraph cfg {\n"); + + for (i = 0; i < cfg->block_count; ++i) + { + struct vsir_block *block = &cfg->blocks[i]; + const char *shape; + + if (block->label == 0) + continue; + + switch (block->end->handler_idx) + { + case VKD3DSIH_RET: + shape = "trapezium"; + break; + + case VKD3DSIH_BRANCH: + shape = vsir_register_is_label(&block->end->src[0].reg) ? "ellipse" : "box"; + break; + + default: + vkd3d_unreachable(); + } + + TRACE(" n%u [label=\"%u\", shape=\"%s\"];\n", block->label, block->label, shape); + + for (j = 0; j < block->successors.count; ++j) + TRACE(" n%u -> n%u;\n", block->label, block->successors.blocks[j]->label); + } + + TRACE("}\n"); +} + static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program) { struct vsir_block *current_block = NULL; @@ -3189,6 +3226,9 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program } } + if (TRACE_ON()) + vsir_cfg_dump_dot(cfg); + return VKD3D_OK; fail:

1 0

Jinoh Kang : kernel32/tests: Fix console test with odd-sized consoles.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 232b18d820e08fe6534249a64d3afdbf35d0b688 URL: https://gitlab.winehq.org/wine/wine/-/commit/232b18d820e08fe6534249a64d3afd… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Feb 20 20:45:44 2024 +0900 kernel32/tests: Fix console test with odd-sized consoles. --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2904a31d014..8fadc624e05 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -545,8 +545,8 @@ static void doChild(const char* file, const char* option) ok( ret, "Setting mode (%ld)\n", GetLastError()); ret = SetConsoleMode(hConOut, modeOut ^ 1); ok( ret, "Setting mode (%ld)\n", GetLastError()); - sbi.dwCursorPosition.X ^= 1; - sbi.dwCursorPosition.Y ^= 1; + sbi.dwCursorPosition.X = !sbi.dwCursorPosition.X; + sbi.dwCursorPosition.Y = !sbi.dwCursorPosition.Y; ret = SetConsoleCursorPosition(hConOut, sbi.dwCursorPosition); ok( ret, "Setting cursor position (%ld)\n", GetLastError()); }

1 0

Alexandre Julliard : ntdll: Remove support for unwinding ELF dlls on ARM.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 2778e4542171c1127450ac88b778c570dd4c4e8f URL: https://gitlab.winehq.org/wine/wine/-/commit/2778e4542171c1127450ac88b778c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:38:28 2024 +0100 ntdll: Remove support for unwinding ELF dlls on ARM. --- dlls/ntdll/unix/signal_arm.c | 433 +------------------------------------------ 1 file changed, 1 insertion(+), 432 deletions(-)

1 0

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on x86-64.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 654c03d1317f4b22294109fee7ded2dbbe39645e URL: https://gitlab.winehq.org/wine/wine/-/commit/654c03d1317f4b22294109fee7ded2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:54:02 2024 +0100 ntdll: Handle leaf functions in RtlVirtualUnwind on x86-64. --- dlls/ntdll/signal_x86_64.c | 32 ++++++++++---------------------- dlls/ntdll/tests/unwind.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/ntdll/unwind.c | 12 +++++++++++- 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1303883ecfa..96a2da29201 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -100,22 +100,12 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; dispatch->ControlPc = context->Rip; + dispatch->FunctionEntry = RtlLookupFunctionEntry( context->Rip, &dispatch->ImageBase, + dispatch->HistoryTable ); - /* first look for PE exception information */ - - if ((dispatch->FunctionEntry = RtlLookupFunctionEntry( context->Rip, &dispatch->ImageBase, - dispatch->HistoryTable ))) - { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Rip, - dispatch->FunctionEntry, context, - &dispatch->HandlerData, &dispatch->EstablisherFrame, - NULL ); - return STATUS_SUCCESS; - } - - /* then look for host system exception information */ - - if (LdrFindEntryForAddress( (void *)context->Rip, &module ) || (module->Flags & LDR_WINE_INTERNAL)) + /* look for host system exception information */ + if (!dispatch->FunctionEntry && + (LdrFindEntryForAddress( (void *)context->Rip, &module ) || (module->Flags & LDR_WINE_INTERNAL))) { struct unwind_builtin_dll_params params = { type, dispatch, context }; @@ -127,14 +117,12 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } if (status != STATUS_UNSUCCESSFUL) return status; } + else WARN( "exception data not found for pc %p\n", (void *)context->Rip ); - /* no exception information, treat as a leaf function */ - - WARN( "exception data not found for pc %p\n", (void *)context->Rip ); - dispatch->EstablisherFrame = context->Rsp; - dispatch->LanguageHandler = NULL; - context->Rip = *(ULONG64 *)context->Rsp; - context->Rsp = context->Rsp + sizeof(ULONG64); + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Rip, + dispatch->FunctionEntry, context, + &dispatch->HandlerData, &dispatch->EstablisherFrame, + NULL ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/unwind.c b/dlls/ntdll/tests/unwind.c index 458c368bcc7..a68bda6c748 100644 --- a/dlls/ntdll/tests/unwind.c +++ b/dlls/ntdll/tests/unwind.c @@ -2632,15 +2632,17 @@ static void call_virtual_unwind_x86( int testnum, const struct unwind_test_x86 * UINT i, j, k, broken_k; ULONG64 fake_stack[256]; ULONG64 frame, orig_rip, orig_rbp, unset_reg; - UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; void *expected_handler, *broken_handler; memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); - memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); - - runtime_func.BeginAddress = code_offset; - runtime_func.EndAddress = code_offset + test->function_size; - runtime_func.UnwindData = unwind_offset; + if (test->unwind_info) + { + UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; + memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); + runtime_func.BeginAddress = code_offset; + runtime_func.EndAddress = code_offset + test->function_size; + runtime_func.UnwindData = unwind_offset; + } trace( "code: %p stack: %p\n", code_mem, fake_stack ); @@ -2660,8 +2662,10 @@ static void call_virtual_unwind_x86( int testnum, const struct unwind_test_x86 * (void *)orig_rip, *(BYTE *)orig_rip, (void *)orig_rbp, (void *)context.Rsp ); data = (void *)0xdeadbeef; + if (!test->unwind_info) fake_stack[0] = 0x1234; handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_rip, - &runtime_func, &context, &data, &frame, &ctx_ptr ); + test->unwind_info ? &runtime_func : NULL, + &context, &data, &frame, &ctx_ptr ); expected_handler = test->results[i].handler ? (char *)code_mem + 0x200 : NULL; broken_handler = test->broken_results && test->broken_results[i].handler ? (char *)code_mem + 0x200 : NULL; @@ -2671,7 +2675,8 @@ static void call_virtual_unwind_x86( int testnum, const struct unwind_test_x86 * if (handler) ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); else - ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); + ok( data == (test->unwind_info ? (void *)0xdeadbeef : NULL), + "%u/%u: handler data set to %p\n", testnum, i, data ); ok( context.Rip == test->results[i].rip || broken( test->broken_results && context.Rip == test->broken_results[i].rip ), @@ -2960,6 +2965,22 @@ static void test_virtual_unwind_x86(void) { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, }; +#if 0 + static const BYTE function_5[] = + { + 0x90, /* 00: nop */ + 0x90, /* 01: nop */ + 0xc3 /* 02: ret */ + }; + + static const struct results_x86 results_5[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x00, FALSE, 0x1234, 0x000, { {rsp,0x08}, {-1,-1} }}, + { 0x02, 0x00, FALSE, 0x1234, 0x000, { {rsp,0x08}, {-1,-1} }}, + }; +#endif + static const struct unwind_test_x86 tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0), broken_results_0 }, @@ -2969,6 +2990,9 @@ static void test_virtual_unwind_x86(void) /* Broken before Win10 1809. */ { function_4, sizeof(function_4), unwind_info_4, results_4, ARRAY_SIZE(results_4), broken_results_4 }, +#if 0 /* crashes before Win10 21H2 */ + { function_5, sizeof(function_5), NULL, results_5, ARRAY_SIZE(results_5) }, +#endif }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index ff68303e553..21a1669f659 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1838,9 +1838,19 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, #endif TRACE( "type %lx rip %I64x rsp %I64x\n", type, pc, context->Rsp ); - if (TRACE_ON(unwind)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; + + if (!function) /* leaf function */ + { + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + *data = NULL; + return NULL; + } + + if (TRACE_ON(unwind)) dump_unwind_info( base, function ); + for (;;) { info = (struct UNWIND_INFO *)((char *)base + function->UnwindData);

1 0

Louis Lenders : imm32: Update spec file.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 7a92a33b27b3e362c12539d6382dfe6444ed77cf URL: https://gitlab.winehq.org/wine/wine/-/commit/7a92a33b27b3e362c12539d6382dfe… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Feb 21 13:51:54 2024 +0100 imm32: Update spec file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56299 --- dlls/imm32/imm32.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 47b3916c822..df105743eca 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -1,3 +1,26 @@ +@ stub CtfImmAppCompatEnableIMEonProtectedCode +@ stub CtfImmCoUninitialize +@ stub CtfImmDispatchDefImeMessage +@ stub CtfImmEnterCoInitCountSkipMode +@ stub CtfImmGenerateMessage +@ stub CtfImmGetCompatibleKeyboardLayout +@ stub CtfImmGetGuidAtom +@ stub CtfImmGetIMEFileName +@ stub CtfImmGetTMAEFlags +@ stub CtfImmHideToolbarWnd +@ stub CtfImmIsCiceroEnabled +@ stub CtfImmIsCiceroStartedInThread +@ stub CtfImmIsGuidMapEnable +@ stub CtfImmIsTextFrameServiceDisabled +@ stub CtfImmLastEnabledWndDestroy +@ stub CtfImmLeaveCoInitCountSkipMode +@ stub CtfImmNotify +@ stub CtfImmRestoreToolbarWnd +@ stub CtfImmSetAppCompatFlags +@ stub CtfImmSetCiceroStartInThread +@ stub CtfImmSetDefaultRemoteKeyboardLayout +@ stub CtfImmTIMActivate +@ stub GetKeyboardLayoutCP @ stdcall ImmActivateLayout(long) @ stdcall ImmAssociateContext(long long) @ stdcall ImmAssociateContextEx(long long long)

1 0

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on ARM.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 18b0473fe91857dd46b9ee4d640fd5d531db8c3c URL: https://gitlab.winehq.org/wine/wine/-/commit/18b0473fe91857dd46b9ee4d640fd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:53:44 2024 +0100 ntdll: Handle leaf functions in RtlVirtualUnwind on ARM. --- dlls/ntdll/signal_arm.c | 41 +++++++---------- dlls/ntdll/tests/unwind.c | 112 +++++++++++++++++++++++++++------------------- dlls/ntdll/unwind.c | 11 +++-- 3 files changed, 90 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on ARM64.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 9f555cde204a3187bcbebd8c8685b7dca6c71843 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f555cde204a3187bcbebd8c8685b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:52:15 2024 +0100 ntdll: Handle leaf functions in RtlVirtualUnwind on ARM64. --- dlls/ntdll/signal_arm64.c | 38 +++++-------- dlls/ntdll/tests/unwind.c | 137 ++++++++++++++++++++++++++++------------------ dlls/ntdll/unwind.c | 12 +++- 3 files changed, 109 insertions(+), 78 deletions(-)

1 0

Alexandre Julliard : include: Add new idl files to the makefile.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 852e2ffc13ba5322a382f125921ba2fe5c43e118 URL: https://gitlab.winehq.org/wine/wine/-/commit/852e2ffc13ba5322a382f125921ba2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 12:56:33 2024 +0100 include: Add new idl files to the makefile. --- include/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3e05d259328..8d41cd109ad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -844,12 +844,14 @@ SOURCES = \ windows.graphics.directx.idl \ windows.graphics.effects.idl \ windows.graphics.holographic.idl \ + windows.graphics.imaging.idl \ windows.h \ windows.management.deployment.idl \ windows.media.capture.idl \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.effects.idl \ + windows.media.faceanalysis.idl \ windows.media.idl \ windows.media.render.idl \ windows.media.speechrecognition.idl \

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormatsKHR driver entry.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: f7bff8802fcecafaa571fdb870d81dec14862828 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7bff8802fcecafaa571fdb870d81d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:10:22 2023 +0100 winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormatsKHR driver entry. --- dlls/winemac.drv/vulkan.c | 14 -------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winewayland.drv/vulkan.c | 16 ---------------- dlls/winex11.drv/vulkan.c | 13 ------------- include/wine/vulkan_driver.h | 5 +---- 7 files changed, 5 insertions(+), 52 deletions(-)

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormats2KHR driver entry.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 8a9840805663f1414ec88606198813c1486c807b URL: https://gitlab.winehq.org/wine/wine/-/commit/8a9840805663f1414ec88606198813… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:09:54 2023 +0100 winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormats2KHR driver entry. --- dlls/winemac.drv/vulkan.c | 16 ------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan.c | 2 +- dlls/winewayland.drv/vulkan.c | 53 ------------------------------------------- dlls/winex11.drv/vulkan.c | 38 ------------------------------- include/wine/vulkan_driver.h | 5 +--- 6 files changed, 3 insertions(+), 114 deletions(-)

1 0