February 2024 - Wine-commits

Alex Henrie : msxml3: Use CRT allocation functions.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 73685eb080292cb6c9ba8298cc91e0321a922b1b URL: https://gitlab.winehq.org/wine/wine/-/commit/73685eb080292cb6c9ba8298cc91e0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 17 22:48:26 2024 -0700 msxml3: Use CRT allocation functions. --- dlls/msxml3/attribute.c | 4 ++-- dlls/msxml3/bsc.c | 4 ++-- dlls/msxml3/cdata.c | 4 ++-- dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/dispex.c | 19 +++++++-------- dlls/msxml3/docfrag.c | 4 ++-- dlls/msxml3/doctype.c | 4 ++-- dlls/msxml3/domdoc.c | 58 ++++++++++++++++++++++----------------------- dlls/msxml3/domimpl.c | 4 ++-- dlls/msxml3/element.c | 44 +++++++++++++++++----------------- dlls/msxml3/entityref.c | 4 ++-- dlls/msxml3/factory.c | 6 ++--- dlls/msxml3/httprequest.c | 34 +++++++++++++------------- dlls/msxml3/main.c | 8 +++---- dlls/msxml3/msxml_dispex.h | 1 - dlls/msxml3/msxml_private.h | 7 +++--- dlls/msxml3/mxnamespace.c | 22 ++++++++--------- dlls/msxml3/mxwriter.c | 42 ++++++++++++++++---------------- dlls/msxml3/node.c | 32 ++++++++++++------------- dlls/msxml3/nodelist.c | 4 ++-- dlls/msxml3/nodemap.c | 4 ++-- dlls/msxml3/parseerror.c | 4 ++-- dlls/msxml3/pi.c | 14 +++++------ dlls/msxml3/schema.c | 46 +++++++++++++++++------------------ dlls/msxml3/selection.c | 10 ++++---- dlls/msxml3/stylesheet.c | 14 +++++------ dlls/msxml3/text.c | 4 ++-- dlls/msxml3/xmldoc.c | 4 ++-- dlls/msxml3/xmlelem.c | 18 +++++++------- dlls/msxml3/xmlparser.c | 5 ++-- dlls/msxml3/xmlview.c | 18 +++++++------- 31 files changed, 223 insertions(+), 227 deletions(-)

1 0

