January 2021 - Wine-Commits

Rémi Bernon : d2d1/tests: Store the resource data pointer and row-pitch directly in struct resource_readback.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: aab3f4b7fe8ba0d7f6da015872e7a6726846a588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab3f4b7fe8ba0d7f6da0158… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:59 2021 +0330 d2d1/tests: Store the resource data pointer and row-pitch directly in struct resource_readback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c8c0e83df1c..a1869dcaaaa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -54,8 +54,8 @@ struct d2d1_test_context struct resource_readback { ID3D10Resource *resource; - D3D10_MAPPED_TEXTURE2D map_desc; - unsigned int width, height; + unsigned int pitch, width, height; + void *data; }; struct figure @@ -314,6 +314,7 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) { D3D10_TEXTURE2D_DESC texture_desc; + D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; ID3D10Resource *src_resource; ID3D10Device *device; @@ -346,8 +347,11 @@ static void get_surface_readback(IDXGISurface *surface, struct resource_readback ID3D10Resource_Release(src_resource); ID3D10Device_Release(device); - hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &rb->map_desc); + hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + + rb->pitch = map_desc.RowPitch; + rb->data = map_desc.pData; } static void release_resource_readback(struct resource_readback *rb) @@ -358,7 +362,7 @@ static void release_resource_readback(struct resource_readback *rb) static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)((BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch))[x]; + return ((DWORD *)((BYTE *)rb->data + y * rb->pitch))[x]; } static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) @@ -463,8 +467,7 @@ static BOOL compare_surface(IDXGISurface *surface, const char *ref_sha1) BOOL ret; get_surface_readback(surface, &rb); - ret = compare_sha1(rb.map_desc.pData, rb.map_desc.RowPitch, 4, - rb.width, rb.height, ref_sha1); + ret = compare_sha1(rb.data, rb.pitch, 4, rb.width, rb.height, ref_sha1); release_resource_readback(&rb); return ret; @@ -641,7 +644,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y figure.spans_size = 64; figure.spans = HeapAlloc(GetProcessHeap(), 0, figure.spans_size * sizeof(*figure.spans)); - read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.data, rb.pitch, x, y, w, h, prev); deserialize_figure(&ref_figure, (BYTE *)ref); span = w * h; @@ -679,7 +682,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y if (diff > max_diff) { trace("diff %u > max_diff %u.\n", diff, max_diff); - read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.data, rb.pitch, x, y, w, h, prev); serialize_figure(&figure); }

1 0

Rémi Bernon : d2d1/tests: Create a Direct2D render target in init_test_context_().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 85f3ba90e520e49be32ce2118e1cab771766a94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f3ba90e520e49be32ce211… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:58 2021 +0330 d2d1/tests: Create a Direct2D render target in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 131 +++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85f3ba90e520e49be32c…

