Module: wine Branch: master Commit: cfe289e69d2a189315ad0e77ecb347fc8c5752a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe289e69d2a189315ad0e77ec...
Author: Dmitry Timoshkov dmitry@codeweavers.com Date: Wed Jul 11 15:07:30 2007 +0900
gdi32: Do not report an error if a requested to add font is already loaded.
---
dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a18a37..cdd23ef 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -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"); HeapFree(GetProcessHeap(), 0, StyleW); pFT_Done_Face(ft_face); - return 0; + return 1; } if(!pHeader || pHeader->Font_Revision <= face->font_version) { TRACE("Original font is newer so skipping this one\n"); HeapFree(GetProcessHeap(), 0, StyleW); pFT_Done_Face(ft_face); - return 0; + return 1; } else { TRACE("Replacing original with this one\n"); list_remove(&face->entry);