ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Rewrite find_face_from_filename using the rbtree. 

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-13 09:05:56 +00:00 committed by Alexandre Julliard
parent 5cdd011f4e
commit ec646de3aa
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/gdi32/font.c
View File

@ -618,17 +618,10 @@ static const struct list *get_family_face_list( const struct gdi_font_family *fa
return family->replacement ? &family->replacement->faces : &family->faces;
}
static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, const WCHAR *family_name )
static struct gdi_font_face *family_find_face_from_filename( struct gdi_font_family *family, const WCHAR *file_name )
{
struct gdi_font_family *family;
struct gdi_font_face *face;
const WCHAR *file;
TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) );
WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry )
{
if (family_name && wcsnicmp( family_name, family->family_name, LF_FACESIZE - 1 )) continue;
LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry )
{
if (!face->file) continue;
@ -639,10 +632,27 @@ static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, co
face->refcount++;
return face;
}
}
return NULL;
}
static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, const WCHAR *family_name )
{
struct gdi_font_family *family;
struct gdi_font_face *face;
TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) );
if (!family_name)
{
WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry )
if ((face = family_find_face_from_filename( family, file_name ))) return face;
return NULL;
}
if (!(family = find_family_from_name( family_name ))) return NULL;
return family_find_face_from_filename( family, file_name );
}
static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace )
{
struct gdi_font_family *new_family, *family;