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

gdi32: Do not report an error if a requested to add font is already loaded.

This commit is contained in:
Dmitry Timoshkov 2007-07-11 15:07:30 +09:00 committed by Alexandre Julliard
parent 82e068046b
commit cfe289e69d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/gdi32/freetype.c
View File

@ -1135,13 +1135,13 @@ static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *t
TRACE("This font is a replacement but the original really exists, so we'll skip the replacement\n"); TRACE("This font is a replacement but the original really exists, so we'll skip the replacement\n");
HeapFree(GetProcessHeap(), 0, StyleW); HeapFree(GetProcessHeap(), 0, StyleW);
pFT_Done_Face(ft_face); pFT_Done_Face(ft_face);
return 0; return 1;
} }
if(!pHeader || pHeader->Font_Revision <= face->font_version) { if(!pHeader || pHeader->Font_Revision <= face->font_version) {
TRACE("Original font is newer so skipping this one\n"); TRACE("Original font is newer so skipping this one\n");
HeapFree(GetProcessHeap(), 0, StyleW); HeapFree(GetProcessHeap(), 0, StyleW);
pFT_Done_Face(ft_face); pFT_Done_Face(ft_face);
return 0; return 1;
} else { } else {
TRACE("Replacing original with this one\n"); TRACE("Replacing original with this one\n");
list_remove(&face->entry); list_remove(&face->entry);