April 2024 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1/effect: Fix property value size for empty or missing string values.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 48d043d31f08f5870c2b3df7a35bff7d213c758f URL: https://gitlab.winehq.org/wine/wine/-/commit/48d043d31f08f5870c2b3df7a35bff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 03:27:28 2024 +0200 d2d1/effect: Fix property value size for empty or missing string values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 4 ++-- dlls/d2d1/tests/d2d1.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index cf715332fde..00b36339681 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -796,10 +796,10 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * p->readonly = index != D2D1_PROPERTY_CACHED && index != D2D1_PROPERTY_PRECISION; p->name = wcsdup(name); p->type = type; - if (p->type == D2D1_PROPERTY_TYPE_STRING && value) + if (p->type == D2D1_PROPERTY_TYPE_STRING) { p->data.ptr = wcsdup(value); - p->size = (wcslen(value) + 1) * sizeof(WCHAR); + p->size = value ? (wcslen(value) + 1) * sizeof(WCHAR) : sizeof(WCHAR); } else { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 723cc1f8384..e076db1738c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10906,8 +10906,7 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect) { hr = ID2D1Effect_GetValue(effect, test->index, D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); ok_(__FILE__, line)(hr == S_OK, "Failed to get value, hr %#lx.\n", hr); - str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); - todo_wine_if(buffer[0] == 0) + str_size = (wcslen(buffer) + 1) * sizeof(WCHAR); ok_(__FILE__, line)(value_size == str_size, "Got unexpected value size %u, expected %u.\n", value_size, str_size); }

1 0

