gdi32: Don't add system_links entries for substituted fonts.

When a Font is looked up in the FontLinks table, they have already been normalised by FontSubstitutes. So no need to store system_links entries for fonts that appear as keys in the FontSubstitutes list.

gdi32: Don't add system_links entries for substituted fonts.
ce426d6a · Paul TBBle Hampson · Alexandre Julliard · 8a4b7788 · ce426d6a
Commit ce426d6a authored May 04, 2009 by Paul TBBle Hampson Committed by Alexandre Julliard May 05, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

freetype.c dlls/gdi32/freetype.c +8 -2

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1652,9 +1652,15 @@ static BOOL init_system_links(void)
        while(RegEnumValueW(hkey, index++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len) == ERROR_SUCCESS)
        {
            memset(&fs, 0, sizeof(fs));
-            font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link));
            psub = get_font_subst(&font_subst_list, value, -1);
-            font_link->font_name = (psub)? strdupW(psub->to.name) : strdupW(value);
+            /* Don't store fonts that are only substitutes for other fonts */
+            if(psub)
+            {
+                TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value));
+                continue;
+            }
+            font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link));
+            font_link->font_name = strdupW(value);
            list_init(&font_link->links);
            for(entry = data; (char*)entry < (char*)data + data_len && *entry != 0; entry = next)
            {