system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-18 22:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdi32: Only request registry font path when necessary.

Browse source 
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2020-11-27 15:38:04 +01:00 committed by Alexandre Julliard
parent a0b7a0da40
commit cae74aa7d9
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/gdi32/font.c
View file

@ -7910,7 +7910,7 @@ static void load_registry_fonts(void)
vlen = ARRAY_SIZE(value);
dlen = sizeof(data);
while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (LPBYTE)data, &dlen ))
while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, NULL, NULL ))
{
if (type != REG_SZ) goto next;
dlen /= sizeof(WCHAR);
@ -7918,6 +7918,13 @@ static void load_registry_fonts(void)
if (find_face_from_full_name( value )) goto next;
if (tmp && !*tmp) *tmp = ' ';
if (RegQueryValueExW( hkey, value, NULL, NULL, (LPBYTE)data, &dlen ))
{
WARN( "Unable to get face path %s\n", debugstr_w(value) );
goto next;
}
dlen /= sizeof(WCHAR);
if (data[0] && data[1] == ':')
add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE );
else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" ))