wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

[PATCH] d2d1/tests: Add tests for effect context.
by Ziqing Hui 24 May '22

24 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- Note: create_factory() becomes get_factory() because the factory which registers effects needs to be the same one with device context. So we get factory from render target here, instead of creating a new one. dlls/d2d1/tests/d2d1.c | 131 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0a8245d6805..83f3d12cd4b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -31,6 +31,8 @@ #include "wine/heap.h" DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); +DEFINE_GUID(GUID_TestVertexShader, 0x5bcdcfae,0x1e92,0x4dc1,0x94,0xfa,0x3b,0x01,0xca,0x54,0x59,0x20); +DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf,0x15,0x29,0x7f,0x01); static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ @@ -86,6 +88,39 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const DWORD test_vs[] = +{ +#if 0 + void main(float4 pos : Position, out float4 output : SV_Position) + { + output = pos; + } +#endif + 0x43425844, 0xa84b398b, 0xc4047d32, 0xc19c67bb, 0x4644285e, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x69736f50, 0x6e6f6974, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, +}; + +static const DWORD test_ps[] = +{ +#if 0 + float4 main() : SV_Target + { + return float4(0.1, 0.2, 0.3, 0.4); + } +#endif + 0x43425844, 0xf34300ae, 0x22fc6d56, 0x5cca66fa, 0x86ae3266, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3dcccccd, + 0x3e4ccccd, 0x3e99999a, 0x3ecccccd, 0x0100003e, +}; + static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); @@ -10134,9 +10169,10 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } -static void *create_factory(const GUID *iid, UINT32 *factory_version) +static IUnknown *get_factory(ID2D1RenderTarget *rt, const GUID *iid, UINT32 *factory_version) { IUnknown *factory, *tmp; + ID2D1Factory *factory0; unsigned int i; static const GUID *const factory_iid[] = @@ -10147,8 +10183,12 @@ static void *create_factory(const GUID *iid, UINT32 *factory_version) &IID_ID2D1Factory3, }; - if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, iid, NULL, (void **)&factory))) + ID2D1RenderTarget_GetFactory(rt, &factory0); + if (FAILED(ID2D1Factory_QueryInterface(factory0, iid, (void **)&factory))) + { + ID2D1Factory_Release(factory0); return NULL; + } if (factory_version) { @@ -10161,6 +10201,7 @@ static void *create_factory(const GUID *iid, UINT32 *factory_version) *factory_version = i - 1; } + ID2D1Factory_Release(factory0); return factory; } @@ -10202,7 +10243,7 @@ static void test_effect(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (!(factory = create_factory(&IID_ID2D1Factory1, &factory_version))) + if (!(factory = (ID2D1Factory1 *)get_factory(ctx.rt, &IID_ID2D1Factory1, &factory_version))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); @@ -10531,7 +10572,7 @@ static void test_effect_register(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (!(factory = create_factory(&IID_ID2D1Factory1, NULL))) + if (!(factory = (ID2D1Factory1 *)get_factory(ctx.rt, &IID_ID2D1Factory1, NULL))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); @@ -10596,6 +10637,87 @@ static void test_effect_register(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_context(BOOL d3d11) +{ + ID2D1DeviceContext *device_context; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Effect *effect = NULL; + ID2D1Factory1 *factory; + BOOL loaded; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (!(factory = (ID2D1Factory1 *)get_factory(ctx.rt, &IID_ID2D1Factory1, NULL))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + + /* Test shader loading */ + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); + todo_wine ok(!loaded, "Shader is loaded.\n"); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + todo_wine ok(!loaded, "Shader is loaded.\n"); + + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); + todo_wine ok(loaded, "Shader is not loaded.\n"); + + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1EffectContext_LoadPixelShader(effect_context, + &GUID_TestPixelShader, (const BYTE *)test_vs, sizeof(test_vs)); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadPixelShader(effect_context, + &GUID_TestPixelShader, (const BYTE *)test_ps, sizeof(test_ps)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + todo_wine ok(loaded, "Shader is not loaded.\n"); + +done: + if (effect) + ID2D1Effect_Release(effect); + ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ID2D1DeviceContext_Release(device_context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11389,6 +11511,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect_register); + queue_test(test_effect_context); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