Rémi Bernon : winevulkan: Implement vkGetPhysicalDeviceSurfaceFormats2KHR fallback.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 64ced5a345c0401afa0b9f564bfbe13255c96264 URL: https://gitlab.winehq.org/wine/wine/-/commit/64ced5a345c0401afa0b9f564bfbe1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 1 12:06:35 2023 +0100 winevulkan: Implement vkGetPhysicalDeviceSurfaceFormats2KHR fallback. --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 50 +++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 52 +++-------------------------------------- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 55 insertions(+), 49 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4417b3a04bf..be5a6c8e531 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -261,6 +261,7 @@ MANUAL_UNIX_THUNKS = { "vkGetPhysicalDevicePresentRectanglesKHR", "vkGetPhysicalDeviceSurfaceCapabilities2KHR", "vkGetPhysicalDeviceSurfaceCapabilitiesKHR", + "vkGetPhysicalDeviceSurfaceFormats2KHR", "vkMapMemory", "vkMapMemory2KHR", "vkUnmapMemory", diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 32cd900d83d..fe7072ade22 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1939,6 +1939,56 @@ VkResult wine_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice device_ha surface->host_surface, rect_count, rects); } +VkResult wine_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice device_handle, VkSurfaceKHR surface_handle, + uint32_t *format_count, VkSurfaceFormatKHR *formats) +{ + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); + struct wine_surface *surface = wine_surface_from_handle(surface_handle); + struct wine_instance *instance = physical_device->instance; + + return instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device->host_physical_device, surface->driver_surface, + format_count, formats); +} + +VkResult wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice device_handle, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, + uint32_t *format_count, VkSurfaceFormat2KHR *formats) +{ + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); + struct wine_surface *surface = wine_surface_from_handle(surface_info->surface); + VkPhysicalDeviceSurfaceInfo2KHR surface_info_host = *surface_info; + struct wine_instance *instance = physical_device->instance; + VkResult res; + + if (!physical_device->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR) + { + VkSurfaceFormatKHR *surface_formats; + UINT i; + + /* Until the loader version exporting this function is common, emulate it using the older non-2 version. */ + if (surface_info->pNext) FIXME("Emulating vkGetPhysicalDeviceSurfaceFormats2KHR, ignoring pNext.\n"); + + if (!formats) return wine_vkGetPhysicalDeviceSurfaceFormatsKHR(device_handle, surface_info->surface, format_count, NULL); + + surface_formats = calloc(*format_count, sizeof(*surface_formats)); + if (!surface_formats) return VK_ERROR_OUT_OF_HOST_MEMORY; + + res = wine_vkGetPhysicalDeviceSurfaceFormatsKHR(device_handle, surface_info->surface, format_count, surface_formats); + if (res == VK_SUCCESS || res == VK_INCOMPLETE) + { + for (i = 0; i < *format_count; i++) + formats[i].surfaceFormat = surface_formats[i]; + } + + free(surface_formats); + return res; + } + + surface_info_host.surface = surface->driver_surface; + + return instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(physical_device->host_physical_device, + &surface_info_host, format_count, formats); +} + VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance handle, const VkDebugUtilsMessengerCreateInfoEXT *create_info, const VkAllocationCallbacks *allocator, diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 3667fc51d90..886186332d6 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -28124,50 +28124,6 @@ static inline void convert_VkSurfaceCapabilities2KHR_host_to_win32(const VkSurfa } } -#ifdef _WIN64 -static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_driver(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->surface = in->surface ? wine_surface_from_handle(in->surface)->driver_surface : 0; -} -#endif /* _WIN64 */ - -static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_driver(struct conversion_context *ctx, const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR *out) -{ - const VkBaseInStructure32 *in_header; - VkBaseOutStructure *out_header = (void *)out; - - if (!in) return; - - out->sType = in->sType; - out->pNext = NULL; - out->surface = in->surface ? wine_surface_from_handle(in->surface)->driver_surface : 0; - - for (in_header = UlongToPtr(in->pNext); in_header; in_header = UlongToPtr(in_header->pNext)) - { - switch (in_header->sType) - { - case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT: - { - VkSurfacePresentModeEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); - const VkSurfacePresentModeEXT32 *in_ext = (const VkSurfacePresentModeEXT32 *)in_header; - out_ext->sType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT; - out_ext->pNext = NULL; - out_ext->presentMode = in_ext->presentMode; - out_header->pNext = (void *)out_ext; - out_header = (void *)out_ext; - break; - } - default: - FIXME("Unhandled sType %u.\n", in_header->sType); - break; - } - } -} - static inline void convert_VkSurfaceFormat2KHR_win32_to_host(struct conversion_context *ctx, const VkSurfaceFormat2KHR32 *in, VkSurfaceFormat2KHR *out) { const VkBaseInStructure32 *in_header; @@ -43515,12 +43471,10 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) { struct vkGetPhysicalDeviceSurfaceFormats2KHR_params *params = args; - VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_driver(params->pSurfaceInfo, &pSurfaceInfo_host); - params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle(params->physicalDevice)->host_physical_device, &pSurfaceInfo_host, params->pSurfaceFormatCount, params->pSurfaceFormats); + params->result = wine_vkGetPhysicalDeviceSurfaceFormats2KHR(params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -43543,9 +43497,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) TRACE("%#x, %#x, %#x, %#x\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); init_conversion_context(ctx); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_driver(ctx, (const VkPhysicalDeviceSurfaceInfo2KHR32 *)UlongToPtr(params->pSurfaceInfo), &pSurfaceInfo_host); + convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(ctx, (const VkPhysicalDeviceSurfaceInfo2KHR32 *)UlongToPtr(params->pSurfaceInfo), &pSurfaceInfo_host); pSurfaceFormats_host = convert_VkSurfaceFormat2KHR_array_win32_to_host(ctx, (VkSurfaceFormat2KHR32 *)UlongToPtr(params->pSurfaceFormats), *(uint32_t *)UlongToPtr(params->pSurfaceFormatCount)); - params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->host_physical_device, &pSurfaceInfo_host, (uint32_t *)UlongToPtr(params->pSurfaceFormatCount), pSurfaceFormats_host); + params->result = wine_vkGetPhysicalDeviceSurfaceFormats2KHR((VkPhysicalDevice)UlongToPtr(params->physicalDevice), &pSurfaceInfo_host, (uint32_t *)UlongToPtr(params->pSurfaceFormatCount), pSurfaceFormats_host); convert_VkSurfaceFormat2KHR_array_host_to_win32(pSurfaceFormats_host, (VkSurfaceFormat2KHR32 *)UlongToPtr(params->pSurfaceFormats), *(uint32_t *)UlongToPtr(params->pSurfaceFormatCount)); free_conversion_context(ctx); return STATUS_SUCCESS; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 28a8d8a0090..2321bb91c09 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -61,6 +61,7 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phys VkResult wine_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pRectCount, VkRect2D *pRects); VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); +VkResult wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats); VkResult wine_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData); VkResult wine_vkMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData); void wine_vkUnmapMemory(VkDevice device, VkDeviceMemory memory);

1 0

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

22 Feb '24

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

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

22 Feb '24

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

Alexandre Julliard : include: Add new idl files to the makefile.
by Alexandre Julliard 22 Feb '24

22 Feb '24

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

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on ARM64.
by Alexandre Julliard 22 Feb '24

22 Feb '24

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 : ntdll: Handle leaf functions in RtlVirtualUnwind on ARM.
by Alexandre Julliard 22 Feb '24

22 Feb '24

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 x86-64.
by Alexandre Julliard 22 Feb '24

22 Feb '24

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

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

22 Feb '24

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

Louis Lenders : imm32: Update spec file.
by Alexandre Julliard 22 Feb '24

22 Feb '24

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