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

gdi32: Rewrite prepend_at helper as get_vertical_name. 

And only prepend '@'' if it's not already there.

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:55 +02:00 committed by Alexandre Julliard
parent 01d82af4a3
commit cc6951574a
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/gdi32/freetype.c
View File

@ -1911,18 +1911,17 @@ static void remove_face_from_cache( Face *face )
RegCloseKey(hkey_family); RegCloseKey(hkey_family);
} }
static WCHAR *prepend_at(WCHAR *family) static WCHAR *get_vertical_name( WCHAR *name )
{ {
WCHAR *str; SIZE_T length;
if (!name) return NULL;
if (name[0] == '@') return name;
if (!family) length = strlenW( name ) + 1;
return NULL; name = HeapReAlloc( GetProcessHeap(), 0, name, (length + 1) * sizeof(WCHAR) );
memmove( name + 1, name, length * sizeof(WCHAR) );
str = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * (strlenW(family) + 2)); name[0] = '@';
str[0] = '@'; return name;
strcpyW(str + 1, family);
HeapFree(GetProcessHeap(), 0, family);
return str;
} }
static Family *get_family( FT_Face ft_face, BOOL vertical ) static Family *get_family( FT_Face ft_face, BOOL vertical )
@ -1941,8 +1940,8 @@ static Family *get_family( FT_Face ft_face, BOOL vertical )
if (vertical) if (vertical)
{ {
family_name = prepend_at( family_name ); family_name = get_vertical_name( family_name );
english_name = prepend_at( english_name ); english_name = get_vertical_name( english_name );
} }
family = find_family_from_name( family_name ); family = find_family_from_name( family_name );
@ -2099,8 +2098,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file,
face->refcount = 1; face->refcount = 1;
face->StyleName = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); face->StyleName = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() );
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 = get_vertical_name( face->FullName );
face->FullName = prepend_at( face->FullName );
face->dev = 0; face->dev = 0;
face->ino = 0; face->ino = 0;
@ -2378,10 +2376,10 @@ static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const
if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK))
return FALSE; return FALSE;
at_orig = prepend_at(strdupW(orig)); at_orig = get_vertical_name( strdupW( orig ) );
if (at_orig && !find_family_from_any_name(at_orig)) if (at_orig && !find_family_from_any_name(at_orig))
{ {
at_repl = prepend_at(strdupW(repl)); at_repl = get_vertical_name( strdupW( repl ) );
if (at_repl) if (at_repl)
ret = map_font_family(at_orig, at_repl); ret = map_font_family(at_orig, at_repl);
} }
@ -7970,7 +7968,7 @@ static BOOL get_outline_text_metrics(GdiFont *font)
FIXME("failed to read face_nameW for font %s!\n", wine_dbgstr_w(font->name)); FIXME("failed to read face_nameW for font %s!\n", wine_dbgstr_w(font->name));
face_nameW = strdupW(font->name); face_nameW = strdupW(font->name);
} }
if (font->name[0] == '@') face_nameW = prepend_at( face_nameW ); if (font->name[0] == '@') face_nameW = get_vertical_name( face_nameW );
lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR);
full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() );