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

dwrite: Respond to IDWriteFontFace5 queries.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-12-05 11:55:58 +03:00 committed by Alexandre Julliard
parent 393d50f981
commit 0f22205768
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/dwrite/font.c
View file

@ -474,7 +474,8 @@ static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace5 *iface, REF
TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
if (IsEqualIID(riid, &IID_IDWriteFontFace4) ||
if (IsEqualIID(riid, &IID_IDWriteFontFace5) ||
IsEqualIID(riid, &IID_IDWriteFontFace4) ||
IsEqualIID(riid, &IID_IDWriteFontFace3) ||
IsEqualIID(riid, &IID_IDWriteFontFace2) ||
IsEqualIID(riid, &IID_IDWriteFontFace1) ||
@ -1425,7 +1426,7 @@ static HRESULT WINAPI dwritefontface5_GetFontAxisValues(IDWriteFontFace5 *iface,
return E_NOTIMPL;
}
static BOOL WINAPI dwritefontface5_HasVariantions(IDWriteFontFace5 *iface)
static BOOL WINAPI dwritefontface5_HasVariations(IDWriteFontFace5 *iface)
{
FIXME("%p: stub\n", iface);
@ -1496,7 +1497,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl =
dwritefontface4_ReleaseGlyphImageData,
dwritefontface5_GetFontAxisValueCount,
dwritefontface5_GetFontAxisValues,
dwritefontface5_HasVariantions,
dwritefontface5_HasVariations,
dwritefontface5_GetFontResource,
};

17
dlls/dwrite/tests/font.c
View file

@ -9291,25 +9291,28 @@ if (SUCCEEDED(hr))
IDWriteFontFaceReference1_Release(reference);
}
hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5);
todo_wine
ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);
if (FAILED(hr))
return;
hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2);
todo_wine
ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr);
if (SUCCEEDED(hr))
{
ok(resource != resource2, "Unexpected resource instance.\n");
IDWriteFontResource_Release(resource);
}
hr = IDWriteFontFace5_GetFontResource(fontface5, &resource);
todo_wine
ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr);
if (SUCCEEDED(hr))
{
ok(resource != resource2, "Unexpected resource instance.\n");
EXPECT_REF(resource, 1);
IDWriteFontResource_Release(resource);
IDWriteFontResource_Release(resource2);
}
IDWriteFontFace5_Release(fontface5);
IDWriteFontResource_Release(resource);