June 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcrt: Unify the strncat_s() and wcsncat_s() implementations.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 50aaedffc9ffe024c804d93ed169ba2e2e357c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=50aaedffc9ffe024c804d93e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 27 10:50:52 2022 +0200 msvcrt: Unify the strncat_s() and wcsncat_s() implementations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 42 +++++++++++++++++-------------- dlls/msvcrt/tests/string.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/wcs.c | 51 ++++++++++++++++---------------------- 3 files changed, 107 insertions(+), 48 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 276bbd5684e..dd392abd203 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1393,32 +1393,38 @@ int CDECL strncat_s( char* dst, size_t elem, const char* src, size_t count ) if (!MSVCRT_CHECK_PMT(dst != 0)) return EINVAL; if (!MSVCRT_CHECK_PMT(elem != 0)) return EINVAL; - if (!MSVCRT_CHECK_PMT(src != 0)) + if (count == 0) return 0; + + if (!MSVCRT_CHECK_PMT(src != NULL)) { - dst[0] = '\0'; + *dst = 0; return EINVAL; } - for(i = 0; i < elem; i++) + for (i = 0; i < elem; i++) if (!dst[i]) break; + + if (i == elem) { - if(dst[i] == '\0') + MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n", EINVAL); + *dst = 0; + return EINVAL; + } + + for (j = 0; (j + i) < elem; j++) + { + if(count == _TRUNCATE && j + i == elem - 1) { - for(j = 0; (j + i) < elem; j++) - { - if(count == _TRUNCATE && j + i == elem - 1) - { - dst[j + i] = '\0'; - return STRUNCATE; - } - if(j == count || (dst[j + i] = src[j]) == '\0') - { - dst[j + i] = '\0'; - return 0; - } - } + dst[j + i] = '\0'; + return STRUNCATE; + } + if(j == count || (dst[j + i] = src[j]) == '\0') + { + dst[j + i] = '\0'; + return 0; } } - /* Set the first element to 0, not the first element after the skipped part */ + + MSVCRT_INVALID_PMT("dst[elem] is too small", ERANGE); dst[0] = '\0'; return ERANGE; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6a07e7cb99e..4b224bd1a17 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -65,6 +65,7 @@ static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_strncpy_s)(char *dst, size_t size, const char *src, size_t count); +static int (__cdecl *p_strncat_s)(char *dst, size_t elem, const char *src, size_t count); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); @@ -2603,6 +2604,53 @@ static void test__strlwr_s(void) ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); } +static void test_strncat_s(void) +{ + int ret; + char dst[4]; + char src[4]; + + if (!p_wcsncat_s) + { + win_skip("skipping wcsncat_s tests\n"); + return; + } + + strcpy(src, "abc"); + strcpy(dst, "a"); + ret = p_strncat_s(NULL, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_strncat_s(dst, 0, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); + ret = p_strncat_s(dst, 0, src, _TRUNCATE); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_strncat_s(dst, 4, NULL, 1); + ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); + ret = p_strncat_s(NULL, 4, src, 0); + ok(ret == EINVAL, "err = %d\n", ret); + strcpy(dst, "a"); + ret = p_strncat_s(dst, 4, NULL, 0); + ok(ret == 0, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); + + dst[0] = 0; + ret = p_strncat_s(dst, 2, src, 4); + ok(ret == ERANGE, "err = %d\n", ret); + + dst[0] = 0; + ret = p_strncat_s(dst, 2, src, _TRUNCATE); + ok(ret == STRUNCATE, "err = %d\n", ret); + ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_a(dst)); + + strcpy(dst, "abc"); + dst[3] = 'd'; + ret = p_strncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); +} + static void test_wcsncat_s(void) { int ret; @@ -2616,15 +2664,24 @@ static void test_wcsncat_s(void) } wcscpy(src, L"abc"); - dst[0] = 0; + wcscpy(dst, L"a"); ret = p_wcsncat_s(NULL, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); ret = p_wcsncat_s(dst, 0, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); ret = p_wcsncat_s(dst, 0, src, _TRUNCATE); ok(ret == EINVAL, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); + ret = p_wcsncat_s(dst, 4, NULL, 1); + ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); + ret = p_wcsncat_s(NULL, 4, src, 0); + ok(ret == EINVAL, "err = %d\n", ret); + wcscpy(dst, L"a"); ret = p_wcsncat_s(dst, 4, NULL, 0); ok(ret == 0, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); dst[0] = 0; ret = p_wcsncat_s(dst, 2, src, 4); @@ -2639,6 +2696,7 @@ static void test_wcsncat_s(void) dst[3] = 'd'; ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); } static void test__mbsnbcat_s(void) @@ -4549,6 +4607,7 @@ START_TEST(string) pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_strncpy_s = (void *)GetProcAddress( hMsvcrt, "strncpy_s" ); + p_strncat_s = (void *)GetProcAddress( hMsvcrt, "strncat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); @@ -4623,6 +4682,7 @@ START_TEST(string) test_memcpy_s(); test_memmove_s(); test_strcat_s(); + test_strncat_s(); test__mbscat_s(); test__mbsnbcpy_s(); test__mbscpy_s(); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index be601ffeba2..a438449342e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2451,51 +2451,44 @@ wchar_t* __cdecl wcscat( wchar_t *dst, const wchar_t *src ) } /********************************************************************* - * wcsncat_s (MSVCRT.@) - * + * wcsncat_s (MSVCRT.@) */ -INT CDECL wcsncat_s(wchar_t *dst, size_t elem, - const wchar_t *src, size_t count) +INT CDECL wcsncat_s(wchar_t *dst, size_t elem, const wchar_t *src, size_t count) { - size_t srclen; - wchar_t dststart; - INT ret = 0; + size_t i, j; if (!MSVCRT_CHECK_PMT(dst != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(elem > 0)) return EINVAL; - if (!MSVCRT_CHECK_PMT(src != NULL || count == 0)) return EINVAL; - - if (count == 0) - return 0; - - for (dststart = 0; dststart < elem; dststart++) + if (count == 0) return 0; + if (!MSVCRT_CHECK_PMT(src != NULL)) { - if (dst[dststart] == '\0') - break; + *dst = 0; + return EINVAL; } - if (dststart == elem) + + for (i = 0; i < elem; i++) if (!dst[i]) break; + + if (i == elem) { MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n", EINVAL); + *dst = 0; return EINVAL; } - if (count == _TRUNCATE) + for (j = 0; (j + i) < elem; j++) { - srclen = wcslen(src); - if (srclen >= (elem - dststart)) + if(count == _TRUNCATE && j + i == elem - 1) { - srclen = elem - dststart - 1; - ret = STRUNCATE; + dst[j + i] = '\0'; + return STRUNCATE; + } + if(j == count || (dst[j + i] = src[j]) == '\0') + { + dst[j + i] = '\0'; + return 0; } } - else - srclen = min(wcslen(src), count); - if (srclen < (elem - dststart)) - { - memcpy(&dst[dststart], src, srclen*sizeof(wchar_t)); - dst[dststart+srclen] = '\0'; - return ret; - } + MSVCRT_INVALID_PMT("dst[elem] is too small", ERANGE); dst[0] = '\0'; return ERANGE;

1 0

Nikolay Sivov : d2d1/effect: Mark custom properties as writable.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 4bb4469e43b3de442064feea68a898c11f3ff0d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bb4469e43b3de442064feea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 23:47:10 2022 +0300 d2d1/effect: Mark custom properties as writable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 9 ++++----- dlls/d2d1/tests/d2d1.c | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 72ee5dd5fb1..9085981b733 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -89,15 +89,14 @@ HRESULT d2d_effect_properties_add(struct d2d_effect_properties *props, const WCH p = &props->properties[props->count++]; p->index = index; - if (p->index < 0x80000000) props->custom_count++; - - if (index == D2D1_PROPERTY_CACHED - || index == D2D1_PROPERTY_PRECISION) + if (p->index < 0x80000000) { + props->custom_count++; + /* FIXME: this should probably be controller by subproperty */ p->readonly = FALSE; } else - p->readonly = TRUE; + p->readonly = index != D2D1_PROPERTY_CACHED && index != D2D1_PROPERTY_PRECISION; p->name = wcsdup(name); p->type = type; if (p->type == D2D1_PROPERTY_TYPE_STRING) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3f152c5c2b8..9e64b1354c4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11119,6 +11119,7 @@ static void test_effect_properties(BOOL d3d11) "Got unexpected effect context %p.\n", effect_context); hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef; @@ -11135,7 +11136,6 @@ static void test_effect_properties(BOOL d3d11) integer = 20; hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef; hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); @@ -11173,8 +11173,10 @@ static void test_effect_properties(BOOL d3d11) ok(integer == 0, "Got unexpected integer %u.", integer); hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "Got unexpected hr %#lx.\n", hr); ID2D1Effect_Release(effect);

1 0

Ziqing Hui : d2d1/effect: Create implementation instance for the effect object.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 49c801d0ed435e9de52da395fdef691726f69923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49c801d0ed435e9de52da395… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Jun 26 23:58:03 2022 +0300 d2d1/effect: Create implementation instance for the effect object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/effect.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e5d600ec1c9..2e966da1520 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -654,6 +654,7 @@ struct d2d_effect ID2D1Image ID2D1Image_iface; LONG refcount; + ID2D1EffectImpl *impl; struct d2d_effect_properties properties; struct d2d_effect_context *effect_context; ID2D1Image **inputs; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 9085981b733..3e587eb7547 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,6 +20,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +static HRESULT STDMETHODCALLTYPE d2d_effect_impl_QueryInterface(ID2D1EffectImpl *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), 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 d2d_effect_impl_AddRef(ID2D1EffectImpl *iface) +{ + return 2; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_impl_Release(ID2D1EffectImpl *iface) +{ + return 1; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_impl_Initialize(ID2D1EffectImpl *iface, + ID2D1EffectContext *context, ID2D1TransformGraph *graph) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_impl_PrepareForRender(ID2D1EffectImpl *iface, D2D1_CHANGE_TYPE type) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_impl_SetGraph(ID2D1EffectImpl *iface, ID2D1TransformGraph *graph) +{ + return E_NOTIMPL; +} + +static const ID2D1EffectImplVtbl d2d_effect_impl_vtbl = +{ + d2d_effect_impl_QueryInterface, + d2d_effect_impl_AddRef, + d2d_effect_impl_Release, + d2d_effect_impl_Initialize, + d2d_effect_impl_PrepareForRender, + d2d_effect_impl_SetGraph, +}; + +static HRESULT STDMETHODCALLTYPE builtin_factory_stub(IUnknown **effect_impl) +{ + static ID2D1EffectImpl builtin_stub = { &d2d_effect_impl_vtbl }; + + *effect_impl = (IUnknown *)&builtin_stub; + + return S_OK; +} + struct d2d_effect_info { const CLSID *clsid; @@ -684,6 +745,8 @@ static void d2d_effect_cleanup(struct d2d_effect *effect) free(effect->inputs); ID2D1EffectContext_Release(&effect->effect_context->ID2D1EffectContext_iface); d2d_effect_properties_cleanup(&effect->properties); + if (effect->impl) + ID2D1EffectImpl_Release(effect->impl); } static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) @@ -1040,9 +1103,11 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec const struct d2d_effect_info *builtin = NULL; struct d2d_effect_context *effect_context; const struct d2d_effect_registration *reg; + PD2D1_EFFECT_FACTORY factory; struct d2d_effect *object; WCHAR clsidW[39]; unsigned int i; + HRESULT hr; if (!(reg = d2d_factory_get_registered_effect(context->factory, effect_id))) { @@ -1091,6 +1156,8 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec D2D1_PROPERTY_TYPE_UINT32, max_inputs); d2d_effect_SetInputCount(&object->ID2D1Effect_iface, builtin->default_input_count); + + factory = builtin_factory_stub; } else { @@ -1102,11 +1169,26 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec d2d_effect_SetInputCount(&object->ID2D1Effect_iface, 1); + factory = reg->factory; } d2d_effect_properties_add(&object->properties, L"", D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, clsidW); d2d_effect_properties_add(&object->properties, L"Cached", D2D1_PROPERTY_CACHED, D2D1_PROPERTY_TYPE_BOOL, L"false"); + if (FAILED(hr = factory((IUnknown **)&object->impl))) + { + WARN("Failed to create implementation object, hr %#lx.\n", hr); + ID2D1Effect_Release(&object->ID2D1Effect_iface); + return hr; + } + + if (FAILED(hr = ID2D1EffectImpl_Initialize(object->impl, &effect_context->ID2D1EffectContext_iface, NULL /* FIXME */))) + { + WARN("Failed to initialize effect, hr %#lx.\n", hr); + ID2D1Effect_Release(&object->ID2D1Effect_iface); + return hr; + } + *effect = &object->ID2D1Effect_iface; TRACE("Created effect %p.\n", *effect);

1 0

Nikolay Sivov : d2d1/effect: Use property binding methods.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: e2908463b96ab57088f202a35bd6274a047d8091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2908463b96ab57088f202a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 27 00:25:02 2022 +0300 d2d1/effect: Use property binding methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 39 ++++++++++++++++++++++++++++++++------- dlls/d2d1/tests/d2d1.c | 12 +----------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 3e587eb7547..672cac2a0cd 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -278,11 +278,16 @@ static UINT32 d2d_effect_properties_get_value_size(const struct d2d_effect *effe const struct d2d_effect_properties *properties, UINT32 index) { struct d2d_effect_property *prop; + UINT32 size; if (!(prop = d2d_effect_properties_get_property_by_index(properties, index))) return 0; - /* FIXME: use gettter */ + if (prop->get_function) + { + if (FAILED(prop->get_function((IUnknown *)effect->impl, NULL, 0, &size))) return 0; + return size; + } return prop->size; } @@ -300,10 +305,13 @@ static HRESULT d2d_effect_property_get_value(const struct d2d_effect *effect, const struct d2d_effect_properties *properties, const struct d2d_effect_property *prop, D2D1_PROPERTY_TYPE type, BYTE *value, UINT32 size) { + UINT32 actual_size; + if (type != D2D1_PROPERTY_TYPE_UNKNOWN && prop->type != type) return E_INVALIDARG; if (prop->type != D2D1_PROPERTY_TYPE_STRING && prop->size != size) return E_INVALIDARG; - /* FIXME: use getter */ + if (prop->get_function) + return prop->get_function((IUnknown *)effect->impl, value, size, &actual_size); switch (prop->type) { @@ -321,12 +329,29 @@ static HRESULT d2d_effect_property_get_value(const struct d2d_effect *effect, return S_OK; } -static HRESULT d2d_effect_property_set_value(struct d2d_effect_property *property, +static HRESULT d2d_effect_property_set_value(const struct d2d_effect *effect, + struct d2d_effect_properties *properties, struct d2d_effect_property *prop, D2D1_PROPERTY_TYPE type, const BYTE *value, UINT32 size) { - if (property->readonly) return E_INVALIDARG; + if (prop->readonly) return E_INVALIDARG; + if (type != D2D1_PROPERTY_TYPE_UNKNOWN && prop->type != type) return E_INVALIDARG; + if (prop->get_function && !prop->set_function) return E_INVALIDARG; + if (prop->index < 0x80000000 && !prop->set_function) return E_INVALIDARG; + + if (prop->set_function) + return prop->set_function((IUnknown *)effect->impl, value, size); + + if (prop->size != size) return E_INVALIDARG; - FIXME("Unimplemented.\n"); + switch (prop->type) + { + case D2D1_PROPERTY_TYPE_BOOL: + case D2D1_PROPERTY_TYPE_UINT32: + memcpy(properties->data.ptr + prop->data.offset, value, size); + break; + default: + FIXME("Unhandled type %u.\n", prop->type); + } return S_OK; } @@ -877,7 +902,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_SetValueByName(ID2D1Effect *iface, c if (!(prop = d2d_effect_properties_get_property_by_name(&effect->properties, name))) return D2DERR_INVALID_PROPERTY; - return d2d_effect_property_set_value(prop, type, value, value_size); + return d2d_effect_property_set_value(effect, &effect->properties, prop, type, value, value_size); } static HRESULT STDMETHODCALLTYPE d2d_effect_SetValue(ID2D1Effect *iface, UINT32 index, D2D1_PROPERTY_TYPE type, @@ -891,7 +916,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_SetValue(ID2D1Effect *iface, UINT32 if (!(prop = d2d_effect_properties_get_property_by_index(&effect->properties, index))) return D2DERR_INVALID_PROPERTY; - return d2d_effect_property_set_value(prop, type, value, value_size); + return d2d_effect_property_set_value(effect, &effect->properties, prop, type, value, value_size); } static HRESULT STDMETHODCALLTYPE d2d_effect_GetValueByName(ID2D1Effect *iface, const WCHAR *name, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9e64b1354c4..9156afa71c5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10818,7 +10818,6 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(integer == 10, "Got unexpected integer %u.\n", integer); ok(effect_context == NULL, "Got unexpected effect context %p.\n", effect_context); ID2D1Effect_Release(effect); @@ -10837,7 +10836,6 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(integer == 10, "Got unexpected integer %u.\n", integer); ok(effect_context == NULL, "Got unexpected effect context %p.\n", effect_context); ID2D1Effect_Release(effect); @@ -11107,31 +11105,26 @@ static void test_effect_properties(BOOL d3d11) hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, "Got unexpected effect context %p.\n", effect_context); effect_context = (ID2D1EffectContext *)0xdeadbeef; hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, "Got unexpected effect context %p.\n", effect_context); hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef; hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(integer == 10, "Got unexpected integer %u.", integer); integer = 0xdeadbeef; hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(integer == 10, "Got unexpected integer %u.", integer); integer = 20; @@ -11140,8 +11133,7 @@ static void test_effect_properties(BOOL d3d11) integer = 0xdeadbeef; hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine - ok(integer == 20, "Got unexpected integer %u.", integer); + ok(integer == 20, "Got unexpected integer %u\n.", integer); ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); @@ -11173,10 +11165,8 @@ static void test_effect_properties(BOOL d3d11) ok(integer == 0, "Got unexpected integer %u.", integer); hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); - todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "Got unexpected hr %#lx.\n", hr); ID2D1Effect_Release(effect);

1 0

Nikolay Sivov : d2d1/effect: Use known names for automatically added properties.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: cda5f68a647f187d1de0d4c844c528d2135d047f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda5f68a647f187d1de0d4c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 27 00:33:40 2022 +0300 d2d1/effect: Use known names for automatically added properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 672cac2a0cd..69db6747abc 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -1175,9 +1175,9 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec { WCHAR max_inputs[32]; swprintf(max_inputs, ARRAY_SIZE(max_inputs), L"%lu", builtin->max_inputs); - d2d_effect_properties_add(&object->properties, L"", D2D1_PROPERTY_MIN_INPUTS, + d2d_effect_properties_add(&object->properties, L"MinInputs", D2D1_PROPERTY_MIN_INPUTS, D2D1_PROPERTY_TYPE_UINT32, L"1"); - d2d_effect_properties_add(&object->properties, L"", D2D1_PROPERTY_MAX_INPUTS, + d2d_effect_properties_add(&object->properties, L"MaxInputs", D2D1_PROPERTY_MAX_INPUTS, D2D1_PROPERTY_TYPE_UINT32, max_inputs); d2d_effect_SetInputCount(&object->ID2D1Effect_iface, builtin->default_input_count); @@ -1187,9 +1187,9 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec else { d2d_effect_duplicate_properties(&object->properties, &reg->properties); - d2d_effect_properties_add(&object->properties, L"", D2D1_PROPERTY_MIN_INPUTS, + d2d_effect_properties_add(&object->properties, L"MinInputs", D2D1_PROPERTY_MIN_INPUTS, D2D1_PROPERTY_TYPE_UINT32, L"1"); - d2d_effect_properties_add(&object->properties, L"", D2D1_PROPERTY_MAX_INPUTS, + d2d_effect_properties_add(&object->properties, L"MaxInputs", D2D1_PROPERTY_MAX_INPUTS, D2D1_PROPERTY_TYPE_UINT32, L"1" /* FIXME */); d2d_effect_SetInputCount(&object->ID2D1Effect_iface, 1); @@ -1197,7 +1197,7 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec factory = reg->factory; } - d2d_effect_properties_add(&object->properties, L"", D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, clsidW); + d2d_effect_properties_add(&object->properties, L"CLSID", D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, clsidW); d2d_effect_properties_add(&object->properties, L"Cached", D2D1_PROPERTY_CACHED, D2D1_PROPERTY_TYPE_BOOL, L"false"); if (FAILED(hr = factory((IUnknown **)&object->impl)))

1 0

Nikolay Sivov : d2d1/effect: Add D2D1_PROPERTY_PRECISION property.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 58ba801fd22ab09e7aa3d1253a0508fbe24802e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58ba801fd22ab09e7aa3d125… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 27 01:21:31 2022 +0300 d2d1/effect: Add D2D1_PROPERTY_PRECISION property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 3 +++ dlls/d2d1/tests/d2d1.c | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 69db6747abc..66edab36c79 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -181,6 +181,7 @@ HRESULT d2d_effect_properties_add(struct d2d_effect_properties *props, const WCH switch (p->type) { case D2D1_PROPERTY_TYPE_UINT32: + case D2D1_PROPERTY_TYPE_ENUM: _uint32 = wcstoul(value, NULL, 10); src = &_uint32; break; @@ -347,6 +348,7 @@ static HRESULT d2d_effect_property_set_value(const struct d2d_effect *effect, { case D2D1_PROPERTY_TYPE_BOOL: case D2D1_PROPERTY_TYPE_UINT32: + case D2D1_PROPERTY_TYPE_ENUM: memcpy(properties->data.ptr + prop->data.offset, value, size); break; default: @@ -1199,6 +1201,7 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec d2d_effect_properties_add(&object->properties, L"CLSID", D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, clsidW); d2d_effect_properties_add(&object->properties, L"Cached", D2D1_PROPERTY_CACHED, D2D1_PROPERTY_TYPE_BOOL, L"false"); + d2d_effect_properties_add(&object->properties, L"Precision", D2D1_PROPERTY_PRECISION, D2D1_PROPERTY_TYPE_ENUM, L"0"); if (FAILED(hr = factory((IUnknown **)&object->impl))) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9156afa71c5..9aeb41b76b1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10424,9 +10424,8 @@ static void test_effect(BOOL d3d11) hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %u.\n", precision); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %u.\n", precision); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MIN_INPUTS, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); @@ -11032,10 +11031,8 @@ static void test_effect_properties(BOOL d3d11) hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %#x.\n", precision); + ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %#x.\n", precision); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MIN_INPUTS, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); @@ -11071,7 +11068,6 @@ static void test_effect_properties(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_PRECISION, D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_MIN_INPUTS, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs));

1 0

Nikolay Sivov : d2d1/tests: Enable effect context tests on Wine.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 906b659752beab7d47066ce244e53d524e2874c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=906b659752beab7d47066ce2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 27 01:31:28 2022 +0300 d2d1/tests: Enable effect context tests on Wine. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9aeb41b76b1..6ba4d8cec59 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10886,8 +10886,6 @@ static void test_effect_context(BOOL d3d11) hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (!strcmp(winetest_platform, "wine")) - goto done; /* Test shader loading */ loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); @@ -10920,9 +10918,7 @@ static void test_effect_context(BOOL d3d11) loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); ok(loaded, "Shader is not loaded.\n"); -done: - if (effect) - ID2D1Effect_Release(effect); + ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); release_test_context(&ctx);

1 0

Ziqing Hui : d2d1/effect: Add a transform graph stub.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: aa7a4b7803c8fe4ddc0a24234f62aa22afbf713e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa7a4b7803c8fe4ddc0a2423… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 27 10:11:36 2022 +0300 d2d1/effect: Add a transform graph stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 7 +++ dlls/d2d1/effect.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 150 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2e966da1520..7e74f5dd959 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -648,6 +648,12 @@ struct d2d_effect_registration struct d2d_effect_registration * d2d_factory_get_registered_effect(ID2D1Factory *factory, const GUID *effect_id) DECLSPEC_HIDDEN; +struct d2d_transform_graph +{ + ID2D1TransformGraph ID2D1TransformGraph_iface; + LONG refcount; +}; + struct d2d_effect { ID2D1Effect ID2D1Effect_iface; @@ -657,6 +663,7 @@ struct d2d_effect ID2D1EffectImpl *impl; struct d2d_effect_properties properties; struct d2d_effect_context *effect_context; + struct d2d_transform_graph *graph; ID2D1Image **inputs; size_t inputs_size; size_t input_count; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 66edab36c79..7abee71e6d9 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,6 +20,136 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +static inline struct d2d_transform_graph *impl_from_ID2D1TransformGraph(ID2D1TransformGraph *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_transform_graph, ID2D1TransformGraph_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_QueryInterface(ID2D1TransformGraph *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1TransformGraph) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1TransformGraph_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_transform_graph_AddRef(ID2D1TransformGraph *iface) +{ + struct d2d_transform_graph *graph =impl_from_ID2D1TransformGraph(iface); + ULONG refcount = InterlockedIncrement(&graph->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_transform_graph_Release(ID2D1TransformGraph *iface) +{ + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); + ULONG refcount = InterlockedDecrement(&graph->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + free(graph); + + return refcount; +} + +static UINT32 STDMETHODCALLTYPE d2d_transform_graph_GetInputCount(ID2D1TransformGraph *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetSingleTransformNode(ID2D1TransformGraph *iface, + ID2D1TransformNode *node) +{ + FIXME("iface %p, node %p stub!\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_AddNode(ID2D1TransformGraph *iface, ID2D1TransformNode *node) +{ + FIXME("iface %p, node %p stub!\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_RemoveNode(ID2D1TransformGraph *iface, ID2D1TransformNode *node) +{ + FIXME("iface %p, node %p stub!\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1TransformGraph *iface, ID2D1TransformNode *node) +{ + FIXME("iface %p, node %p stub!\n", iface, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectNode(ID2D1TransformGraph *iface, + ID2D1TransformNode *from_node, ID2D1TransformNode *to_node, UINT32 index) +{ + FIXME("iface %p, from_node %p, to_node %p, index %u stub!\n", iface, from_node, to_node, index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1TransformGraph *iface, + UINT32 input_index, ID2D1TransformNode *node, UINT32 node_index) +{ + FIXME("iface %p, input_index %u, node %p, node_index %u stub!\n", iface, input_index, node, node_index); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_transform_graph_Clear(ID2D1TransformGraph *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetPassthroughGraph(ID2D1TransformGraph *iface, UINT32 index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return E_NOTIMPL; +} + +static const ID2D1TransformGraphVtbl d2d_transform_graph_vtbl = +{ + d2d_transform_graph_QueryInterface, + d2d_transform_graph_AddRef, + d2d_transform_graph_Release, + d2d_transform_graph_GetInputCount, + d2d_transform_graph_SetSingleTransformNode, + d2d_transform_graph_AddNode, + d2d_transform_graph_RemoveNode, + d2d_transform_graph_SetOutputNode, + d2d_transform_graph_ConnectNode, + d2d_transform_graph_ConnectToEffectInput, + d2d_transform_graph_Clear, + d2d_transform_graph_SetPassthroughGraph, +}; + +static void d2d_transform_graph_init(struct d2d_transform_graph *graph) +{ + graph->ID2D1TransformGraph_iface.lpVtbl = &d2d_transform_graph_vtbl; + graph->refcount = 1; +} + static HRESULT STDMETHODCALLTYPE d2d_effect_impl_QueryInterface(ID2D1EffectImpl *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -771,6 +901,7 @@ static void d2d_effect_cleanup(struct d2d_effect *effect) } free(effect->inputs); ID2D1EffectContext_Release(&effect->effect_context->ID2D1EffectContext_iface); + ID2D1TransformGraph_Release(&effect->graph->ID2D1TransformGraph_iface); d2d_effect_properties_cleanup(&effect->properties); if (effect->impl) ID2D1EffectImpl_Release(effect->impl); @@ -1130,6 +1261,7 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec const struct d2d_effect_info *builtin = NULL; struct d2d_effect_context *effect_context; const struct d2d_effect_registration *reg; + struct d2d_transform_graph *graph; PD2D1_EFFECT_FACTORY factory; struct d2d_effect *object; WCHAR clsidW[39]; @@ -1160,8 +1292,16 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec return E_OUTOFMEMORY; d2d_effect_context_init(effect_context, context); + if (!(graph = calloc(1, sizeof(*graph)))) + { + ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); + return E_OUTOFMEMORY; + } + d2d_transform_graph_init(graph); + if (!(object = calloc(1, sizeof(*object)))) { + ID2D1TransformGraph_Release(&graph->ID2D1TransformGraph_iface); ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); return E_OUTOFMEMORY; } @@ -1170,6 +1310,7 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec object->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; object->refcount = 1; object->effect_context = effect_context; + object->graph = graph; /* Create properties */ StringFromGUID2(effect_id, clsidW, ARRAY_SIZE(clsidW)); @@ -1210,7 +1351,8 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec return hr; } - if (FAILED(hr = ID2D1EffectImpl_Initialize(object->impl, &effect_context->ID2D1EffectContext_iface, NULL /* FIXME */))) + if (FAILED(hr = ID2D1EffectImpl_Initialize(object->impl, &effect_context->ID2D1EffectContext_iface, + &graph->ID2D1TransformGraph_iface))) { WARN("Failed to initialize effect, hr %#lx.\n", hr); ID2D1Effect_Release(&object->ID2D1Effect_iface);

1 0

Zhiyi Zhang : uxtheme/tests: Add GetThemeBackgroundRegion() tests.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 9fa5f83ad30e0e49c56e4b8161c646b5f62bf9c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa5f83ad30e0e49c56e4b81… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 23 17:37:06 2022 +0800 uxtheme/tests: Add GetThemeBackgroundRegion() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index cbaf4b51258..e9c91c62638 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2399,6 +2399,40 @@ static void test_DrawThemeBackgroundEx(void) DestroyWindow(hwnd); } +static void test_GetThemeBackgroundRegion(void) +{ + HTHEME htheme; + HRGN region; + HRESULT hr; + HWND hwnd; + RECT rect; + int ret; + + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#lx.\n", GetLastError()); + htheme = OpenThemeData(hwnd, L"Rebar"); + if (!htheme) + { + skip("Theming is inactive.\n"); + DestroyWindow(hwnd); + return; + } + + hr = GetThemeEnumValue(htheme, RP_BAND, 0, TMT_BGTYPE, &ret); + ok(hr == S_OK, "Got unexpected hr %#lx,\n", hr); + ok(ret == BT_NONE, "Got expected type %d.\n", ret); + + SetRect(&rect, 0, 0, 10, 10); + region = (HRGN)0xdeadbeef; + hr = GetThemeBackgroundRegion(htheme, NULL, RP_BAND, 0, &rect, &region); + todo_wine + ok(hr == E_UNEXPECTED || broken(hr == S_OK) /* < Win10 */, "Got unexpected hr %#lx.\n", hr); + ok(region == (HRGN)0xdeadbeef, "Got unexpected region.\n"); + + CloseThemeData(htheme); + DestroyWindow(hwnd); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2422,6 +2456,7 @@ START_TEST(system) test_GetThemeTransitionDuration(); test_DrawThemeParentBackground(); test_DrawThemeBackgroundEx(); + test_GetThemeBackgroundRegion(); if (load_v6_module(&ctx_cookie, &ctx)) {

1 0

Zhiyi Zhang : uxtheme: Handle BT_NONE in GetThemeBackgroundRegion().
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 5d5853e3edded8cdafe1ea984162254dd2e54a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5853e3edded8cdafe1ea98… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 16:57:39 2022 +0800 uxtheme: Handle BT_NONE in GetThemeBackgroundRegion(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 6 +++++- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 55242d92559..3286d70d4d1 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -2063,8 +2063,12 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, if(!*pRegion) hr = HRESULT_FROM_WIN32(GetLastError()); } + else if (bgtype == BT_NONE) + { + hr = E_UNEXPECTED; + } else { - FIXME("Unknown background type\n"); + FIXME("Unknown background type %d\n", bgtype); /* This should never happen, and hence I don't know what to return */ hr = E_FAIL; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index e9c91c62638..aa566f554ff 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2425,7 +2425,6 @@ static void test_GetThemeBackgroundRegion(void) SetRect(&rect, 0, 0, 10, 10); region = (HRGN)0xdeadbeef; hr = GetThemeBackgroundRegion(htheme, NULL, RP_BAND, 0, &rect, &region); - todo_wine ok(hr == E_UNEXPECTED || broken(hr == S_OK) /* < Win10 */, "Got unexpected hr %#lx.\n", hr); ok(region == (HRGN)0xdeadbeef, "Got unexpected region.\n");

1 0