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

Re: [PATCH 0/6] MR178: ntdll: Preparation for RtlSetUserValueHeap use in kernelbase. - closed

by Rémi Bernon

This merge request was closed by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/178

June 7, 2022

Re: [PATCH 0/6] MR178: ntdll: Preparation for RtlSetUserValueHeap use in kernelbase.

by Rémi Bernon

6bf9b45286b685234f3da1280b59d11f550dfd23 breaks ole32:hglobalstream, I'll have a look. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/178#note_1641

June 7, 2022

[v3 PATCH] d2d1: Add partial support for image brushes.

by Nikolay Sivov

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: simplified helpers a bit. dlls/d2d1/brush.c | 68 +++++++++++++++++++++++++++++++++++------- dlls/d2d1/tests/d2d1.c | 46 ++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..22116759b10 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1450,7 +1450,23 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) return TRUE; case D2D_BRUSH_TYPE_BITMAP: - bitmap = brush->u.bitmap.bitmap; + case D2D_BRUSH_TYPE_IMAGE: + { + ID2D1Bitmap *image_bitmap = NULL; + + if (brush->type == D2D_BRUSH_TYPE_BITMAP) + bitmap = brush->u.bitmap.bitmap; + else + { + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&image_bitmap))) + { + FIXME("Only image brushes with bitmaps are supported.\n"); + return FALSE; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(image_bitmap); + cb->type = D2D_BRUSH_TYPE_BITMAP; + } /* Scale for bitmap size and dpi. */ b = brush->transform; @@ -1477,7 +1493,11 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) cb->u.bitmap.ignore_alpha = bitmap->format.alphaMode == D2D1_ALPHA_MODE_IGNORE; + if (image_bitmap) + ID2D1Bitmap_Release(image_bitmap); + return TRUE; + } default: FIXME("Unhandled brush type %#x.\n", brush->type); @@ -1485,31 +1505,32 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) } } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, - unsigned int brush_idx) +static void d2d_brush_bind_bitmap(struct d2d_bitmap *bitmap, struct d2d_device_context *context, + D2D1_EXTEND_MODE extend_mode_x, D2D1_EXTEND_MODE extend_mode_y, + D2D1_INTERPOLATION_MODE interpolation_mode, unsigned int brush_idx) { ID3D11SamplerState **sampler_state; ID3D11DeviceContext *d3d_context; HRESULT hr; ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context); - ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &bitmap->srv); sampler_state = &context->sampler_states - [brush->u.bitmap.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] - [brush->u.bitmap.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] - [brush->u.bitmap.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; + [interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] + [extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; if (!*sampler_state) { D3D11_SAMPLER_DESC sampler_desc; - if (brush->u.bitmap.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + if (interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); + sampler_desc.AddressU = texture_address_mode_from_extend_mode(extend_mode_x); + sampler_desc.AddressV = texture_address_mode_from_extend_mode(extend_mode_y); sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; @@ -1529,6 +1550,26 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con ID3D11DeviceContext_Release(d3d_context); } +static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) +{ + ID2D1Bitmap *image_bitmap; + struct d2d_bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&image_bitmap))) + { + FIXME("Only image brushes with bitmaps are supported.\n"); + return; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(image_bitmap); + + d2d_brush_bind_bitmap(bitmap, context, brush->u.image.extend_mode_x, brush->u.image.extend_mode_y, + brush->u.image.interpolation_mode, brush_idx); + + ID2D1Bitmap_Release(image_bitmap); +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { switch (brush->type) @@ -1545,7 +1586,12 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context break; case D2D_BRUSH_TYPE_BITMAP: - d2d_brush_bind_bitmap(brush, context, brush_idx); + d2d_brush_bind_bitmap(brush->u.bitmap.bitmap, context, brush->u.bitmap.extend_mode_x, + brush->u.bitmap.extend_mode_y, brush->u.bitmap.interpolation_mode, brush_idx); + break; + + case D2D_BRUSH_TYPE_IMAGE: + d2d_brush_bind_image(brush, context, brush_idx); break; default: diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..752e34bf4da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2509,11 +2509,13 @@ static void test_image_brush(BOOL d3d11) D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BRUSH_PROPERTIES brush_desc; ID2D1Image *image, *tmp_image; + D2D1_RECT_F dst_rect; struct d2d1_test_context ctx; D2D1_EXTEND_MODE extend_mode; D2D1_MATRIX_3X2_F matrix; ID2D1ImageBrush *brush; ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; D2D1_SIZE_U size; D2D1_RECT_F rect; ULONG refcount; @@ -2585,6 +2587,50 @@ static void test_image_brush(BOOL d3d11) ID2D1ImageBrush_Release(brush); + /* FillRectangle */ + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 4.0f, 4.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "89917481db82e6d683a75f068d3984fe2703cce5"); + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 1.0f, 1.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "23544adf9695a51428c194a1cffd531be3416e65"); + todo_wine + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + /* Custom brush description and image pointer. */ brush_desc.opacity = 2.0f; set_matrix_identity(&brush_desc.transform); -- 2.35.1

