- Wine-Commits - list.winehq.org

Rémi Bernon : mfreadwrite/tests: Add some source reader D3D11 awareness tests.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 54ff5bdf85f2b635acc1e055db6b11c6e0d5bd0a URL: https://gitlab.winehq.org/wine/wine/-/commit/54ff5bdf85f2b635acc1e055db6b11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 09:59:47 2024 +0200 mfreadwrite/tests: Add some source reader D3D11 awareness tests. --- dlls/mfreadwrite/tests/Makefile.in | 2 +- dlls/mfreadwrite/tests/mfplat.c | 342 ++++++++++++++++++++++++++++++++++--- 2 files changed, 324 insertions(+), 20 deletions(-)

1 0

Rémi Bernon : mfreadwrite/reader: Pass the device manager to the stream transforms.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 11c47925f0aa397cab117215f6c4563102b373b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/11c47925f0aa397cab117215f6c456… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 12:37:03 2024 +0200 mfreadwrite/reader: Pass the device manager to the stream transforms. --- dlls/mfreadwrite/reader.c | 59 +++++++++++++++++++++++++++++++++++++++++ dlls/mfreadwrite/tests/mfplat.c | 17 ++++++------ 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab8c3993570..a9d25848e7b 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -79,6 +79,7 @@ struct transform_entry UINT32 pending_flags; GUID category; BOOL hidden; + BOOL attributes_initialized; }; struct media_stream @@ -816,6 +817,35 @@ static HRESULT transform_entry_update_input_type(struct transform_entry *entry, return hr; } +static void transform_entry_initialize_attributes(struct source_reader *reader, struct transform_entry *entry) +{ + IMFAttributes *attributes; + + if (SUCCEEDED(IMFTransform_GetAttributes(entry->transform, &attributes))) + { + if (FAILED(IMFAttributes_GetItem(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, NULL))) + IMFAttributes_SetUINT32(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, 6); + + IMFAttributes_Release(attributes); + } + + if (SUCCEEDED(IMFTransform_GetOutputStreamAttributes(entry->transform, 0, &attributes))) + { + UINT32 shared, shared_without_mutex, bind_flags; + + if (SUCCEEDED(IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED, &shared))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, shared); + if (SUCCEEDED(IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &shared_without_mutex))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, shared_without_mutex); + if (SUCCEEDED(IMFAttributes_GetUINT32(reader->attributes, &MF_SOURCE_READER_D3D11_BIND_FLAGS, &bind_flags))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, bind_flags); + else if ((reader->flags & SOURCE_READER_DXGI_DEVICE_MANAGER) && FAILED(IMFAttributes_GetItem(attributes, &MF_SA_D3D11_BINDFLAGS, NULL))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, 1024); + + IMFAttributes_Release(attributes); + } +} + static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, struct transform_entry *entry) { @@ -828,6 +858,12 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader if ((ptr = list_next(&stream->transforms, &entry->entry))) next = LIST_ENTRY(ptr, struct transform_entry, entry); + if (!entry->attributes_initialized) + { + transform_entry_initialize_attributes(reader, entry); + entry->attributes_initialized = TRUE; + } + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info))) return hr; stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); @@ -2011,10 +2047,33 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL for (i = 0; i < count; i++) { + IMFAttributes *attributes; IMFMediaType *media_type; if (FAILED(hr = IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) continue; + + if (!reader->device_manager || FAILED(IMFTransform_GetAttributes(transform, &attributes))) + entry->attributes_initialized = TRUE; + else + { + UINT32 d3d_aware = FALSE; + + if (reader->flags & SOURCE_READER_DXGI_DEVICE_MANAGER) + { + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_AWARE, &d3d_aware)) && d3d_aware) + IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)reader->device_manager); + } + else if (reader->flags & SOURCE_READER_D3D9_DEVICE_MANAGER) + { + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware)) && d3d_aware) + IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)reader->device_manager); + } + + entry->attributes_initialized = !d3d_aware; + IMFAttributes_Release(attributes); + } + if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)) && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type))) { diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index d6e99e47f89..b51c9739afe 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -3070,7 +3070,7 @@ static void test_source_reader_transforms_d3d9(void) hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); - todo_wine ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); + ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3147,10 +3147,9 @@ static void test_source_reader_transforms_d3d9(void) hr = IMFTransform_GetAttributes(video_processor, &attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, &value); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value == 6, "got %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 6, "got %u.\n", value); IMFAttributes_Release(attributes); hr = IMFTransform_GetOutputStreamAttributes(video_processor, 0, &attributes); @@ -3204,7 +3203,7 @@ static void test_source_reader_transforms_d3d9(void) hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); - todo_wine ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); + ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); @@ -3463,16 +3462,16 @@ static void test_source_reader_transforms_d3d11(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, &value); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value == 6, "got %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 6, "got %u.\n", value); IMFAttributes_Release(attributes); hr = IMFTransform_GetOutputStreamAttributes(video_processor, 0, &attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &value); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value == 1024, "got %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 1024, "got %u.\n", value); IMFAttributes_Release(attributes); IMFTransform_Release(video_processor);

