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

gdiplus: Don't create a font if there is no facename.

This commit is contained in:
Adam Petaccia 2008-08-27 17:22:12 -04:00 committed by Alexandre Julliard
parent 5361f074a3
commit 74c8117a4b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdiplus/font.c
View File

@ -169,6 +169,9 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
if(!logfont || !font) if(!logfont || !font)
return InvalidParameter; return InvalidParameter;
if (logfont->lfFaceName[0] == 0)
return NotTrueTypeFont;
*font = GdipAlloc(sizeof(GpFont)); *font = GdipAlloc(sizeof(GpFont));
if(!*font) return OutOfMemory; if(!*font) return OutOfMemory;

2
dlls/gdiplus/tests/font.c
View File

@ -112,9 +112,7 @@ static void test_logfont(void)
lfw.lfFaceName[0] = 0; lfw.lfFaceName[0] = 0;
stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font);
todo_wine {
expect(NotTrueTypeFont, stat); expect(NotTrueTypeFont, stat);
}
memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR));