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

gdi32: Introduce ft_face_get_family/style_name helpers. 

And use them directly instead of get_family_names.

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-09-07 15:18:54 +02:00 committed by Alexandre Julliard
parent afc857436a
commit 01d82af4a3
1 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
dlls/gdi32/freetype.c
View File

@ -1482,6 +1482,26 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, LANGID language_
return NULL; return NULL;
} }
static WCHAR *ft_face_get_family_name( FT_Face ft_face, LANGID langid )
{
WCHAR *family_name;
if ((family_name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, langid )))
return family_name;
return towstr( CP_ACP, ft_face->family_name );
}
static WCHAR *ft_face_get_style_name( FT_Face ft_face, LANGID langid )
{
WCHAR *style_name;
if ((style_name = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, langid )))
return style_name;
return towstr( CP_ACP, ft_face->style_name );
}
static inline BOOL faces_equal( const Face *f1, const Face *f2 ) static inline BOOL faces_equal( const Face *f1, const Face *f2 )
{ {
if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE;
@ -1905,55 +1925,44 @@ static WCHAR *prepend_at(WCHAR *family)
return str; return str;
} }
static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BOOL vertical ) static Family *get_family( FT_Face ft_face, BOOL vertical )
{ {
*english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT) ); Family *family;
if (!*english) *english = towstr( CP_ACP, ft_face->family_name ); WCHAR *family_name, *english_name;
*name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetSystemDefaultLCID() ); family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() );
if (!*name) english_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) );
if (!strcmpiW( family_name, english_name ))
{ {
*name = *english; HeapFree( GetProcessHeap(), 0, english_name );
*english = NULL; english_name = NULL;
}
else if (!strcmpiW( *name, *english ))
{
HeapFree( GetProcessHeap(), 0, *english );
*english = NULL;
} }
if (vertical) if (vertical)
{ {
*name = prepend_at( *name ); family_name = prepend_at( family_name );
*english = prepend_at( *english ); english_name = prepend_at( english_name );
} }
}
static Family *get_family( FT_Face ft_face, BOOL vertical ) family = find_family_from_name( family_name );
{
Family *family;
WCHAR *name, *english_name;
get_family_names( ft_face, &name, &english_name, vertical );
family = find_family_from_name( name );
if (!family) if (!family)
{ {
family = create_family( name, english_name ); family = create_family( family_name, english_name );
if (english_name) if (english_name)
{ {
FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) ); FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) );
subst->from.name = strdupW( english_name ); subst->from.name = strdupW( english_name );
subst->from.charset = -1; subst->from.charset = -1;
subst->to.name = strdupW( name ); subst->to.name = strdupW( family_name );
subst->to.charset = -1; subst->to.charset = -1;
add_font_subst( &font_subst_list, subst, 0 ); add_font_subst( &font_subst_list, subst, 0 );
} }
} }
else else
{ {
HeapFree( GetProcessHeap(), 0, name ); HeapFree( GetProcessHeap(), 0, family_name );
HeapFree( GetProcessHeap(), 0, english_name ); HeapFree( GetProcessHeap(), 0, english_name );
family->refcount++; family->refcount++;
} }
@ -2088,9 +2097,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file,
Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) );
face->refcount = 1; face->refcount = 1;
face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); face->StyleName = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() );
if (!face->StyleName) face->StyleName = towstr( CP_ACP, ft_face->style_name );
face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() );
if (flags & ADDFONT_VERTICAL_FONT) if (flags & ADDFONT_VERTICAL_FONT)
face->FullName = prepend_at( face->FullName ); face->FullName = prepend_at( face->FullName );
@ -3498,20 +3505,19 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd )
{ {
FT_Face ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); FT_Face ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE );
Face *face; Face *face;
WCHAR *name, *english_name; WCHAR *family_name;
ENUMLOGFONTEXW elf; ENUMLOGFONTEXW elf;
NEWTEXTMETRICEXW ntm; NEWTEXTMETRICEXW ntm;
DWORD type; DWORD type;
if (!ft_face) return FALSE; if (!ft_face) return FALSE;
face = create_face( ft_face, 0, unix_name, NULL, 0, 0 ); face = create_face( ft_face, 0, unix_name, NULL, 0, 0 );
get_family_names( ft_face, &name, &english_name, FALSE ); family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() );
pFT_Done_Face( ft_face ); pFT_Done_Face( ft_face );
GetEnumStructs( face, name, &elf, &ntm, &type ); GetEnumStructs( face, family_name, &elf, &ntm, &type );
release_face( face ); release_face( face );
HeapFree( GetProcessHeap(), 0, name ); HeapFree( GetProcessHeap(), 0, family_name );
HeapFree( GetProcessHeap(), 0, english_name );
if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE; if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE;
@ -7955,12 +7961,7 @@ static BOOL get_outline_text_metrics(GdiFont *font)
lenfam = (strlenW(font->name) + 1) * sizeof(WCHAR); lenfam = (strlenW(font->name) + 1) * sizeof(WCHAR);
family_nameW = strdupW(font->name); family_nameW = strdupW(font->name);
style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); style_nameW = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() );
if (!style_nameW)
{
FIXME("failed to read style_nameW for font %s!\n", wine_dbgstr_w(font->name));
style_nameW = towstr( CP_ACP, ft_face->style_name );
}
lensty = (strlenW(style_nameW) + 1) * sizeof(WCHAR); lensty = (strlenW(style_nameW) + 1) * sizeof(WCHAR);
face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() );