1 0

Billy Laws : ntdll: Don't restore PC from LR after unwinding through frame switches.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: a2b4924db5d0167c8b6d6807e161569f5aa70c30 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2b4924db5d0167c8b6d6807e16156… Author: Billy Laws <blaws05(a)gmail.com> Date: Mon May 6 14:29:25 2024 +0000 ntdll: Don't restore PC from LR after unwinding through frame switches. Fixes unwinds from within a consolidation callback on ARM64EC, as the context frame could be x64 with UNWOUND_TO_CALL set, in which case LR contains garbage. See: https://github.com/dotnet/runtime/blob/71abc26cf8f14f5d15665d7f580365ddfa29… --- dlls/ntdll/tests/unwind.c | 45 ++++++++++++++++++++++++--------------------- dlls/ntdll/unwind.c | 23 +++++++++++++++-------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/tests/unwind.c b/dlls/ntdll/tests/unwind.c index 61fbed1e017..daa90c19a11 100644 --- a/dlls/ntdll/tests/unwind.c +++ b/dlls/ntdll/tests/unwind.c @@ -1566,6 +1566,8 @@ struct unwind_test_arm64 unsigned int nb_results; int unwound_clear; int last_set_reg_ptr; + int stack_value_index; + ULONG64 stack_value; }; enum regs_arm64 @@ -1630,6 +1632,7 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct memset( &context, 0x55, sizeof(context) ); memset( &unset_reg, 0x55, sizeof(unset_reg) ); for (j = 0; j < 256; j++) fake_stack[j] = j * 8; + if (test->stack_value_index != -1) fake_stack[test->stack_value_index] = test->stack_value; context.Sp = (ULONG_PTR)fake_stack; context.Lr = (ULONG_PTR)ORIG_LR; @@ -2598,27 +2601,27 @@ static void test_virtual_unwind_arm64(void) static const struct unwind_test_arm64 tests[] = { -#define TEST(func, unwind, size, results, unwound_clear, last_ptr) \ - { func, sizeof(func), unwind, size, results, ARRAY_SIZE(results), unwound_clear, last_ptr } - TEST(function_0, unwind_info_0, sizeof(unwind_info_0), results_0, 0, 0), - TEST(function_1, unwind_info_1, 0, results_1, 0, 0), - TEST(function_2, unwind_info_2, sizeof(unwind_info_2), results_2, 1, 0), - TEST(function_3, unwind_info_3, sizeof(unwind_info_3), results_3, 1, x28), - TEST(function_4, unwind_info_4, sizeof(unwind_info_4), results_4, 0, 0), - TEST(function_5, unwind_info_5, sizeof(unwind_info_5), results_5, 0, 0), - TEST(function_6, unwind_info_6, 0, results_6, 0, 0), - TEST(function_7, unwind_info_7, 0, results_7, 0, 0), - TEST(function_8, unwind_info_8, 0, results_8, 0, 0), - TEST(function_9, unwind_info_9, 0, results_9, 0, 0), - TEST(function_10, unwind_info_10, 0, results_10, 0, 0), - TEST(function_11, unwind_info_11, 0, results_11, 0, 0), - TEST(function_12, unwind_info_12, 0, results_12, 0, 0), - TEST(function_13, unwind_info_13, 0, results_13, 0, 0), - TEST(function_14, unwind_info_14, sizeof(unwind_info_14), results_14, 0, 0), - TEST(function_15, unwind_info_15, sizeof(unwind_info_15), results_15, 0, 0), - TEST(function_16, unwind_info_16, sizeof(unwind_info_16), results_16, 1, x18), - TEST(function_17, unwind_info_17, sizeof(unwind_info_17), results_17, 2, 0), - TEST(function_18, NULL, 0, results_18, 0, 0), +#define TEST(func, unwind, size, results, unwound_clear, last_ptr, stack_value_index, stack_value) \ + { func, sizeof(func), unwind, size, results, ARRAY_SIZE(results), unwound_clear, last_ptr, stack_value_index, stack_value } + TEST(function_0, unwind_info_0, sizeof(unwind_info_0), results_0, 0, 0, -1, 0), + TEST(function_1, unwind_info_1, 0, results_1, 0, 0, -1, 0), + TEST(function_2, unwind_info_2, sizeof(unwind_info_2), results_2, 1, 0, -1, 0), + TEST(function_3, unwind_info_3, sizeof(unwind_info_3), results_3, 2, x28, 0, CONTEXT_ARM64_UNWOUND_TO_CALL), + TEST(function_4, unwind_info_4, sizeof(unwind_info_4), results_4, 0, 0, -1, 0), + TEST(function_5, unwind_info_5, sizeof(unwind_info_5), results_5, 0, 0, -1, 0), + TEST(function_6, unwind_info_6, 0, results_6, 0, 0, -1, 0), + TEST(function_7, unwind_info_7, 0, results_7, 0, 0, -1, 0), + TEST(function_8, unwind_info_8, 0, results_8, 0, 0, -1, 0), + TEST(function_9, unwind_info_9, 0, results_9, 0, 0, -1, 0), + TEST(function_10, unwind_info_10, 0, results_10, 0, 0, -1, 0), + TEST(function_11, unwind_info_11, 0, results_11, 0, 0, -1, 0), + TEST(function_12, unwind_info_12, 0, results_12, 0, 0, -1, 0), + TEST(function_13, unwind_info_13, 0, results_13, 0, 0, -1, 0), + TEST(function_14, unwind_info_14, sizeof(unwind_info_14), results_14, 0, 0, -1, 0), + TEST(function_15, unwind_info_15, sizeof(unwind_info_15), results_15, 0, 0, -1, 0), + TEST(function_16, unwind_info_16, sizeof(unwind_info_16), results_16, 2, x18, 6, CONTEXT_ARM64_UNWOUND_TO_CALL), + TEST(function_17, unwind_info_17, sizeof(unwind_info_17), results_17, 2, 0, -1, 0), + TEST(function_18, NULL, 0, results_18, 0, 0, -1, 0), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 5d830536688..04c843baefd 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -402,7 +402,8 @@ static void do_pac_auth( ARM64_NT_CONTEXT *context ) } static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *context, - KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, int skip ) + KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, int skip, + BOOLEAN *final_pc_from_lr ) { unsigned int i, val, len, save_next = 2; @@ -482,6 +483,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex context->Pc = ((DWORD64 *)context->Sp)[1]; context->Sp = ((DWORD64 *)context->Sp)[0]; context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; + *final_pc_from_lr = FALSE; } else if (*ptr == 0xea) /* MSFT_OP_CONTEXT */ { @@ -494,6 +496,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex for (i = 19; i < 29; i++) (&ptrs->X19)[i - 19] = &src_ctx->X[i]; for (i = 8; i < 16; i++) (&ptrs->D8)[i - 8] = &src_ctx->V[i].Low; } + *final_pc_from_lr = FALSE; } else if (*ptr == 0xeb) /* MSFT_OP_EC_CONTEXT */ { @@ -502,11 +505,13 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex context_x64_to_arm( context, src_ctx ); context->ContextFlags = flags | (src_ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL); if (ptrs) for (i = 8; i < 16; i++) (&ptrs->D8)[i - 8] = &src_ctx->V[i].Low; + *final_pc_from_lr = FALSE; } else if (*ptr == 0xec) /* MSFT_OP_CLEAR_UNWOUND_TO_CALL */ { context->Pc = context->Lr; context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; + *final_pc_from_lr = FALSE; } else if (*ptr == 0xfc) /* pac_sign_lr */ { @@ -675,7 +680,8 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUN static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCTION *func, ARM64_NT_CONTEXT *context, PVOID *handler_data, - KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs ) + KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, + BOOLEAN *final_pc_from_lr ) { IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY_XDATA *info; struct unwind_info_epilog *info_epilog; @@ -711,7 +717,7 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCT len = get_sequence_len( data, end ); if (offset < len) { - process_unwind_codes( data, end, context, ptrs, len - offset ); + process_unwind_codes( data, end, context, ptrs, len - offset, final_pc_from_lr ); return NULL; } } @@ -728,7 +734,7 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCT len = get_sequence_len( ptr, end ); if (offset <= info_epilog[i].offset + len) { - process_unwind_codes( ptr, end, context, ptrs, offset - info_epilog[i].offset ); + process_unwind_codes( ptr, end, context, ptrs, offset - info_epilog[i].offset, final_pc_from_lr ); return NULL; } } @@ -740,12 +746,12 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCT len = get_sequence_len( ptr, end ) + 1; if (offset >= info->FunctionLength - len) { - process_unwind_codes( ptr, end, context, ptrs, offset - (info->FunctionLength - len) ); + process_unwind_codes( ptr, end, context, ptrs, offset - (info->FunctionLength - len), final_pc_from_lr ); return NULL; } } - process_unwind_codes( data, end, context, ptrs, 0 ); + process_unwind_codes( data, end, context, ptrs, 0, final_pc_from_lr ); /* get handler since we are inside the main code */ if (info->ExceptionDataPresent) @@ -797,6 +803,7 @@ NTSTATUS WINAPI RtlVirtualUnwind2( ULONG type, ULONG_PTR base, ULONG_PTR pc, ULONG_PTR *limit_low, ULONG_PTR *limit_high, PEXCEPTION_ROUTINE *handler_ret, ULONG flags ) { + BOOLEAN final_pc_from_lr = TRUE; TRACE( "type %lx base %I64x pc %I64x rva %I64x sp %I64x\n", type, base, pc, pc - base, context->Sp ); if (limit_low || limit_high) FIXME( "limits not supported\n" ); @@ -810,9 +817,9 @@ NTSTATUS WINAPI RtlVirtualUnwind2( ULONG type, ULONG_PTR base, ULONG_PTR pc, else if (func->Flag) *handler_ret = unwind_packed_data( base, pc, func, context, ctx_ptr ); else - *handler_ret = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); + *handler_ret = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr, &final_pc_from_lr ); - if (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) context->Pc = context->Lr; + if (final_pc_from_lr) context->Pc = context->Lr; TRACE( "ret: pc=%I64x lr=%I64x sp=%I64x handler=%p\n", context->Pc, context->Lr, context->Sp, *handler_ret ); *frame_ret = context->Sp;

