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

[PATCH v2 1/2] d2d1/tests: Add tests for GetImageLocalBounds().
by Ziqing Hui 12 Apr '22

12 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Test changing context dpi and unit mode. dlls/d2d1/tests/d2d1.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 826526d9d38..cd068f78bfa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10764,6 +10764,99 @@ static void test_stroke_contains_point(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_image_bounds(BOOL d3d11) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D1_UNIT_MODE unit_mode; + ID2D1Factory1 *factory; + ID2D1Bitmap *bitmap; + float dpi_x, dpi_y; + D2D_RECT_F bounds; + D2D1_SIZE_F size; + unsigned int i; + HRESULT hr; + + const struct bitmap_bounds_test + { + float dpi_x; + float dpi_y; + D2D_SIZE_U pixel_size; + } + bitmap_bounds_tests[] = + { + {96.0f, 96.0f, {100, 100}}, + {48.0f, 48.0f, {100, 100}}, + {192.0f, 192.0f, {100, 100}}, + {96.0f, 10.0f, {100, 100}}, + {50.0f, 100.0f, {100, 100}}, + {150.0f, 150.0f, {100, 100}}, + {48.0f, 48.0f, {1, 1}}, + {192.0f, 192.0f, {1, 1}}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(bitmap_bounds_tests); ++i) + { + const struct bitmap_bounds_test *test = &bitmap_bounds_tests[i]; + winetest_push_context("Test %u", i); + + bitmap_desc.dpiX = test->dpi_x; + bitmap_desc.dpiY = test->dpi_y; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, test->pixel_size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&bounds, 0.0f, 0.0f, 0.0f, 0.0f); + size = ID2D1Bitmap_GetSize(bitmap); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, size.width, size.height); + + /* Test bitmap local bounds after changing context dpi */ + ID2D1DeviceContext_GetDpi(context, &dpi_x, &dpi_y); + ID2D1DeviceContext_SetDpi(context, dpi_x * 2.0f, dpi_y * 2.0f); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, size.width, size.height); + ID2D1DeviceContext_SetDpi(context, dpi_x, dpi_y); + + /* Test bitmap local bounds after changing context unit mode */ + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); + ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, test->pixel_size.width, test->pixel_size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, + (float)test->pixel_size.width, (float)test->pixel_size.height); + ID2D1DeviceContext_SetUnitMode(context, unit_mode); + + ID2D1Bitmap_Release(bitmap); + winetest_pop_context(); + } + + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -10835,6 +10928,7 @@ START_TEST(d2d1) queue_test(test_effect_crop); queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); + queue_test(test_image_bounds); run_queued_tests(); } -- 2.25.1

3 4

[PATCH 8/8] winex11: Directly use win32u for GDI functions in more places.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/brush.c | 6 +++--- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/init.c | 15 +++++++++------ dlls/winex11.drv/mouse.c | 40 ++++++++++++++++++++------------------- dlls/winex11.drv/opengl.c | 17 ++++++++++------- dlls/winex11.drv/pen.c | 10 +++++----- 6 files changed, 50 insertions(+), 42 deletions(-)

2 1

[PATCH 7/8] winex11: Directly use win32u for GDI functions in xrender.c.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 60 +++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 23 deletions(-)

2 1

[PATCH 6/8] winex11: Directly use win32u for GDI functions in palette.c.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/palette.c | 39 +++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 5 +++++ 2 files changed, 25 insertions(+), 19 deletions(-)

2 1

[PATCH 5/8] winex11: Directly use win32u for GDI functions in graphics.c.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 122 +++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 7 +++ 2 files changed, 80 insertions(+), 49 deletions(-)

2 1

[PATCH 4/8] winex11: Directly use win32u for GDI functions in window.c.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/window.c | 111 ++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 52 deletions(-)

2 1

[PATCH 3/8] winex11: Directly use win32u for GDI functions in bitblt.c.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 50 +++++++++++++++++++++++---------------- dlls/winex11.drv/x11drv.h | 3 +-- 2 files changed, 31 insertions(+), 22 deletions(-)

2 1

[PATCH 2/8] win32u: Implement NtGdiGetDCPoint.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dc.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 9 +++++++++ dlls/wow64win/syscall.h | 1 + include/ntgdi.h | 8 ++++++++ 6 files changed, 56 insertions(+), 1 deletion(-)

3 2

[PATCH 1/8] win32u: Implement NtGdiGetDCDword.
by Jacek Caban 12 Apr '22

12 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dc.c | 67 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 9 ++++++ dlls/wow64win/syscall.h | 1 + include/ntgdi.h | 16 ++++++++++ 6 files changed, 95 insertions(+), 1 deletion(-)

2 1

[PATCH] kernel32/tests: Check against INVALID_HANDLE_VALUE for CreateActCtxW() return values.
by Zhiyi Zhang 12 Apr '22

12 Apr '22

CreateActCtxW() returns INVALID_HANDLE_VALUE on error. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index a91c46ddf89..ebe1bb86470 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3650,7 +3650,7 @@ static void test_manifest_in_module(void) ctx.lpResourceName = (LPWSTR)124; ctx.hModule = GetModuleHandleW(NULL); handle = CreateActCtxW(&ctx); - ok(handle != 0, "CreateActCtx error %lu\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "CreateActCtx error %lu\n", GetLastError()); test_basic_info(handle, __LINE__); test_detailed_info(handle, &detailed_info3, __LINE__); -- 2.32.0

1 0