1 0

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure to compare_surface().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: f5bb97d28f20ce0040d77f508998c1e75d32f86a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bb97d28f20ce0040d77f50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:00 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure to compare_surface(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5bb97d28f20ce0040d7…

1 0

Rémi Bernon : d2d1/tests: Run most tests on d3d11 as well.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 00401d2278298d151b555fcdffb15bb282c512a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00401d2278298d151b555fcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:04 2021 +0330 d2d1/tests: Run most tests on d3d11 as well. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 352 +++++++++++++++++++++++++++++++------------- 2 files changed, 247 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00401d2278298d151b55…

1 0

Rémi Bernon : d2d1/tests: Store an IDXGIDevice interface instead of an ID3D10Device1 interface in struct d2d1_test_context.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 691744cac6a3db83c0e58f8ba78295c81247729d URL: https://source.winehq.org/git/wine.git/?a=commit;h=691744cac6a3db83c0e58f8b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:03 2021 +0330 d2d1/tests: Store an IDXGIDevice interface instead of an ID3D10Device1 interface in struct d2d1_test_context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 87 +++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6f8aac4fd04..d38cd5649a6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -44,7 +44,7 @@ size_t mt_tests_size, mt_test_count; struct d2d1_test_context { - ID3D10Device1 *device; + IDXGIDevice *device; HWND window; IDXGISwapChain *swapchain; IDXGISurface *surface; @@ -694,7 +694,7 @@ static BOOL compare_figure(struct d2d1_test_context *ctx, unsigned int x, unsign return diff <= max_diff; } -static ID3D10Device1 *create_device(void) +static ID3D10Device1 *create_d3d10_device(void) { ID3D10Device1 *device; @@ -711,6 +711,22 @@ static ID3D10Device1 *create_device(void) return NULL; } +static IDXGIDevice *create_device(void) +{ + ID3D10Device1 *d3d10_device; + IDXGIDevice *device; + HRESULT hr; + + if (!(d3d10_device = create_d3d10_device())) + return NULL; + + hr = ID3D10Device1_QueryInterface(d3d10_device, &IID_IDXGIDevice, (void **)&device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + ID3D10Device1_Release(d3d10_device); + + return device; +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -721,20 +737,16 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) +static IDXGISwapChain *create_swapchain(IDXGIDevice *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC desc; - IDXGIDevice *dxgi_device; IDXGIAdapter *adapter; IDXGIFactory *factory; HRESULT hr; - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); @@ -762,6 +774,19 @@ static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL return swapchain; } +static IDXGISwapChain *create_d3d10_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) +{ + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + HRESULT hr; + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + swapchain = create_swapchain(dxgi_device, window, windowed); + IDXGIDevice_Release(dxgi_device); + return swapchain; +} + static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { ID2D1RenderTarget *render_target; @@ -806,7 +831,7 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c IDXGISurface_Release(ctx->surface); IDXGISwapChain_Release(ctx->swapchain); DestroyWindow(ctx->window); - ID3D10Device1_Release(ctx->device); + IDXGIDevice_Release(ctx->device); } #define init_test_context(ctx) init_test_context_(__LINE__, ctx) @@ -4256,7 +4281,7 @@ static void test_shared_bitmap(void) IDXGISwapChain *swapchain2; D2D1_SIZE_U size = {4, 4}; IDXGISurface1 *surface3; - ID3D10Device1 *device2; + IDXGIDevice *device2; HWND window2; HRESULT hr; @@ -4480,7 +4505,7 @@ static void test_shared_bitmap(void) IWICBitmap_Release(wic_bitmap1); IDXGISurface_Release(surface2); IDXGISwapChain_Release(swapchain2); - ID3D10Device1_Release(device2); + IDXGIDevice_Release(device2); release_test_context(&ctx); DestroyWindow(window2); CoUninitialize(); @@ -7792,7 +7817,6 @@ static void test_create_device(void) { D2D1_CREATION_PROPERTIES properties = {0}; struct d2d1_test_context ctx; - IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1Factory *factory2; ID2D1Device *device; @@ -7809,10 +7833,7 @@ static void test_create_device(void) return; } - hr = ID3D10Device1_QueryInterface(ctx.device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); ID2D1Device_GetFactory(device, &factory2); @@ -7822,18 +7843,17 @@ static void test_create_device(void) if (pD2D1CreateDevice) { - hr = pD2D1CreateDevice(dxgi_device, NULL, &device); + hr = pD2D1CreateDevice(ctx.device, NULL, &device); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Device_Release(device); - hr = pD2D1CreateDevice(dxgi_device, &properties, &device); + hr = pD2D1CreateDevice(ctx.device, &properties, &device); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Device_Release(device); } else win_skip("D2D1CreateDevice() is unavailable.\n"); - IDXGIDevice_Release(dxgi_device); release_test_context(&ctx); refcount = ID2D1Factory1_Release(factory); @@ -8062,7 +8082,6 @@ static void test_bitmap_surface(void) IDXGISurface *surface2; D2D1_PIXEL_FORMAT pixel_format; struct d2d1_test_context ctx; - IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; ID2D1Bitmap1 *bitmap; @@ -8101,10 +8120,7 @@ static void test_bitmap_surface(void) ID2D1DeviceContext_Release(device_context); /* Bitmap created from DXGI surface. */ - hr = ID3D10Device1_QueryInterface(ctx.device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); @@ -8134,10 +8150,7 @@ static void test_bitmap_surface(void) } /* A8 surface */ - hr = IDXGISurface_GetDevice(ctx.surface, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get the device, hr %#x.\n", hr); - - surface2 = create_surface(dxgi_device, DXGI_FORMAT_A8_UNORM); + surface2 = create_surface(ctx.device, DXGI_FORMAT_A8_UNORM); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface2, NULL, &bitmap); ok(SUCCEEDED(hr) || broken(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) /* Win7 */, @@ -8152,7 +8165,6 @@ static void test_bitmap_surface(void) ID2D1Bitmap1_Release(bitmap); } - IDXGIDevice_Release(dxgi_device); IDXGISurface_Release(surface2); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, NULL, &bitmap); @@ -8212,7 +8224,6 @@ static void test_bitmap_surface(void) ID2D1DeviceContext_Release(device_context); ID2D1Device_Release(device); - IDXGIDevice_Release(dxgi_device); /* DC target */ rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; @@ -8282,7 +8293,6 @@ static void test_device_context(void) struct d2d1_test_context ctx; D2D1_BITMAP_OPTIONS options; ID2D1DCRenderTarget *dc_rt; - IDXGIDevice *dxgi_device; D2D1_UNIT_MODE unit_mode; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; @@ -8305,12 +8315,8 @@ static void test_device_context(void) return; } - hr = ID3D10Device1_QueryInterface(ctx.device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); @@ -8585,19 +8591,14 @@ static void test_skew_matrix(void) } } -static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, ID3D10Device1 *d3d_device) +static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) { ID2D1DeviceContext *device_context; - IDXGIDevice *dxgi_device; ID2D1Device *device; HRESULT hr; - hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); @@ -8905,7 +8906,7 @@ static void test_max_bitmap_size(void) } window = create_window(); - swapchain = create_swapchain(device, window, TRUE); + swapchain = create_d3d10_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);

1 0

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure to compare_figure().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 1b2e27fe498299928091f40038652d8ae63eecc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b2e27fe498299928091f400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:01 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure to compare_figure(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 296 ++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b2e27fe498299928091…

1 0

Rémi Bernon : d2d1/tests: Create a swapchain in init_test_context_().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 7b312cd1be5fff36e11a87e6271bdd6cf40084a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b312cd1be5fff36e11a87e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:56 2021 +0330 d2d1/tests: Create a swapchain in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 118 ++++++++++++------------------------------------- 1 file changed, 28 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b312cd1be5fff36e11a…

1 0

Rémi Bernon : d2d1/tests: Create a window in init_test_context_().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: acd9b6a45aa0890e1fe48f3d7feb98c484b60c17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd9b6a45aa0890e1fe48f3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:55 2021 +0330 d2d1/tests: Create a window in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 120 ++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acd9b6a45aa0890e1fe4…

1 0

Rémi Bernon : d2d1/tests: Introduce init_test_context().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: 02634c3d75c8b1a12c3f12295a2562a71ca503aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=02634c3d75c8b1a12c3f1229… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:54 2021 +0330 d2d1/tests: Introduce init_test_context(). Analogous to the d3d11 tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 374 ++++++++++++++++++++++--------------------------- 1 file changed, 167 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02634c3d75c8b1a12c3f…

1 0

Jactry Zeng : d2d1: Partially implement d2d_device_context_DrawImage().
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: wine Branch: master Commit: c19fc01d363e06fa9a3a19d6f5f8cbd2d6057f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19fc01d363e06fa9a3a19d6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:39 2021 +0800 d2d1: Partially implement d2d_device_context_DrawImage(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 34 +++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index e8bc7207a67..5f04c3aa833 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1067,7 +1067,8 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, - const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) + const D2D1_RECT_F *src_rect, const D2D1_POINT_2F *offset, + const D2D1_MATRIX_4X4_F *perspective_transform) { D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; @@ -1102,6 +1103,14 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I d.bottom = s.bottom - s.top; } + if (offset) + { + d.left += offset->x; + d.top += offset->y; + d.right += offset->x; + d.bottom += offset->y; + } + bitmap_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP; bitmap_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP; bitmap_brush_desc.interpolationMode = interpolation_mode; @@ -1141,7 +1150,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * } d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, d2d1_1_interp_mode_from_d2d1(interpolation_mode), - src_rect, NULL); + src_rect, NULL, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface, @@ -2211,9 +2220,26 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *i const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, D2D1_COMPOSITE_MODE composite_mode) { - FIXME("iface %p, image %p, target_offset %s, image_rect %s, interpolation_mode %#x, composite_mode %#x stub!\n", + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + ID2D1Bitmap *bitmap; + + TRACE("iface %p, image %p, target_offset %s, image_rect %s, interpolation_mode %#x, composite_mode %#x.\n", iface, image, debug_d2d_point_2f(target_offset), debug_d2d_rect_f(image_rect), interpolation_mode, composite_mode); + + if (composite_mode != D2D1_COMPOSITE_MODE_SOURCE_OVER) + FIXME("Unhandled composite mode %#x.\n", composite_mode); + + if (SUCCEEDED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, d2d1_1_interp_mode_from_d2d1(interpolation_mode), + image_rect, target_offset, NULL); + + ID2D1Bitmap_Release(bitmap); + return; + } + + FIXME("Unhandled image %p.\n", image); } static void STDMETHODCALLTYPE d2d_device_context_DrawGdiMetafile(ID2D1DeviceContext *iface, @@ -2235,7 +2261,7 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(I debug_d2d_rect_f(src_rect), perspective_transform); d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, - perspective_transform); + NULL, perspective_transform); } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 19bb94530c2..8627f5ebef6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1746,7 +1746,84 @@ static void test_bitmap_brush(void) hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); if (hr == S_OK) - ID2D1Image_Release(image); + { + ID2D1DeviceContext *context; + D2D1_POINT_2F offset; + D2D1_RECT_F src_rect; + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1RenderTarget_GetTransform(rt, &tmp_matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 20.0f, 12.0f); + scale_matrix(&matrix, 2.0f, 6.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + + /* Crash on Windows 7+ */ + if (0) + { + ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + } + + ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + set_rect(&src_rect, 0.0f, 0.0f, image_size.width, image_size.height); + + ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = -1; + offset.y = -1; + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 2; + offset.y = image_size.height; + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 3; + set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 4; + set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 5; + set_rect(&src_rect, image_size.width, image_size.height, 0.0f, 0.0f); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "95675fbc4a16404c9568d41b14e8f6be64240998"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + + offset.x = image_size.width * 6; + set_rect(&src_rect, 1.0f, 0.0f, 1.0f, image_size.height); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "95675fbc4a16404c9568d41b14e8f6be64240998"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_SetTransform(rt, &tmp_matrix); + ID2D1DeviceContext_Release(context); + } /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on * Windows 7+. */

1 0