Aric Stewart : 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 .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a8a2f87135183a12c531f847efd1ab595ed89f9a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a8a2f87135183a12c531f847ef...

Author: Aric Stewart 
Date:   Tue Jan 31 13:24:58 2012 -0600

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.

---

dlls/gdi32/freetype.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 37725a1..afbc971 100644
--- 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);