[PATCH v2 0/1] MR2168: win32u: Match second name when enum fonts.

[Keming Liang (＠Keming)]

the patch can resolve the issue:
https://bugs.winehq.org/show_bug.cgi?id=54483

and can also solve many crashed issue related to font(MS Shell Dlg etc.)

--
  v2: win32u: Match second name when enum fonts.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2168

[PATCH v2 1/1] win32u: Match second name when enum fonts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54483

[Keming Liang]

From: Keming Liang <liangkeming(a)kylinos.cn>

---
 dlls/win32u/font.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index 742a31b59a4..56509938cb4 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -983,7 +983,7 @@ static void dump_gdi_font_list(void)
 
     WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry )
     {
-        TRACE( "Family: %s\n", debugstr_w(family->family_name) );
+        TRACE( "Family: %s, Second name: %s\n", debugstr_w(family->family_name),debugstr_w(family->second_name) );
         LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry )
         {
             TRACE( "\t%s\t%s\t%08x", debugstr_w(face->style_name), debugstr_w(face->full_name),
@@ -3441,18 +3441,19 @@ static BOOL family_matches( struct gdi_font_family *family, const WCHAR *face_na
 {
     struct gdi_font_face *face;
 
-    if (!facename_compare( face_name, family->family_name, LF_FACESIZE - 1 )) return TRUE;
+    if (!facename_compare( face_name, family->family_name, LF_FACESIZE - 1 ) || !facename_compare( face_name, family->second_name, LF_FACESIZE - 1 )) return TRUE;
     LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry )
         if (!facename_compare( face_name, face->full_name, LF_FACESIZE - 1 )) return TRUE;
     return FALSE;
 }
 
-static BOOL face_matches( const WCHAR *family_name, struct gdi_font_face *face, const WCHAR *face_name )
+static BOOL face_matches( struct gdi_font_family *family, struct gdi_font_face *face, const WCHAR *face_name )
 {
-    if (!facename_compare( face_name, family_name, LF_FACESIZE - 1)) return TRUE;
+    if (!facename_compare( face_name, family->family_name, LF_FACESIZE - 1) || !facename_compare( face_name, family->second_name, LF_FACESIZE - 1 ) ) return TRUE;
     return !facename_compare( face_name, face->full_name, LF_FACESIZE - 1 );
 }
 
+
 static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi_font_face *face,
                                 struct enum_charset *list, DWORD count, FONTENUMPROCW proc, LPARAM lparam,
                                 const WCHAR *subst )
@@ -3549,7 +3550,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc,
             if (!family_matches(family, face_name)) continue;
             LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry )
             {
-                if (!face_matches( family->family_name, face, face_name )) continue;
+                if (!face_matches( family, face, face_name )) continue;
                 if (!enum_face_charsets( family, face, enum_charsets, count, proc, lparam, orig_name ))
                     return FALSE; /* enum_face_charsets() unlocked font_lock */
 	    }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2168

[Keming Liang (＠Keming)]

@huw 
I added the bug link to the commit message, but I don't know exactly where and how add a test for this fix。
Could you give some suggestion?  it seems that the test can be added to winehq/dlls/gdi32/tests/font.c ?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2168#note_24042