system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 01:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdi32: Fetch child fonts by real parent font name.

Browse source 
Entries in the list of linked fonts are keyed by the substituted font
name, so need to be looked up by the substituted font name.
This commit is contained in:
Paul TBBle Hampson 2009-04-14 22:20:55 +10:00 committed by Alexandre Julliard
parent 19c2b7cbcb
commit 8a4b77883e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/gdi32/freetype.c
View file

@ -3194,10 +3194,14 @@ static BOOL create_child_font_list(GdiFont *font)
BOOL ret = FALSE;
SYSTEM_LINKS *font_link;
CHILD_FONT *font_link_entry, *new_child;
FontSubst *psub;
WCHAR* font_name;
psub = get_font_subst(&font_subst_list, font->name, -1);
font_name = psub ? psub->to.name : font->name;
LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry)
{
if(!strcmpiW(font_link->font_name, font->name))
if(!strcmpiW(font_link->font_name, font_name))
{
TRACE("found entry in system list\n");
LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)
@ -3218,7 +3222,7 @@ static BOOL create_child_font_list(GdiFont *font)
*/
if (use_default_fallback && font->charset != SYMBOL_CHARSET &&
font->charset != OEM_CHARSET &&
strcmpiW(font->name,szDefaultFallbackLink) != 0)
strcmpiW(font_name,szDefaultFallbackLink) != 0)
LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry)
{
if(!strcmpiW(font_link->font_name,szDefaultFallbackLink))