2 1

[PATCH v2 0/6] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon (＠rbernon) 24 May '22

24 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. -- v2: 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 explicitely uses 0. 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 17

[PATCH 1/3] wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().
by Zebediah Figura 23 May '22

23 May '22

The sub-resource index should not be offset by the layer index, which represents a depth offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53027 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/view.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2dea8f0f9a..dbd385219f0 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -315,7 +315,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont static void wined3d_view_invalidate_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -325,17 +325,21 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_invalidate_location(texture, desc->u.texture.level_idx, location); + return; + } sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } static void wined3d_view_load_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -345,9 +349,14 @@ static void wined3d_view_load_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_load_location(texture, desc->u.texture.level_idx, context, location); + return; + } + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_load_location(texture, sub_resource_idx, context, location); } -- 2.35.1

2 3

Re: [PATCH v2 0/5] MR113: include: Fix malloc attributes, and a few related warnings. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

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

1 0

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

23 May '22

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

1 0

Re: [PATCH v3 0/2] MR106: Avoid mpg123 functions with suffix - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

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

1 0

Re: [PATCH v3 0/6] MR117: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

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

1 0

Re: [PATCH v2 0/1] MR108: wmphoto: Zero user buffer before calling jxrlib Copy. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

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

1 0

Re: [PATCH v2 0/1] MR107: mscoree/tests: Use wait_child_process for csc process. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

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

1 0

[PATCH v3 resend] d2d1/tests: Add tests for effect register.
by Ziqing Hui 23 May '22

