gdi32: Only request registry font path when necessary.

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>

gdi32: Only request registry font path when necessary.
cae74aa7 · Rémi Bernon · Alexandre Julliard · a0b7a0da · cae74aa7
Commit cae74aa7 authored Nov 27, 2020 by Rémi Bernon Committed by Alexandre Julliard Dec 01, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

font.c dlls/gdi32/font.c +8 -1

No files found.
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -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" ))