May 2022 - Wine-devel - list.winehq.org

[PATCH v2 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 26 May '22

26 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

1 0

[PATCH 0/1] MR133: wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized.
by Brendan Shanks (＠bshanks) 26 May '22

26 May '22

Fixes exceptions seen in CEF and some advapi32 security tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/133

2 1

[PATCH 0/5] MR129: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 26 May '22

26 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/129

4 8

[PATCH 0/5] MR131: wined3d: Introduce wined3d_device_check_format_support().
by Chip Davis (＠cdavis5e) 26 May '22

26 May '22

Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/131

3 7

[PATCH v5 0/3] MR115: ntdll: Fake success for ThreadPowerThrottlingState
by Alistair Leslie-Hughes (＠alesliehughes) 26 May '22

26 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v5: ntdll: Fake success for ThreadPowerThrottlingState. include: Add THREAD_POWER_THROTTLING_STATE type. winex11.drv: Define ControlMask when not available. https://gitlab.winehq.org/wine/wine/-/merge_requests/115

4 6

[PATCH v5 0/8] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon 25 May '22

25 May '22

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v5: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format uses 0. winegstreamer: Avoid leaking buffer list in wg_transform_read_data. winegstreamer: Return early if output buffer is too small. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

3 12

[PATCH v2 0/5] MR125: qasf: Beginnings of an ASF reader implementation.
by Zebediah Figura (＠zfigura) 25 May '22

25 May '22

This supersedes merge request 116. -- v2: qasf: Implement ASF Reader filter stream stubs. qasf: Create and open a WMReader in the ASF Reader filter. qasf: Rename variables and functions. qasf: Constify filter_ops. qasf/tests: Add more ASF Reader filter tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/125

4 9

Re: [PATCH v2 0/5] MR129: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 25 May '22

25 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/129

1 0

Re: [PATCH v2 0/6] MR128: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 25 May '22

25 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/128

1 0

Re: [PATCH v2 0/1] MR124: win32u: Fix typo in NtUserGetIconInfo. - approved
by Alexandre Julliard (＠julliard) 25 May '22

25 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/124

1 0