1 0

Esme Povirk : gdiplus: Bracket hdc use in brush_fill_path.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: a4ed61f39a3588bfa9a2c38e961f6a7b9690626c URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ed61f39a3588bfa9a2c38e961f6a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu May 2 14:39:47 2024 -0500 gdiplus: Bracket hdc use in brush_fill_path. --- dlls/gdiplus/graphics.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 78e3b07222d..48d425341f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1150,7 +1150,13 @@ static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) { - GpStatus status = Ok; + HDC hdc; + GpStatus status; + + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; + switch (brush->bt) { case BrushTypeSolidColor: @@ -1163,27 +1169,27 @@ static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) RECT rc; /* partially transparent fill */ - if (!SelectClipPath(graphics->hdc, RGN_AND)) + if (!SelectClipPath(hdc, RGN_AND)) { status = GenericError; DeleteObject(bmp); break; } - if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + if (GetClipBox(hdc, &rc) != NULLREGION) { - HDC hdc = CreateCompatibleDC(NULL); + HDC src_hdc = CreateCompatibleDC(NULL); - if (!hdc) + if (!src_hdc) { status = OutOfMemory; DeleteObject(bmp); break; } - SelectObject(hdc, bmp); + SelectObject(src_hdc, bmp); gdi_alpha_blend(graphics, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, - hdc, 0, 0, 1, 1); - DeleteDC(hdc); + src_hdc, 0, 0, 1, 1); + DeleteDC(src_hdc); } DeleteObject(bmp); @@ -1202,14 +1208,16 @@ static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) break; } - old_brush = SelectObject(graphics->hdc, gdibrush); - FillPath(graphics->hdc); - SelectObject(graphics->hdc, old_brush); + old_brush = SelectObject(hdc, gdibrush); + FillPath(hdc); + SelectObject(hdc, old_brush); DeleteObject(gdibrush); break; } } + gdi_dc_release(graphics, hdc); + return status; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in gdi_alpha_blend.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: af6aaf779d42780d45d7177b9c50dffb0b98a473 URL: https://gitlab.winehq.org/wine/wine/-/commit/af6aaf779d42780d45d7177b9c50df… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu May 2 14:10:09 2024 -0500 gdiplus: Bracket HDC use in gdi_alpha_blend. --- dlls/gdiplus/graphics.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index cf54334ae2e..3c00eddddf4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -362,9 +362,14 @@ static void round_points(POINT *pti, GpPointF *ptf, INT count) static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { + HDC dst_hdc; CompositingMode comp_mode; - INT technology = GetDeviceCaps(graphics->hdc, TECHNOLOGY); - INT shadeblendcaps = GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS); + INT technology, shadeblendcaps; + + gdi_dc_acquire(graphics, &dst_hdc); + + technology = GetDeviceCaps(dst_hdc, TECHNOLOGY); + shadeblendcaps = GetDeviceCaps(dst_hdc, SHADEBLENDCAPS); GdipGetCompositingMode(graphics, &comp_mode); @@ -373,7 +378,7 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ { TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); - StretchBlt(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + StretchBlt(dst_hdc, dst_x, dst_y, dst_width, dst_height, hdc, src_x, src_y, src_width, src_height, SRCCOPY); } else @@ -385,9 +390,11 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ bf.SourceConstantAlpha = 255; bf.AlphaFormat = AC_SRC_ALPHA; - GdiAlphaBlend(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + GdiAlphaBlend(dst_hdc, dst_x, dst_y, dst_width, dst_height, hdc, src_x, src_y, src_width, src_height, bf); } + + gdi_dc_release(graphics, dst_hdc); } static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn)

