ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Add a helper to return font list item. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-03-12 15:07:01 +03:00 committed by Alexandre Julliard
parent 8010ede257
commit 2bc442aa1b
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/dwrite/font.c
View File

@ -2336,12 +2336,9 @@ static DWRITE_LOCALITY WINAPI dwritefontlist1_GetFontLocality(IDWriteFontList2 *
return DWRITE_LOCALITY_LOCAL; return DWRITE_LOCALITY_LOCAL;
} }
static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font) static HRESULT fontlist_get_font(const struct dwrite_fontlist *fontlist, unsigned int index,
IDWriteFont3 **font)
{ {
struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface);
TRACE("%p, %u, %p.\n", iface, index, font);
*font = NULL; *font = NULL;
if (fontlist->font_count == 0) if (fontlist->font_count == 0)
@ -2353,9 +2350,19 @@ static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 in
return create_font(fontlist->family, index, font); return create_font(fontlist->family, index, font);
} }
static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font)
{
struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface);
TRACE("%p, %u, %p.\n", iface, index, font);
return fontlist_get_font(fontlist, index, font);
}
static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *iface, UINT32 index, static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *iface, UINT32 index,
IDWriteFontFaceReference **reference) IDWriteFontFaceReference **reference)
{ {
struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface);
IDWriteFont3 *font; IDWriteFont3 *font;
HRESULT hr; HRESULT hr;
@ -2363,12 +2370,11 @@ static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *ifa
*reference = NULL; *reference = NULL;
hr = IDWriteFontList2_GetFont(iface, index, &font); if (SUCCEEDED(hr = fontlist_get_font(fontlist, index, &font)))
if (FAILED(hr)) {
return hr; hr = IDWriteFont3_GetFontFaceReference(font, reference);
IDWriteFont3_Release(font);
hr = IDWriteFont3_GetFontFaceReference(font, reference); }
IDWriteFont3_Release(font);
return hr; return hr;
} }