system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

d2d1: Fix GetPropertyNameLength() return value.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-04-11 00:13:04 +02:00 committed by Alexandre Julliard
parent d05cfdd777
commit 89111704a5
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/d2d1/effect.c
View file

@ -2130,7 +2130,7 @@ static UINT32 STDMETHODCALLTYPE d2d_effect_properties_GetPropertyNameLength(ID2D
if (!(prop = d2d_effect_properties_get_property_by_index(properties, index)))
return D2DERR_INVALID_PROPERTY;
return wcslen(prop->name) + 1;
return wcslen(prop->name);
}
static D2D1_PROPERTY_TYPE STDMETHODCALLTYPE d2d_effect_properties_GetType(ID2D1Properties *iface,

14
dlls/d2d1/tests/d2d1.c
View file

@ -10862,6 +10862,7 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect)
UINT i, value_size, str_size;
WCHAR name[32], buffer[256];
D2D1_PROPERTY_TYPE type;
UINT32 count;
HRESULT hr;
static const struct system_property_test
@ -10898,7 +10899,7 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect)
winetest_push_context("Property %u", i);
name[0] = 0;
hr = ID2D1Effect_GetPropertyName(effect, test->index, name, sizeof(name));
hr = ID2D1Effect_GetPropertyName(effect, test->index, name, ARRAY_SIZE(name));
ok_(__FILE__, line)(hr == S_OK, "Failed to get property name, hr %#lx\n", hr);
if (hr == D2DERR_INVALID_PROPERTY)
{
@ -10907,6 +10908,16 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect)
}
ok_(__FILE__, line)(!wcscmp(name, test->name), "Got unexpected property name %s, expected %s.\n",
debugstr_w(name), debugstr_w(test->name));
count = ID2D1Effect_GetPropertyNameLength(effect, test->index);
ok_(__FILE__, line)(wcslen(name) == count, "Got unexpected property name length %u.\n", count);
name[0] = 0;
hr = ID2D1Effect_GetPropertyName(effect, test->index, name, count);
ok_(__FILE__, line)(hr == D2DERR_INSUFFICIENT_BUFFER, "Failed to get property name, hr %#lx\n", hr);
name[0] = 0;
hr = ID2D1Effect_GetPropertyName(effect, test->index, name, count + 1);
ok_(__FILE__, line)(hr == S_OK, "Failed to get property name, hr %#lx\n", hr);
type = ID2D1Effect_GetType(effect, test->index);
ok_(__FILE__, line)(type == test->type, "Got unexpected property type %#x, expected %#x.\n",
@ -14750,7 +14761,6 @@ static void test_get_effect_properties(BOOL d3d11)
ok(!wcscmp(buffW, L"Rect"), "Unexpected name %s.\n", debugstr_w(buffW));
count = ID2D1Properties_GetPropertyNameLength(properties, 0);
todo_wine
ok(count == 4, "Unexpected name length %u.\n", count);
type = ID2D1Properties_GetType(properties, 0);