Nikolay Sivov : d2d1/effect: Implement border transform object.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 70799e1c79c650a33c4acb88ccbe32b5fb881185 URL: https://gitlab.winehq.org/wine/wine/-/commit/70799e1c79c650a33c4acb88ccbe32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 10:48:19 2024 +0200 d2d1/effect: Implement border transform object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 5 ++ dlls/d2d1/effect.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 11 ++-- 3 files changed, 173 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3589b508704..46c486ab58a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -717,6 +717,11 @@ struct d2d_transform { D2D1_POINT_2L offset; D2D1_BLEND_DESCRIPTION blend_desc; + struct + { + D2D1_EXTEND_MODE mode_x; + D2D1_EXTEND_MODE mode_y; + } border; }; UINT32 input_count; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 00b36339681..364539f87bf 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -30,6 +30,11 @@ static inline struct d2d_transform *impl_from_ID2D1BlendTransform(ID2D1BlendTran return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface); } +static inline struct d2d_transform *impl_from_ID2D1BorderTransform(ID2D1BorderTransform *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface); +} + static HRESULT STDMETHODCALLTYPE d2d_offset_transform_QueryInterface(ID2D1OffsetTransform *iface, REFIID iid, void **out) { @@ -247,6 +252,162 @@ static HRESULT d2d_blend_transform_create(UINT32 input_count, const D2D1_BLEND_D return S_OK; } +static HRESULT STDMETHODCALLTYPE d2d_border_transform_QueryInterface(ID2D1BorderTransform *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1BorderTransform) + || IsEqualGUID(iid, &IID_ID2D1ConcreteTransform) + || IsEqualGUID(iid, &IID_ID2D1TransformNode) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + ID2D1BorderTransform_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_border_transform_AddRef(ID2D1BorderTransform *iface) +{ + struct d2d_transform *transform = impl_from_ID2D1BorderTransform(iface); + ULONG refcount = InterlockedIncrement(&transform->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_border_transform_Release(ID2D1BorderTransform *iface) +{ + struct d2d_transform *transform = impl_from_ID2D1BorderTransform(iface); + ULONG refcount = InterlockedDecrement(&transform->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + free(transform); + + return refcount; +} + +static UINT32 STDMETHODCALLTYPE d2d_border_transform_GetInputCount(ID2D1BorderTransform *iface) +{ + TRACE("iface %p.\n", iface); + + return 1; +} + +static HRESULT STDMETHODCALLTYPE d2d_border_transform_SetOutputBuffer( + ID2D1BorderTransform *iface, D2D1_BUFFER_PRECISION precision, D2D1_CHANNEL_DEPTH depth) +{ + FIXME("iface %p, precision %u, depth %u stub.\n", iface, precision, depth); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_border_transform_SetCached( + ID2D1BorderTransform *iface, BOOL is_cached) +{ + FIXME("iface %p, is_cached %d stub.\n", iface, is_cached); +} + +static void STDMETHODCALLTYPE d2d_border_transform_SetExtendModeX( + ID2D1BorderTransform *iface, D2D1_EXTEND_MODE mode) +{ + struct d2d_transform *transform = impl_from_ID2D1BorderTransform(iface); + + TRACE("iface %p.\n", iface); + + switch (mode) + { + case D2D1_EXTEND_MODE_CLAMP: + case D2D1_EXTEND_MODE_WRAP: + case D2D1_EXTEND_MODE_MIRROR: + transform->border.mode_x = mode; + break; + default: + ; + } +} + +static void STDMETHODCALLTYPE d2d_border_transform_SetExtendModeY( + ID2D1BorderTransform *iface, D2D1_EXTEND_MODE mode) +{ + struct d2d_transform *transform = impl_from_ID2D1BorderTransform(iface); + + TRACE("iface %p.\n", iface); + + switch (mode) + { + case D2D1_EXTEND_MODE_CLAMP: + case D2D1_EXTEND_MODE_WRAP: + case D2D1_EXTEND_MODE_MIRROR: + transform->border.mode_y = mode; + break; + default: + ; + } +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_border_transform_GetExtendModeX( + ID2D1BorderTransform *iface) +{ + struct d2d_transform *transform = impl_from_ID2D1BorderTransform(iface); + + TRACE("iface %p.\n", iface); + + return transform->border.mode_x; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_border_transform_GetExtendModeY( + ID2D1BorderTransform *iface) +{ + struct d2d_transform *transform = impl_from_ID2D1BorderTransform(iface); + + TRACE("iface %p.\n", iface); + + return transform->border.mode_y; +} + +static const ID2D1BorderTransformVtbl d2d_border_transform_vtbl = +{ + d2d_border_transform_QueryInterface, + d2d_border_transform_AddRef, + d2d_border_transform_Release, + d2d_border_transform_GetInputCount, + d2d_border_transform_SetOutputBuffer, + d2d_border_transform_SetCached, + d2d_border_transform_SetExtendModeX, + d2d_border_transform_SetExtendModeY, + d2d_border_transform_GetExtendModeX, + d2d_border_transform_GetExtendModeY, +}; + +static HRESULT d2d_border_transform_create(D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, + ID2D1BorderTransform **transform) +{ + struct d2d_transform *object; + + *transform = NULL; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID2D1TransformNode_iface.lpVtbl = (ID2D1TransformNodeVtbl *)&d2d_border_transform_vtbl; + object->refcount = 1; + object->border.mode_x = mode_x; + object->border.mode_y = mode_y; + + *transform = (ID2D1BorderTransform *)&object->ID2D1TransformNode_iface; + + return S_OK; +} + static struct d2d_transform_node * d2d_transform_graph_get_node(const struct d2d_transform_graph *graph, ID2D1TransformNode *object) { @@ -1157,9 +1318,9 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1Ef static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) { - FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + TRACE("iface %p, mode_x %#x, mode_y %#x, transform %p.\n", iface, mode_x, mode_y, transform); - return E_NOTIMPL; + return d2d_border_transform_create(mode_x, mode_y, transform); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e076db1738c..96bea3fa4de 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -13048,9 +13048,7 @@ static void test_border_transform(BOOL d3d11) /* Create transform with invalid extend mode */ hr = ID2D1EffectContext_CreateBorderTransform(effect_context, 0xdeadbeef, 0xdeadbeef, &transform); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (hr != S_OK) - goto done; + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); mode = ID2D1BorderTransform_GetExtendModeX(transform); ok(mode == 0xdeadbeef, "Got unexpected extend mode %u.\n", mode); mode = ID2D1BorderTransform_GetExtendModeY(transform); @@ -13073,10 +13071,13 @@ static void test_border_transform(BOOL d3d11) /* Set output buffer */ hr = ID2D1BorderTransform_SetOutputBuffer(transform, 0xdeadbeef, D2D1_CHANNEL_DEPTH_DEFAULT); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1BorderTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, 0xdeadbeef); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1BorderTransform_SetOutputBuffer(transform, D2D1_BUFFER_PRECISION_UNKNOWN, D2D1_CHANNEL_DEPTH_DEFAULT); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Set extend mode */ @@ -13095,9 +13096,7 @@ static void test_border_transform(BOOL d3d11) mode = ID2D1BorderTransform_GetExtendModeY(transform); ok(mode == D2D1_EXTEND_MODE_CLAMP, "Got unexpected extend mode %u.\n", mode); -done: - if (transform) - ID2D1BorderTransform_Release(transform); + ID2D1BorderTransform_Release(transform); ID2D1Effect_Release(effect); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d2d1/effect: Implement bounds adjustment transform.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 81d684a5083ce38f0f1fb65fcbd198a65e5907bf URL: https://gitlab.winehq.org/wine/wine/-/commit/81d684a5083ce38f0f1fb65fcbd198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 11:12:49 2024 +0200 d2d1/effect: Implement bounds adjustment transform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/effect.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 72 ++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 46c486ab58a..6b6d51d4b3c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -722,6 +722,7 @@ struct d2d_transform D2D1_EXTEND_MODE mode_x; D2D1_EXTEND_MODE mode_y; } border; + D2D1_RECT_L bounds; }; UINT32 input_count; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 364539f87bf..42d2c589edc 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -35,6 +35,12 @@ static inline struct d2d_transform *impl_from_ID2D1BorderTransform(ID2D1BorderTr return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface); } +static inline struct d2d_transform *impl_from_ID2D1BoundsAdjustmentTransform( + ID2D1BoundsAdjustmentTransform *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface); +} + static HRESULT STDMETHODCALLTYPE d2d_offset_transform_QueryInterface(ID2D1OffsetTransform *iface, REFIID iid, void **out) { @@ -408,6 +414,107 @@ static HRESULT d2d_border_transform_create(D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_ return S_OK; } +static HRESULT STDMETHODCALLTYPE d2d_bounds_adjustment_transform_QueryInterface( + ID2D1BoundsAdjustmentTransform *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1BoundsAdjustmentTransform) + || IsEqualGUID(iid, &IID_ID2D1TransformNode) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = iface; + ID2D1BoundsAdjustmentTransform_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_bounds_adjustment_transform_AddRef( + ID2D1BoundsAdjustmentTransform *iface) +{ + struct d2d_transform *transform = impl_from_ID2D1BoundsAdjustmentTransform(iface); + ULONG refcount = InterlockedIncrement(&transform->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_bounds_adjustment_transform_Release( + ID2D1BoundsAdjustmentTransform *iface) +{ + struct d2d_transform *transform = impl_from_ID2D1BoundsAdjustmentTransform(iface); + ULONG refcount = InterlockedDecrement(&transform->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + free(transform); + + return refcount; +} + +static UINT32 STDMETHODCALLTYPE d2d_bounds_adjustment_transform_GetInputCount( + ID2D1BoundsAdjustmentTransform *iface) +{ + TRACE("iface %p.\n", iface); + + return 1; +} + +static void STDMETHODCALLTYPE d2d_bounds_adjustment_transform_SetOutputBounds( + ID2D1BoundsAdjustmentTransform *iface, const D2D1_RECT_L *bounds) +{ + struct d2d_transform *transform = impl_from_ID2D1BoundsAdjustmentTransform(iface); + + TRACE("iface %p.\n", iface); + + transform->bounds = *bounds; +} + +static void STDMETHODCALLTYPE d2d_bounds_adjustment_transform_GetOutputBounds( + ID2D1BoundsAdjustmentTransform *iface, D2D1_RECT_L *bounds) +{ + struct d2d_transform *transform = impl_from_ID2D1BoundsAdjustmentTransform(iface); + + TRACE("iface %p.\n", iface); + + *bounds = transform->bounds; +} + +static const ID2D1BoundsAdjustmentTransformVtbl d2d_bounds_adjustment_transform_vtbl = +{ + d2d_bounds_adjustment_transform_QueryInterface, + d2d_bounds_adjustment_transform_AddRef, + d2d_bounds_adjustment_transform_Release, + d2d_bounds_adjustment_transform_GetInputCount, + d2d_bounds_adjustment_transform_SetOutputBounds, + d2d_bounds_adjustment_transform_GetOutputBounds, +}; + +static HRESULT d2d_bounds_adjustment_transform_create(const D2D1_RECT_L *rect, + ID2D1BoundsAdjustmentTransform **transform) +{ + struct d2d_transform *object; + + *transform = NULL; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID2D1TransformNode_iface.lpVtbl = (ID2D1TransformNodeVtbl *)&d2d_bounds_adjustment_transform_vtbl; + object->refcount = 1; + object->bounds = *rect; + + *transform = (ID2D1BoundsAdjustmentTransform *)&object->ID2D1TransformNode_iface; + + return S_OK; +} + static struct d2d_transform_node * d2d_transform_graph_get_node(const struct d2d_transform_graph *graph, ID2D1TransformNode *object) { @@ -1334,9 +1441,9 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1E static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) { - FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + TRACE("iface %p, output_rect %s, transform %p.\n", iface, debug_d2d_rect_l(output_rect), transform); - return E_NOTIMPL; + return d2d_bounds_adjustment_transform_create(output_rect, transform); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 96bea3fa4de..a26b6ca9a93 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -497,6 +497,14 @@ static void set_rect_u(D2D1_RECT_U *rect, UINT32 left, UINT32 top, UINT32 right, rect->bottom = bottom; } +static void set_rect_l(D2D1_RECT_L *rect, LONG left, LONG top, LONG right, LONG bottom) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static void set_ellipse(D2D1_ELLIPSE *ellipse, float x, float y, float rx, float ry) { set_point(&ellipse->point, x, y); @@ -13103,6 +13111,69 @@ static void test_border_transform(BOOL d3d11) release_test_context(&ctx); } +static void test_bounds_adjustment_transform(BOOL d3d11) +{ + ID2D1BoundsAdjustmentTransform *transform = NULL; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + UINT input_count; + D2D1_RECT_L rect; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + 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(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + 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); + + set_rect_l(&rect, -1, 0, 25, -50); + hr = ID2D1EffectContext_CreateBoundsAdjustmentTransform(effect_context, &rect, &transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + memset(&rect, 0, sizeof(rect)); + ID2D1BoundsAdjustmentTransform_GetOutputBounds(transform, &rect); + ok(rect.left == -1 && rect.top == 0 && rect.right == 25 && rect.bottom == -50, + "Unexpected rectangle.\n"); + + set_rect_l(&rect, -50, 25, 0, -1); + ID2D1BoundsAdjustmentTransform_SetOutputBounds(transform, &rect); + memset(&rect, 0, sizeof(rect)); + ID2D1BoundsAdjustmentTransform_GetOutputBounds(transform, &rect); + ok(rect.left == -50 && rect.top == 25 && rect.right == 0 && rect.bottom == -1, + "Unexpected rectangle.\n"); + + /* Input count */ + input_count = ID2D1BoundsAdjustmentTransform_GetInputCount(transform); + ok(input_count == 1, "Got unexpected input count %u.\n", input_count); + + ID2D1BoundsAdjustmentTransform_Release(transform); + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -14640,6 +14711,7 @@ START_TEST(d2d1) queue_test(test_offset_transform); queue_test(test_blend_transform); queue_test(test_border_transform); + queue_test(test_bounds_adjustment_transform); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);

