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

dwrite: Correct reference count behavior for font face interface.

This commit is contained in:
Nikolay Sivov 2012-10-13 01:22:05 -04:00 committed by Alexandre Julliard
parent c503af8516
commit 438d115ec6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/dwrite/font.c
View File

@ -352,6 +352,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface)
if (!ref)
{
if (This->face) IDWriteFontFace_Release(This->face);
IDWriteFontFamily_Release(This->family);
heap_free(This);
}
@ -442,8 +443,6 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont *iface, IDWriteFontF
{
HRESULT hr = create_fontface(&This->face);
if (FAILED(hr)) return hr;
*face = This->face;
return hr;
}
*face = This->face;

6
dlls/dwrite/tests/font.c
View File

@ -433,17 +433,17 @@ if (0) /* crashes on native */
hr = IDWriteFont_CreateFontFace(font, &fontface);
ok(hr == S_OK, "got 0x%08x\n", hr);
EXPECT_REF(font, 1);
EXPECT_REF(fontface, 1);
EXPECT_REF(fontface, 2);
hr = IDWriteFont_CreateFontFace(font, &fontface2);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface);
EXPECT_REF(fontface, 2);
EXPECT_REF(fontface, 3);
EXPECT_REF(font, 1);
IDWriteFontFace_AddRef(fontface);
EXPECT_REF(font, 1);
EXPECT_REF(fontface, 3);
EXPECT_REF(fontface, 4);
IDWriteFontFace_Release(fontface);
IDWriteFontFace_Release(fontface);