1 0

Esme Povirk : gdiplus: Add a function to bracket HDC use.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: e29623bbeb46c498c881d545e8a6c408544e2089 URL: https://gitlab.winehq.org/wine/wine/-/commit/e29623bbeb46c498c881d545e8a6c4… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu May 2 13:44:54 2024 -0500 gdiplus: Add a function to bracket HDC use. --- dlls/gdiplus/gdiplus_private.h | 8 +++++++ dlls/gdiplus/graphics.c | 48 +++++++++++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0b302a405ea..c3b516a9a2b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -62,6 +62,8 @@ extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi, BOOL printer_display); #define WineCoordinateSpaceGdiDevice ((GpCoordinateSpace)4) +extern GpStatus gdi_dc_acquire(GpGraphics *graphics, HDC *hdc); +extern void gdi_dc_release(GpGraphics *graphics, HDC hdc); extern GpStatus gdi_transform_acquire(GpGraphics *graphics); extern GpStatus gdi_transform_release(GpGraphics *graphics); extern GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, @@ -248,6 +250,7 @@ struct GpPen{ struct GpGraphics{ HDC hdc; HWND hwnd; + INT hdc_refs; BOOL owndc; BOOL alpha_hdc; BOOL printer_display; @@ -658,6 +661,11 @@ static inline void image_unlock(GpImage *image) ReleaseSRWLockExclusive(&image->lock); } +static inline BOOL has_gdi_dc(GpGraphics *graphics) +{ + return graphics->hdc != NULL; +} + static inline void set_rect(GpRectF *rect, REAL x, REAL y, REAL width, REAL height) { rect->X = x; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0727b63ed4f..cf54334ae2e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <math.h> #include <limits.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -46,6 +47,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define ANCHOR_WIDTH (2.0) #define MAX_ITERS (50) +GpStatus gdi_dc_acquire(GpGraphics *graphics, HDC *hdc) +{ + if (graphics->hdc != NULL) + { + *hdc = graphics->hdc; + graphics->hdc_refs++; + return Ok; + } + + *hdc = NULL; + return InvalidParameter; +} + +void gdi_dc_release(GpGraphics *graphics, HDC hdc) +{ + assert(graphics->hdc_refs > 0); + graphics->hdc_refs--; +} + static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, @@ -252,7 +272,7 @@ static HBRUSH create_gdi_brush(const GpBrush *brush, INT origin_x, INT origin_y) return gdibrush; } -static INT prepare_dc(GpGraphics *graphics, GpPen *pen) +static INT prepare_dc(GpGraphics *graphics, HDC hdc, GpPen *pen) { LOGBRUSH lb; HPEN gdipen; @@ -261,9 +281,9 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) GpPointF pt[2]; DWORD dash_array[MAX_DASHLEN]; - save_state = SaveDC(graphics->hdc); + save_state = SaveDC(hdc); - EndPath(graphics->hdc); + EndPath(hdc); if(pen->unit == UnitPixel){ width = pen->width; @@ -311,15 +331,15 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) free_gdi_logbrush(&lb); } - SelectObject(graphics->hdc, gdipen); + SelectObject(hdc, gdipen); return save_state; } -static void restore_dc(GpGraphics *graphics, INT state) +static void restore_dc(GpGraphics *graphics, HDC hdc, INT state) { - DeleteObject(SelectObject(graphics->hdc, GetStockObject(NULL_PEN))); - RestoreDC(graphics->hdc, state); + DeleteObject(SelectObject(hdc, GetStockObject(NULL_PEN))); + RestoreDC(hdc, state); } static void round_points(POINT *pti, GpPointF *ptf, INT count) @@ -2533,6 +2553,8 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; + assert(graphics->hdc_refs == 0); + if (is_metafile_graphics(graphics)) { stat = METAFILE_GraphicsDeleted((GpMetafile*)graphics->image); @@ -3633,11 +3655,16 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { + HDC hdc; INT save_state; GpStatus retval; HRGN hrgn=NULL; - save_state = prepare_dc(graphics, pen); + retval = gdi_dc_acquire(graphics, &hdc); + if (retval != Ok) + return retval; + + save_state = prepare_dc(graphics, hdc, pen); retval = get_clip_hrgn(graphics, &hrgn); @@ -3654,8 +3681,9 @@ static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *pat gdi_transform_release(graphics); end: - restore_dc(graphics, save_state); + restore_dc(graphics, hdc, save_state); DeleteObject(hrgn); + gdi_dc_release(graphics, hdc); return retval; } @@ -4069,7 +4097,7 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if (is_metafile_graphics(graphics)) retval = METAFILE_DrawPath((GpMetafile*)graphics->image, pen, path); - else if (!graphics->hdc || graphics->alpha_hdc || !brush_can_fill_path(pen->brush, FALSE)) + else if (!has_gdi_dc(graphics) || graphics->alpha_hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path);

