gdiplus: Create the FontFamily before checking for duplicates.

Sometimes GdipCreateFontFamilyFromName stores a different name in the GpFontFamily object, which breaks the duplicate check. Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Create the FontFamily before checking for duplicates.
50185949 · Vincent Povirk · Alexandre Julliard · 0d6a4b06 · 50185949
Commit 50185949 authored Dec 01, 2016 by Vincent Povirk Committed by Alexandre Julliard Dec 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 7 deletions

font.c dlls/gdiplus/font.c +16 -7

No files found.
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -1599,6 +1599,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
        DWORD type, LPARAM lParam)
 {
    GpFontCollection* fonts = (GpFontCollection*)lParam;
+    GpFontFamily* family;
    int i;
    if (type == RASTER_FONTTYPE)
@@ -1608,10 +1609,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
    if (lfw->lfFaceName[0] == '@')
        return 1;
-    /* skip duplicates */
+    if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0)
-    for (i=0; i<fonts->count; i++)
+        return 1;
-        if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0)
-            return 1;
    if (fonts->allocated == fonts->count)
    {
@@ -1627,11 +1626,21 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
        fonts->allocated = new_alloc_count;
    }
-    if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok)
+    if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok)
-        fonts->count++;
-    else
        return 0;
+    /* skip duplicates */
+    for (i=0; i<fonts->count; i++)
+    {
+        if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0)
+        {
+            GdipDeleteFontFamily(family);
+            return 1;
+        }
+    }
+    fonts->FontFamilies[fonts->count++] = family;
    return 1;
 }