June 7, 2022

Re: [PATCH] msvcp90: Fix segfault in bad_alloc exception default constructor.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 7, 2022

Re: [PATCH 0/1] MR194: mmdevapi: Remove android from default driver list. - approved

by Andrew Eikum (＠aeikum)

This merge request was approved by Andrew Eikum. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/194

June 7, 2022

Re: [PATCH 0/7] MR195: winhttp: Abort web socket receive operations when the socket handle is closed

by Hans Leidekker (＠hans)

Hans Leidekker (@hans) commented about dlls/winhttp/request.c: > return !ret; > } > > +static void socket_handle_closing( struct object_header *hdr ) > +{ > + struct socket *socket = (struct socket *)hdr; > + > + if (socket->request->netconn->secure) > + { > + cancel_queue( &socket->send_q ); > + cancel_queue( &socket->recv_q ); > + } > + if (!is_queue_empty( &socket->send_q ) || !is_queue_empty( &socket->recv_q )) > + netconn_cancel_io( socket->request->netconn ); > +} I doesn't make a lot of sense that async behavior depends on the connection being secure. Do we really need to replicate this? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/195#note_1639

June 7, 2022

[PATCH 3/3] ntdll: Take ControlPcIsUnwound into account on arm64 too

by Martin Storsjö

From: Martin Storsjö <martin(a)martin.st> This is the same modification as the previous patch, applied on arm64. It doesn't change the outcome for any of my tests though. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 034c78f6b4d..fba0da48a16 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -165,6 +165,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { LDR_DATA_TABLE_ENTRY *module; NTSTATUS status; + DWORD64 pc; dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; @@ -175,14 +176,14 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX * signal frame. */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; + pc = context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0); /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( - context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0), + if ((dispatch->FunctionEntry = lookup_function_info(pc, &dispatch->ImageBase, &module ))) { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, &dispatch->HandlerData, &dispatch->EstablisherFrame, NULL ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/198

June 7, 2022

[PATCH 2/3] ntdll: Use ControlPcIsUnwound for the RtlVirtualUnwind pc parameter in virtual_unwind

by Martin Storsjö

From: Martin Storsjö <martin(a)martin.st> Don't just use ControlPcIsUnwound for picking which RUNTIME_FUNCTION to use, but also use it for adjusting the pc value that is passed to RtlVirtualUnwind. This fixes one testcase (that I had missed to build and run before), where the pc points at the start of an epilogue (which would mean that no handler is returned from RtlVirtualUnwind). By taking ControlPcIsUnwound and adjusting the pc pointer, the unwind handler is returned and executed. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 01c911660de..c4cf557edaf 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -133,6 +133,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { LDR_DATA_TABLE_ENTRY *module; NTSTATUS status; + DWORD pc; dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; @@ -143,14 +144,14 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX * signal frame. */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; + pc = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( - context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0), + if ((dispatch->FunctionEntry = lookup_function_info(pc, (ULONG_PTR*)&dispatch->ImageBase, &module ))) { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, &dispatch->HandlerData, (ULONG_PTR *)&dispatch->EstablisherFrame, NULL ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/198