1 0

Esme Povirk : gdiplus: Bracket HDC use in draw_cap.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 646729f3f2b3529f24d1bc88b54bb1ba4325c84a URL: https://gitlab.winehq.org/wine/wine/-/commit/646729f3f2b3529f24d1bc88b54bb1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu May 2 14:47:00 2024 -0500 gdiplus: Bracket HDC use in draw_cap. --- dlls/gdiplus/graphics.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 48d425341f8..bd77758eb51 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1667,6 +1667,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL size, const GpCustomLineCap *custom, REAL x1, REAL y1, REAL x2, REAL y2) { + HDC hdc; HGDIOBJ oldbrush = NULL, oldpen = NULL; GpMatrix matrix; HBRUSH brush = NULL; @@ -1682,6 +1683,8 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s if((x1 == x2) && (y1 == y2)) return; + gdi_dc_acquire(graphics, &hdc); + theta = gdiplus_atan2(y2 - y1, x2 - x1); customstroke = (cap == LineCapCustom) && custom && (!custom->fill); @@ -1693,8 +1696,8 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s pen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER, 1, &lb, 0, NULL); - oldbrush = SelectObject(graphics->hdc, brush); - oldpen = SelectObject(graphics->hdc, pen); + oldbrush = SelectObject(hdc, brush); + oldpen = SelectObject(hdc, pen); } switch(cap){ @@ -1729,7 +1732,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s round_points(pt, ptf, 4); - Polygon(graphics->hdc, pt, 4); + Polygon(hdc, pt, 4); break; case LineCapArrowAnchor: @@ -1754,7 +1757,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s round_points(pt, ptf, 3); - Polygon(graphics->hdc, pt, 3); + Polygon(hdc, pt, 3); break; case LineCapRoundAnchor: @@ -1769,7 +1772,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s round_points(pt, ptf, 2); - Ellipse(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); + Ellipse(hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); break; case LineCapTriangle: @@ -1792,7 +1795,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s round_points(pt, ptf, 3); - Polygon(graphics->hdc, pt, 3); + Polygon(hdc, pt, 3); break; case LineCapRound: @@ -1815,7 +1818,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s round_points(pt, ptf, 4); - Pie(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y, pt[2].x, + Pie(hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y, pt[2].x, pt[2].y, pt[3].x, pt[3].y); break; @@ -1855,13 +1858,13 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s tp[i] = convert_path_point_type(custom->pathdata.Types[i]); if(custom->fill){ - BeginPath(graphics->hdc); - PolyDraw(graphics->hdc, custpt, tp, count); - EndPath(graphics->hdc); - StrokeAndFillPath(graphics->hdc); + BeginPath(hdc); + PolyDraw(hdc, custpt, tp, count); + EndPath(hdc); + StrokeAndFillPath(hdc); } else - PolyDraw(graphics->hdc, custpt, tp, count); + PolyDraw(hdc, custpt, tp, count); custend: free(custptf); @@ -1873,11 +1876,13 @@ custend: } if(!customstroke){ - SelectObject(graphics->hdc, oldbrush); - SelectObject(graphics->hdc, oldpen); + SelectObject(hdc, oldbrush); + SelectObject(hdc, oldpen); DeleteObject(brush); DeleteObject(pen); } + + gdi_dc_release(graphics, hdc); } /* Shortens the line by the given percent by changing x2, y2.

