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

Alexandre Julliard julliard at winehq.org
Thu Nov 5 15:37:14 CST 2020


Module: wine
Branch: master
Commit: fe6bb5f72394b4d56c6f4956363f347b050ce4ee
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fe6bb5f72394b4d56c6f4956363f347b050ce4ee

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Nov  5 09:59:22 2020 +0100

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

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

---

 dlls/gdi32/font.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 89197361fe2..300b8fc1106 100644
--- 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 (!get_face_enum_data( face, &data->elf, &data->ntm ))
+        if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) )) ||
+            !get_face_enum_data( face, &data->elf, &data->ntm ))
         {
             HeapFree( GetProcessHeap(), 0, data );
-            return FALSE;
+            return TRUE;
         }
         face->cached_enum_data = data;
     }




More information about the wine-cvs mailing list