gdi32: In update_system_links if the font we are trying to link has already been…

gdi32: In update_system_links if the font we are trying to link has already been substituted or localized we need to check against that name also.

gdi32: In update_system_links if the font we are trying to link has already been…
a8a2f871 · Aric Stewart · Alexandre Julliard · 3ae30a67 · a8a2f871
Commit a8a2f871 authored Jan 31, 2012 by Aric Stewart Committed by Alexandre Julliard Feb 01, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

freetype.c dlls/gdi32/freetype.c +4 -1

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2903,7 +2903,10 @@ static void update_system_links(void)

        for (i = 0; i < sizeof(font_links_defaults_list)/sizeof(font_links_defaults_list[0]); i++)
        {
-            if (!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name))
+            const FontSubst *psub2;
+            psub2 = get_font_subst(&font_subst_list, font_links_defaults_list[i].shelldlg, -1);
+
+            if ((!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name) || (psub2 && !strcmpiW(psub2->to.name,psub->to.name))))
            {
                for (j = 0; j < sizeof(font_links_list)/sizeof(font_links_list[0]); j++)
                    populate_system_links(hkey, font_links_list[j], font_links_defaults_list[i].substitutes);