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

dwrite: Release system collection pointer after using it, not before.

This commit is contained in:
Nikolay Sivov 2014-12-16 17:59:44 +03:00 committed by Alexandre Julliard
parent f4e3005645
commit 8dfe0ff251
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dwrite/main.c
View File

@ -921,18 +921,22 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory2 *iface, WCH
DWRITE_FONT_STRETCH stretch, FLOAT size, WCHAR const *locale, IDWriteTextFormat **format)
{
struct dwritefactory *This = impl_from_IDWriteFactory2(iface);
IDWriteFontCollection *syscollection = NULL;
HRESULT hr;
TRACE("(%p)->(%s %p %d %d %d %f %s %p)\n", This, debugstr_w(family_name), collection, weight, style, stretch,
size, debugstr_w(locale), format);
if (!collection)
{
HRESULT hr = IDWriteFactory2_GetSystemFontCollection(iface, &collection, FALSE);
if (hr != S_OK)
if (!collection) {
hr = IDWriteFactory2_GetSystemFontCollection(iface, &syscollection, FALSE);
if (FAILED(hr))
return hr;
/* Our ref count is 1 too many, since we will add ref in create_textformat */
IDWriteFontCollection_Release(This->system_collection);
}
return create_textformat(family_name, collection, weight, style, stretch, size, locale, format);
hr = create_textformat(family_name, collection ? collection : syscollection, weight, style, stretch, size, locale, format);
if (syscollection)
IDWriteFontCollection_Release(syscollection);
return hr;
}
static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory2 *iface, IDWriteTypography **typography)