gdi32: Don't abort enumeration if a font fails to load.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Don't abort enumeration if a font fails to load.
fe6bb5f7 · Alexandre Julliard · 91741446 · fe6bb5f7
Commit fe6bb5f7 authored Nov 05, 2020 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

font.c dlls/gdi32/font.c +3 -3

No files found.
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2772,11 +2772,11 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi
    {
        struct gdi_font_enum_data *data;
-        if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return FALSE;
+        if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) )) ||
-        if (!get_face_enum_data( face, &data->elf, &data->ntm ))
+            !get_face_enum_data( face, &data->elf, &data->ntm ))
        {
            HeapFree( GetProcessHeap(), 0, data );
-            return FALSE;
+            return TRUE;
        }
        face->cached_enum_data = data;
    }