- Wine-Commits - list.winehq.org

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

Nov. 30, 2023

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

Alexandre Julliard : ntdll/tests: Simplify the KiUserExceptionDispatcher tests a little.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

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: Allow unwind rules to override the default stack pointer assignment.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

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: Add a machine frame to the KiUserExceptionDispatcher stack on x86-64.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

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 Nov. 30, 2023

Nov. 30, 2023

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: Call Wow64PrepareForException directly from KiUserExceptionDispatcher.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

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

Piotr Caban : msvcrt: Initialize writable environment block in env_set.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: ae32b2f45243462971d4581a0214d4834e715cf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae32b2f45243462971d4581a0214d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 30 11:41:51 2023 +0100 msvcrt: Initialize writable environment block in env_set. --- dlls/msvcrt/environ.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 9e358d971f9..063a9254c67 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -155,6 +155,7 @@ static int env_set(char **env, wchar_t **wenv) GetLastError() != ERROR_ENVVAR_NOT_FOUND) return -1; + if (env_init(FALSE, TRUE)) return -1; *eq = 0; idx = env_get_index(*env); *eq = '='; @@ -180,6 +181,8 @@ static int env_set(char **env, wchar_t **wenv) } if (!MSVCRT__wenviron) return 0; + if (MSVCRT__wenviron == MSVCRT___winitenv) + if (env_init(TRUE, TRUE)) return -1; idx = wenv_get_index(*wenv); *weq = '='; if (!weq[1]) @@ -264,11 +267,6 @@ static int putenv_helper(const char *name, const char *val, const char *eq) char *env; int r; - _lock(_ENV_LOCK); - r = env_init(FALSE, TRUE); - _unlock(_ENV_LOCK); - if (r) return -1; - if (eq) { env = strdup(name);

1 0

Piotr Caban : wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: ccbf1d25b68369a0ab2e72b32d4c35c8dd7100bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ccbf1d25b68369a0ab2e72b32d4c35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 16:46:06 2023 +0100 wineps.drv: Return error when visible rectangle is empty in get_vis_rectangles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55950 --- dlls/wineps.drv/printproc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b957a0d3bbd..7d2306b8443 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -301,7 +301,7 @@ static void clip_visrect(HDC hdc, RECT *dst, const RECT *src) DeleteObject(hrgn); } -static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, +static BOOL get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, const XFORM *xform, DWORD width, DWORD height, struct ps_bitblt_coords *src) { RECT rect; @@ -323,7 +323,8 @@ static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height); clip_visrect(hdc, &dst->visrect, &rect); - if (!src) return; + if (IsRectEmpty(&dst->visrect)) return FALSE; + if (!src) return TRUE; rect.left = src->log_x; rect.top = src->log_y; @@ -341,7 +342,7 @@ static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, if (rect.bottom > height) rect.bottom = height; src->visrect = rect; - intersect_vis_rectangles(dst, src); + return intersect_vis_rectangles(dst, src); } static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, @@ -363,7 +364,8 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, if (!blt->cbBmiSrc) { - get_vis_rectangles(ctx->hdc, &dst, NULL, 0, 0, NULL); + if (!get_vis_rectangles(ctx->hdc, &dst, NULL, 0, 0, NULL)) + return TRUE; return PSDRV_PatBlt(ctx, &dst, blt->dwRop); } @@ -373,8 +375,9 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, src.log_height = blt->cySrc; src.layout = 0; - get_vis_rectangles(ctx->hdc, &dst, &blt->xformSrc, - bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src); + if (!get_vis_rectangles(ctx->hdc, &dst, &blt->xformSrc, + bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src)) + return TRUE; memcpy(dst_info, bi, blt->cbBmiSrc); memset(&bits, 0, sizeof(bits));

1 0

Piotr Caban : wineps.drv: Fix EMR_SAVEDC record playback.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 4843daaee128ec5f4643d041139ce8f52e13df27 URL: https://gitlab.winehq.org/wine/wine/-/commit/4843daaee128ec5f4643d041139ce8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 29 21:36:09 2023 +0100 wineps.drv: Fix EMR_SAVEDC record playback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55927 --- dlls/wineps.drv/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 7d2306b8443..98de5badda7 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2250,7 +2250,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_SAVEDC: { - int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); + int ret = PlayEnhMetaFileRecord(data->ctx->hdc, htable, rec, handle_count); if (!data->saved_dc_size) {

1 0

Nikolay Sivov : gdi32/emf: Pad EMREXTESCAPE record data.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 95c87562f8dd54c7964ccc229df689fa5914bd7a URL: https://gitlab.winehq.org/wine/wine/-/commit/95c87562f8dd54c7964ccc229df689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 10:20:37 2023 +0100 gdi32/emf: Pad EMREXTESCAPE record data. --- dlls/gdi32/emfdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 5fc0109f78f..63110f57eeb 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -1199,8 +1199,7 @@ INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *i if (escape == QUERYESCSUPPORT) return 0; - size = FIELD_OFFSET( EMREXTESCAPE, EscData[input_size] ); - size = (size + 3) & ~3; + size = aligned_size(FIELD_OFFSET( EMREXTESCAPE, EscData[input_size] )); if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; emr->emr.iType = EMR_EXTESCAPE; @@ -1208,6 +1207,7 @@ INT EMFDC_ExtEscape( DC_ATTR *dc_attr, INT escape, INT input_size, const char *i emr->iEscape = escape; emr->cbEscData = input_size; memcpy(emr->EscData, input, input_size); + pad_record(emr->EscData, input_size); emfdc_record( get_dc_emf( dc_attr ), &emr->emr ); HeapFree( GetProcessHeap(), 0, emr ); if (output_size && output) return 0;

1 0