June 7, 2022

[PATCH 1/3] ntdll: Add SEH unwind info in ARM assembly functions/trampolines

by Martin Storsjö

From: Martin Storsjö <martin(a)martin.st> Clang generates SEH unwind info on ARM in both MSVC and mingw mode since Clang 15. The unwind info gets which gets enabled automatically by building with a new enough compiler. For functions/trampolines that are implemented in assembly, the unwind information needs to be provided by hand - in particular for cases where unwinding should be diverted. Contrary to AArch64, Clang got SEH assembler directives directly from the start when SEH was implemented (when the __SEH__ compiler define gets set), so there's no need for compiler version checks (like for AArch64 in include/wine/asm.h), but the default check for __SEH__ works fine for enabling the __ARM_SEH() macro. Use a custom unwind opcode in the private opcode space for unwinding to a specific CONTEXT instead of up to the caller. (Contrary to AArch64, there's no specific unwind opcode for restoring a full CONTEXT, but the unwind opcode space does have a couple unallocated values marked as "available", which can be used for vendor specific needs here.) This fixes unwinding in ARM PE builds. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7872962bbbe..01c911660de 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -731,6 +731,8 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xef && ((val & 0xff) <= 0x0f)) /* ldr lr, [sp], #x */ pop_lr( 4 * (val & 0x0f), context, ptrs ); + else if (*ptr == 0xf4) /* Custom private (unallocated) opcode, saved a full CONTEXT on the stack */ + memcpy( context, (DWORD *)context->Sp, sizeof(CONTEXT) ); else if (*ptr <= 0xf4) /* Available */ WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xf5) /* vpop {dS-dE} */ @@ -1075,11 +1077,18 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "push {r0-r2,lr}\n\t" + __ASM_SEH(".seh_nop\n\t") "sub sp, sp, #0x1a0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r1, r0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r2, #0x1a0\n\t" + __ASM_SEH(".seh_nop_w\n\t") "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_SEH(".seh_custom 0xf4\n\t") /* A custom (unallocated) SEH opcode for CONTEXT on stack */ + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 0\n\t") __ASM_CFI(".cfi_escape 0x0f,0x04,0x7d,0xb8,0x00,0x06\n\t") /* DW_CFA_def_cfa_expression: DW_OP_breg13 + 56, DW_OP_deref */ __ASM_CFI(".cfi_escape 0x10,0x04,0x02,0x7d,0x14\n\t") /* DW_CFA_expression: R4 DW_OP_breg13 + 20 */ @@ -1300,6 +1309,8 @@ extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PUCHAR nonvolatile); __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, "push {r4-r11,lr}\n\t" + __ASM_SEH(".seh_save_regs_w {r4-r11,lr}\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 36\n\t") __ASM_CFI(".cfi_offset r4, -36\n\t") @@ -1410,7 +1421,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, */ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "push {r0, lr}\n\t" + __ASM_SEH(".seh_save_regs {r0, lr}\n\t") "sub sp, sp, #0x1a0\n\t" /* sizeof(CONTEXT) */ + __ASM_SEH(".seh_stackalloc 0x1a0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 424\n\t") __ASM_CFI(".cfi_offset lr, -4\n\t") "mov r0, sp\n\t" /* context */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/198

June 7, 2022

[PATCH 0/3] MR198: ntdll: Fix unwinding on ARM in PE mode

by Martin Storsjö

Clang can generate SEH unwind info in PE mode on ARM now (since the very latest git versions of Clang 15). Add SEH assembly directives to let the unwinder step past handwritten assembly functions/trampolines. Also fix a minor bug exposed by a testcase that I had missed to run before, and apply the same fix consistently to arm64 (where the same issue hadn't been exposed before). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/198

June 7, 2022