1 0

Nikolay Sivov : d2d1/tests: Add supported interface checks for transform objects.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 3d38ac44e7ff21c968dcebfcb0ede2b9f02dc7d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d38ac44e7ff21c968dcebfcb0ede2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 11:31:05 2024 +0200 d2d1/tests: Add supported interface checks for transform objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a26b6ca9a93..ad7d5163f1f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12874,6 +12874,9 @@ static void test_offset_transform(BOOL d3d11) offset = ID2D1OffsetTransform_GetOffset(transform); ok(offset.x == 1 && offset.y == 2, "Got unexpected offset {%ld, %ld}.\n", offset.x, offset.y); + check_interface(transform, &IID_ID2D1OffsetTransform, TRUE); + check_interface(transform, &IID_ID2D1TransformNode, TRUE); + /* Input count */ input_count = ID2D1OffsetTransform_GetInputCount(transform); ok(input_count == 1, "Got unexpected input count %u.\n", input_count); @@ -12973,9 +12976,14 @@ static void test_blend_transform(BOOL d3d11) hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 1, &expected, &transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1BlendTransform_Release(transform); + hr = ID2D1EffectContext_CreateBlendTransform(effect_context, 4, &expected, &transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_interface(transform, &IID_ID2D1BlendTransform, TRUE); + check_interface(transform, &IID_ID2D1ConcreteTransform, TRUE); + check_interface(transform, &IID_ID2D1TransformNode, TRUE); + /* Get description */ ID2D1BlendTransform_GetDescription(transform, &blend_desc); check_blend_desc(&blend_desc, &expected); @@ -13057,6 +13065,11 @@ static void test_border_transform(BOOL d3d11) /* Create transform with invalid extend mode */ hr = ID2D1EffectContext_CreateBorderTransform(effect_context, 0xdeadbeef, 0xdeadbeef, &transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + check_interface(transform, &IID_ID2D1BorderTransform, TRUE); + check_interface(transform, &IID_ID2D1ConcreteTransform, TRUE); + check_interface(transform, &IID_ID2D1TransformNode, TRUE); + mode = ID2D1BorderTransform_GetExtendModeX(transform); ok(mode == 0xdeadbeef, "Got unexpected extend mode %u.\n", mode); mode = ID2D1BorderTransform_GetExtendModeY(transform); @@ -13151,6 +13164,10 @@ static void test_bounds_adjustment_transform(BOOL d3d11) set_rect_l(&rect, -1, 0, 25, -50); hr = ID2D1EffectContext_CreateBoundsAdjustmentTransform(effect_context, &rect, &transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + check_interface(transform, &IID_ID2D1BoundsAdjustmentTransform, TRUE); + check_interface(transform, &IID_ID2D1TransformNode, TRUE); + memset(&rect, 0, sizeof(rect)); ID2D1BoundsAdjustmentTransform_GetOutputBounds(transform, &rect); ok(rect.left == -1 && rect.top == 0 && rect.right == 25 && rect.bottom == -50,

1 0

Rémi Bernon : mfreadwrite/reader: Keep the output subtypes when propagating media types.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: a7564b0f8b8d9068b3efed5e7c53486fa3ffc327 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7564b0f8b8d9068b3efed5e7c5348… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 12:13:22 2024 +0100 mfreadwrite/reader: Keep the output subtypes when propagating media types. --- dlls/mfreadwrite/reader.c | 76 ++++++++++++++++++++++++++++++----------- dlls/mfreadwrite/tests/mfplat.c | 6 ++-- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 873eac959f1..11eac81d2ca 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -767,6 +767,53 @@ static HRESULT source_reader_push_transform_samples(struct source_reader *reader return hr; } +/* update the transform output type while keeping subtype which matches the old output type */ +static HRESULT transform_entry_update_output_type(struct transform_entry *entry, IMFMediaType *old_output_type) +{ + IMFMediaType *new_output_type; + GUID subtype, desired; + UINT i = 0; + HRESULT hr; + + IMFMediaType_GetGUID(old_output_type, &MF_MT_SUBTYPE, &desired); + + /* find an available output type matching the desired subtype */ + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(entry->transform, 0, i++, &new_output_type))) + { + IMFMediaType_GetGUID(new_output_type, &MF_MT_SUBTYPE, &subtype); + if (IsEqualGUID(&subtype, &desired) && SUCCEEDED(hr = IMFTransform_SetOutputType(entry->transform, 0, new_output_type, 0))) + { + entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; + IMFMediaType_Release(new_output_type); + return S_OK; + } + IMFMediaType_Release(new_output_type); + } + + return hr; +} + +/* update the transform input type while keeping an output type which matches the current output subtype */ +static HRESULT transform_entry_update_input_type(struct transform_entry *entry, IMFMediaType *input_type) +{ + IMFMediaType *old_output_type, *new_output_type; + HRESULT hr; + + if (FAILED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &old_output_type))) + return hr; + if (FAILED(hr = IMFTransform_SetInputType(entry->transform, 0, input_type, 0))) + return hr; + + /* check if transform output type is still valid or if we need to update it as well */ + if (FAILED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &new_output_type))) + hr = transform_entry_update_output_type(entry, old_output_type); + else + IMFMediaType_Release(new_output_type); + + IMFMediaType_Release(old_output_type); + return hr; +} + static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, struct transform_entry *entry) { @@ -786,7 +833,7 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader while (SUCCEEDED(hr)) { MFT_OUTPUT_DATA_BUFFER out_buffer = {0}; - IMFMediaType *output_type, *media_type; + IMFMediaType *media_type; if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)) && FAILED(hr = source_reader_allocate_stream_sample(&stream_info, &out_buffer.pSample))) @@ -794,23 +841,15 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader if (SUCCEEDED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) { + /* propagate upstream type to the transform input type */ if ((entry->pending_flags & MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED) - && SUCCEEDED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &output_type))) + && SUCCEEDED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &media_type))) { if (!next) - hr = IMFMediaType_CopyAllItems(output_type, (IMFAttributes *)stream->current); - else if (SUCCEEDED(hr = IMFTransform_SetInputType(next->transform, 0, output_type, 0))) - { - /* check if transform output type is still valid or if we need to reset it as well */ - if (FAILED(hr = IMFTransform_GetOutputCurrentType(next->transform, 0, &media_type)) - && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(next->transform, 0, 0, &output_type))) - { - next->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; - hr = IMFTransform_SetOutputType(entry->transform, 0, media_type, 0); - IMFMediaType_Release(media_type); - } - } - IMFMediaType_Release(output_type); + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)stream->current); + else + hr = transform_entry_update_input_type(next, media_type); + IMFMediaType_Release(media_type); } if (FAILED(hr)) @@ -823,16 +862,15 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader entry->pending_flags = 0; } - if (hr == MF_E_TRANSFORM_STREAM_CHANGE && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(entry->transform, 0, 0, &output_type))) + if (hr == MF_E_TRANSFORM_STREAM_CHANGE && SUCCEEDED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &media_type))) { - hr = IMFTransform_SetOutputType(entry->transform, 0, output_type, 0); - IMFMediaType_Release(output_type); + hr = transform_entry_update_output_type(entry, media_type); + IMFMediaType_Release(media_type); if (SUCCEEDED(hr)) { hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info); stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); - entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; } } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index ef0e622dab2..a2c46869250 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -2757,12 +2757,12 @@ static void test_source_reader_transform_stream_change(void) static const struct attribute_desc yuy2_expect_new_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2, .todo_value = TRUE), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), ATTR_RATIO(MF_MT_FRAME_SIZE, 128, 128), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 128 * 2, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 128 * 128 * 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 128 * 2), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 128 * 128 * 2), {0}, }; const MFT_REGISTER_TYPE_INFO output_info[] =

