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: Don't add system_links entries for substituted fonts.

Browse source 
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.
This commit is contained in:
Paul TBBle Hampson 2009-05-04 23:21:27 +10:00 committed by Alexandre Julliard
parent 8a4b77883e
commit ce426d6ad1
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/gdi32/freetype.c
View file

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