1 0

Esme Povirk : gdiplus: Bracket HDC use in alpha_blend_pixels_hrgn.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: ed3cd9b35f095c5258ad48b5283e1bbd84646046 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed3cd9b35f095c5258ad48b5283e1b… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu May 2 14:25:33 2024 -0500 gdiplus: Bracket HDC use in alpha_blend_pixels_hrgn. --- dlls/gdiplus/graphics.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3c00eddddf4..78e3b07222d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -591,28 +591,39 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst } else { + HDC hdc; HRGN hrgn; int save; + stat = gdi_dc_acquire(graphics, &hdc); + + if (stat != Ok) + return stat; + stat = get_clip_hrgn(graphics, &hrgn); if (stat != Ok) + { + gdi_dc_release(graphics, hdc); return stat; + } - save = SaveDC(graphics->hdc); + save = SaveDC(hdc); - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); if (hregion) - ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + ExtSelectClipRgn(hdc, hregion, RGN_AND); stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, fmt); - RestoreDC(graphics->hdc, save); + RestoreDC(hdc, save); DeleteObject(hrgn); + gdi_dc_release(graphics, hdc); + return stat; } }

1 0

Alexandre Julliard : ntdll: Cache the generated SMBIOS data.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 49bb8f10db62eeed2a34037e46e83941606b6936 URL: https://gitlab.winehq.org/wine/wine/-/commit/49bb8f10db62eeed2a34037e46e839… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 14:42:30 2024 +0200 ntdll: Cache the generated SMBIOS data. --- dlls/ntdll/unix/system.c | 241 +++++++++++++++++++++-------------------------- 1 file changed, 110 insertions(+), 131 deletions(-)