1 0

Brendan Shanks : win32u: Enlarge buffer size in _CDS_flags.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 609b42c169547a5b530be4b39c14aff848165464 URL: https://gitlab.winehq.org/wine/wine/-/commit/609b42c169547a5b530be4b39c14af… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 2 15:24:40 2024 -0700 win32u: Enlarge buffer size in _CDS_flags. --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 988da5a7641..5a8fafaae6c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2798,7 +2798,7 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, static const char *_CDS_flags( DWORD fields ) { BOOL first = TRUE; - CHAR buf[128]; + CHAR buf[130]; CHAR *p = buf; _X_FIELD(CDS, UPDATEREGISTRY)

1 0

Brendan Shanks : win32u: Enlarge buffer size in format_date.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 0feed009b493e78cef9e37b4c0044ab89123ffb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0feed009b493e78cef9e37b4c0044a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 2 12:40:20 2024 -0700 win32u: Enlarge buffer size in format_date. --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5a8fafaae6c..82182eaf078 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -885,7 +885,7 @@ static unsigned int format_date( WCHAR *bufferW, LONGLONG time ) { int cleaps, years, yearday, months, days; unsigned int day, month, year; - char buffer[32]; + char buffer[33]; days = time / TICKSPERSEC / SECSPERDAY;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Open a loop when visiting the loop header.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: vkd3d Branch: master Commit: 9aff65c6d2df86e7f8eb5986421095c70b36102b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9aff65c6d2df86e7f8eb598642109… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 20 16:58:25 2024 +0100 vkd3d-shader/ir: Open a loop when visiting the loop header. Not when making the loop header available, which is too early and might lead to open too many loops at once. --- libs/vkd3d-shader/ir.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 15fe6ca9..b04e85df 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3629,27 +3629,11 @@ struct vsir_cfg_node_sorter static enum vkd3d_result vsir_cfg_node_sorter_make_node_available(struct vsir_cfg_node_sorter *sorter, struct vsir_block *block) { - struct vsir_block_list *loop = NULL; - struct vsir_cfg_node_sorter_stack_item *item; enum vkd3d_result ret; - if (sorter->cfg->loops_by_header[block->label - 1] != SIZE_MAX) - loop = &sorter->cfg->loops[sorter->cfg->loops_by_header[block->label - 1]]; - if ((ret = vsir_block_list_add_checked(&sorter->available_blocks, block)) < 0) return ret; - if (!loop) - return VKD3D_OK; - - if (!vkd3d_array_reserve((void **)&sorter->stack, &sorter->stack_capacity, sorter->stack_count + 1, sizeof(*sorter->stack))) - return VKD3D_ERROR_OUT_OF_MEMORY; - - item = &sorter->stack[sorter->stack_count++]; - item->loop = loop; - item->seen_count = 0; - item->begin = sorter->cfg->order.count; - return VKD3D_OK; } @@ -3754,6 +3738,24 @@ static enum vkd3d_result vsir_cfg_sort_nodes(struct vsir_cfg *cfg) break; } + /* If the node is a loop header, open the loop. */ + if (sorter.cfg->loops_by_header[block->label - 1] != SIZE_MAX) + { + struct vsir_block_list *loop = &sorter.cfg->loops[sorter.cfg->loops_by_header[block->label - 1]]; + + if (loop) + { + if (!vkd3d_array_reserve((void **)&sorter.stack, &sorter.stack_capacity, + sorter.stack_count + 1, sizeof(*sorter.stack))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + inner_stack_item = &sorter.stack[sorter.stack_count++]; + inner_stack_item->loop = loop; + inner_stack_item->seen_count = 0; + inner_stack_item->begin = sorter.cfg->order.count; + } + } + vsir_block_list_remove_index(&sorter.available_blocks, i); block->order_pos = cfg->order.count; if ((ret = vsir_block_list_add_checked(&cfg->order, block)) < 0)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Drop a useless helper.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: vkd3d Branch: master Commit: e6c20361ea90b2fbae56055618561ec1dfeb35d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e6c20361ea90b2fbae56055618561… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 20 17:13:45 2024 +0100 vkd3d-shader/ir: Drop a useless helper. --- libs/vkd3d-shader/ir.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index b04e85df..7230d0e8 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3627,16 +3627,6 @@ struct vsir_cfg_node_sorter struct vsir_block_list available_blocks; }; -static enum vkd3d_result vsir_cfg_node_sorter_make_node_available(struct vsir_cfg_node_sorter *sorter, struct vsir_block *block) -{ - enum vkd3d_result ret; - - if ((ret = vsir_block_list_add_checked(&sorter->available_blocks, block)) < 0) - return ret; - - return VKD3D_OK; -} - /* Topologically sort the blocks according to the forward edges. By * definition if the input CFG is reducible then its forward edges * form a DAG, so a topological sorting exists. In order to compute it @@ -3711,7 +3701,7 @@ static enum vkd3d_result vsir_cfg_sort_nodes(struct vsir_cfg *cfg) vsir_block_list_init(&sorter.available_blocks); - if ((ret = vsir_cfg_node_sorter_make_node_available(&sorter, cfg->entry)) < 0) + if ((ret = vsir_block_list_add_checked(&sorter.available_blocks, cfg->entry)) < 0) goto fail; while (sorter.available_blocks.count != 0) @@ -3797,7 +3787,7 @@ static enum vkd3d_result vsir_cfg_sort_nodes(struct vsir_cfg *cfg) if (in_degrees[successor->label - 1] == 0) { - if ((ret = vsir_cfg_node_sorter_make_node_available(&sorter, successor)) < 0) + if ((ret = vsir_block_list_add_checked(&sorter.available_blocks, successor)) < 0) goto fail; } }

1 0

Alexandre Julliard : widl: Always pass the top-level attributes to detect interface pointers.
by Alexandre Julliard 03 Apr '24

03 Apr '24

Module: wine Branch: master Commit: 855eb3afcd1226342718164572afee94b2363a59 URL: https://gitlab.winehq.org/wine/wine/-/commit/855eb3afcd1226342718164572afee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 11:40:33 2024 +0200 widl: Always pass the top-level attributes to detect interface pointers. --- tools/widl/typegen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a714ff8df71..f67c0182e4f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1103,7 +1103,7 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned if (!is_string_type( var->attrs, ref )) buffer_size = get_required_buffer_size_type( ref, NULL, NULL, TRUE, &alignment ); - switch (typegen_detect_type( ref, NULL, TDT_ALL_TYPES )) + switch (typegen_detect_type( ref, var->attrs, TDT_ALL_TYPES )) { case TGT_BASIC: *flags |= IsSimpleRef | IsBasetype; @@ -2186,7 +2186,7 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs { if (context == TYPE_CONTEXT_TOPLEVELPARAM && is_ptr(type) && pointer_type == FC_RP) { - switch (typegen_detect_type(type_pointer_get_ref_type(type), NULL, TDT_ALL_TYPES)) + switch (typegen_detect_type(type_pointer_get_ref_type(type), attrs, TDT_ALL_TYPES)) { case TGT_STRING: case TGT_POINTER:

1 0