23 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- This patch is resend to see the its result on test bot. dlls/d2d1/tests/d2d1.c | 301 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 301 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 663fc150df8..0a8245d6805 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -21,6 +21,7 @@ #include <math.h> #include <float.h> #include "d2d1_3.h" +#include "d2d1effectauthor.h" #include "d3d11.h" #include "wincrypt.h" #include "wine/test.h" @@ -29,6 +30,62 @@ #include "wincodec.h" #include "wine/heap.h" +DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); + +static const WCHAR *effect_xml_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Integer' type='uint32'> \ + <Property name='DisplayName' type='string' value='Integer'/> \ + <Property name='Min' type='uint32' value='0'/> \ + <Property name='Max' type='uint32' value='100'/> \ + <Property name='Default' type='uint32' value='10'/> \ + </Property> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Context' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Context'/> \ + </Property> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_c = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Context' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Context'/> \ + </Property> \ + <Property name='Integer' type='uint32'> \ + <Property name='DisplayName' type='string' value='Integer'/> \ + </Property> \ + </Effect> \ +"; + static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); @@ -118,6 +175,14 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; +struct effect_impl +{ + ID2D1EffectImpl ID2D1EffectImpl_iface; + LONG refcount; + UINT integer; + ID2D1EffectContext *effect_context; +}; + static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) { if (mt_test_count >= mt_tests_size) @@ -10296,6 +10361,241 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static inline struct effect_impl *impl_from_ID2D1EffectImpl(ID2D1EffectImpl *iface) +{ + return CONTAINING_RECORD(iface, struct effect_impl, ID2D1EffectImpl_iface); +} + +static HRESULT STDMETHODCALLTYPE effect_impl_QueryInterface(ID2D1EffectImpl *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_ID2D1EffectImpl) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectImpl_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE effect_impl_AddRef(ID2D1EffectImpl *iface) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ULONG refcount = InterlockedIncrement(&effect_impl->refcount); + return refcount; +} + +static ULONG STDMETHODCALLTYPE effect_impl_Release(ID2D1EffectImpl *iface) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ULONG refcount = InterlockedDecrement(&effect_impl->refcount); + + if (!refcount) + { + if (effect_impl->effect_context) + ID2D1EffectContext_Release(effect_impl->effect_context); + heap_free(effect_impl); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_Initialize(ID2D1EffectImpl *iface, + ID2D1EffectContext *context,ID2D1TransformGraph *graph) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ID2D1EffectContext_AddRef(effect_impl->effect_context = context); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_PrepareForRender(ID2D1EffectImpl *iface, D2D1_CHANGE_TYPE type) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_SetGraph(ID2D1EffectImpl *iface, ID2D1TransformGraph *graph) +{ + return E_NOTIMPL; +} + +static const ID2D1EffectImplVtbl effect_impl_vtbl = +{ + effect_impl_QueryInterface, + effect_impl_AddRef, + effect_impl_Release, + effect_impl_Initialize, + effect_impl_PrepareForRender, + effect_impl_SetGraph, +}; + +static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) +{ + struct effect_impl *object; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID2D1EffectImpl_iface.lpVtbl = &effect_impl_vtbl; + object->refcount = 1; + object->integer = 0; + object->effect_context = NULL; + + *effect_impl = (IUnknown *)&object->ID2D1EffectImpl_iface; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_set_integer(IUnknown *iface, const BYTE *data, UINT32 data_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->integer)) + return E_INVALIDARG; + + effect_impl->integer = *((UINT *)data); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_get_integer(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->integer)) + return E_INVALIDARG; + + *((UINT *)data) = effect_impl->integer; + if (actual_size) + *actual_size = sizeof(effect_impl->integer); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->effect_context)) + return E_INVALIDARG; + + *((ID2D1EffectContext **)data) = effect_impl->effect_context; + if (actual_size) + *actual_size = sizeof(effect_impl->effect_context); + + return S_OK; +} + +static void test_effect_register(BOOL d3d11) +{ + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + unsigned int i; + HRESULT hr; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Integer", effect_impl_set_integer, effect_impl_get_integer}, + {L"Context", NULL, effect_impl_get_context}, + {L"Integer", NULL, effect_impl_get_integer}, + {L"Integer", effect_impl_set_integer, NULL}, + {L"Integer", NULL, NULL}, + {L"DeadBeef", effect_impl_set_integer, effect_impl_get_integer}, + }; + + const struct binding_test + { + const D2D1_PROPERTY_BINDING *binding; + UINT32 binding_count; + const WCHAR *effect_xml; + HRESULT hr; + } + binding_tests[] = + { + {NULL, 0, effect_xml_a, S_OK}, + {NULL, 0, effect_xml_b, S_OK}, + {binding, 1, effect_xml_a, S_OK}, + {binding, 1, effect_xml_b, D2DERR_INVALID_PROPERTY}, + {binding + 1, 1, effect_xml_b, S_OK}, + {binding + 2, 1, effect_xml_a, S_OK}, + {binding + 3, 1, effect_xml_a, S_OK}, + {binding + 4, 1, effect_xml_a, S_OK}, + {binding + 5, 1, effect_xml_a, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_a, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_b, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_c, S_OK}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (!(factory = create_factory(&IID_ID2D1Factory1, NULL))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + /* Register effect once */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + /* Register effect multiple times */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + /* Register effect multiple times with different xml */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Register effect with property binding */ + for (i = 0; i < ARRAY_SIZE(binding_tests); ++i) + { + const struct binding_test *test = &binding_tests[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + test->effect_xml, test->binding, test->binding_count, effect_impl_create); + todo_wine_if(test->hr != S_OK) + ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); + ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + + winetest_pop_context(); + } + + /* Unregister builtin effect */ + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_D2D1Composite); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11088,6 +11388,7 @@ START_TEST(d2d1) queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); queue_test(test_mt_factory); + queue_test(test_effect_register); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel