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

dwrite: Fix error code returned by GetFontFromFontFace().

This commit is contained in:
Nikolay Sivov 2015-02-18 22:46:10 +03:00 committed by Alexandre Julliard
parent 0135a59658
commit 5196be7706
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dwrite/font.c
View File

@ -1514,7 +1514,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec
} }
if (!found_font) if (!found_font)
return E_INVALIDARG; return DWRITE_E_NOFONT;
hr = create_fontfamily(found_family, iface, &family); hr = create_fontfamily(found_family, iface, &family);
if (FAILED(hr)) if (FAILED(hr))

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

@ -2028,6 +2028,7 @@ static void test_GetFontFromFontFace(void)
IDWriteFont *font, *font2, *font3; IDWriteFont *font, *font2, *font3;
IDWriteFontFamily *family; IDWriteFontFamily *family;
IDWriteFactory *factory; IDWriteFactory *factory;
IDWriteFontFile *file;
HRESULT hr; HRESULT hr;
factory = create_factory(); factory = create_factory();
@ -2064,14 +2065,32 @@ static void test_GetFontFromFontFace(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface);
IDWriteFontFace_Release(fontface2); IDWriteFontFace_Release(fontface2);
IDWriteFontFace_Release(fontface);
IDWriteFont_Release(font3);
IDWriteFactory_Release(factory);
/* fontface that wasn't created from this collection */
factory = create_factory();
create_testfontfile(test_fontfile);
hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file);
ok(hr == S_OK, "got 0x%08x\n",hr);
hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface);
ok(hr == S_OK, "got 0x%08x\n", hr);
IDWriteFontFile_Release(file);
hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3);
ok(hr == DWRITE_E_NOFONT, "got 0x%08x\n", hr);
ok(font3 == NULL, "got %p\n", font3);
IDWriteFontFace_Release(fontface);
IDWriteFont_Release(font); IDWriteFont_Release(font);
IDWriteFont_Release(font2); IDWriteFont_Release(font2);
IDWriteFont_Release(font3);
IDWriteFontFace_Release(fontface);
IDWriteFontFamily_Release(family); IDWriteFontFamily_Release(family);
IDWriteFontCollection_Release(collection); IDWriteFontCollection_Release(collection);
IDWriteFactory_Release(factory); IDWriteFactory_Release(factory);
DeleteFileW(test_fontfile);
} }
static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style) static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style)