1 0

Paul Gofman : xaudio2: Use FAudioVoice_DestroyVoiceSafeEXT() in destroy_voice().
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: b928f0eb08da9a10dae3cb7b33ec16b164a2fddd URL: https://gitlab.winehq.org/wine/wine/-/commit/b928f0eb08da9a10dae3cb7b33ec16… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 19:34:40 2024 -0600 xaudio2: Use FAudioVoice_DestroyVoiceSafeEXT() in destroy_voice(). --- dlls/xaudio2_7/tests/xaudio2.c | 29 ++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 2b3102d21fe..62f766a827a 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -837,7 +837,9 @@ static void test_submix(IXAudio2 *xa) HRESULT hr; IXAudio2MasteringVoice *master; XAUDIO2_VOICE_DETAILS details; - IXAudio2SubmixVoice *sub; + IXAudio2SubmixVoice *sub, *sub2; + XAUDIO2_SEND_DESCRIPTOR send_desc = { 0 }; + XAUDIO2_VOICE_SENDS sends = { 1, &send_desc }; IXAudio2_StopEngine(xa); @@ -855,6 +857,31 @@ static void test_submix(IXAudio2 *xa) ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); + hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 0, NULL, NULL); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + + send_desc.pOutputVoice = (IXAudio2Voice *)sub2; + hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + + IXAudio2SubmixVoice_DestroyVoice(sub2); + /* The voice is not destroyed. */ + memset(&details, 0xcc, sizeof(details)); + IXAudio2SubmixVoice_GetVoiceDetails(sub2, &details); + ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); + ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); + + sends.SendCount = 0; + hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends); + ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr); + + IXAudio2SubmixVoice_DestroyVoice(sub2); + if (0) + { + /* Crashes on Windows and thus suggests that now the voice is actually destroyed. */ + IXAudio2SubmixVoice_GetVoiceDetails(sub2, &details); + } + IXAudio2SubmixVoice_DestroyVoice(sub); IXAudio2MasteringVoice_DestroyVoice(master); } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index cd1c62f3cd4..a51bb499793 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -499,7 +499,11 @@ static const FAudioEngineCallback FAudioEngineCallback_Vtbl = { static inline void destroy_voice(XA2VoiceImpl *This) { - FAudioVoice_DestroyVoice(This->faudio_voice); + if (FAILED(FAudioVoice_DestroyVoiceSafeEXT(This->faudio_voice))) + { + ERR("Destroying voice %p failed.\n", This); + return; + } free_effect_chain(This->effect_chain); This->effect_chain = NULL; This->in_use = FALSE;

1 0