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.

This commit is contained in:
Aric Stewart 2012-01-31 13:24:58 -06:00 committed by Alexandre Julliard
parent 3ae30a676a
commit a8a2f87135
1 changed files with 4 additions and 1 deletions

View File

@ -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);