Qian Hong : gdi32: Prepend at when create vertical font face.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 97904fd1ff1e775f9af3a8915850a2c2f5d3b109
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=97904fd1ff1e775f9af3a89158...

Author: Qian Hong 
Date:   Wed Sep 12 21:51:24 2012 +0800

gdi32: Prepend at when create vertical font face.

---

dlls/gdi32/freetype.c   |    3 +++
 dlls/gdi32/tests/font.c |    6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 2587d99..7e5fc36 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1724,6 +1724,9 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file,
     face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() );
     if (!face->FullName)
         face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES );
+    if (vertical)
+        face->FullName = prepend_at( face->FullName );
+
     if (file)
     {
         face->file = strdupA( file );
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 3953512..b11acac 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4087,11 +4087,7 @@ static void test_fullname2_helper(const char *Family)
         trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName);

get_vertical = ( FamilyName[0] == '@' );
-        if (get_vertical)
-        {
-            todo_wine ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName);
-            continue;
-        }
+        ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName);

lstrcpyA(lf.lfFaceName, FaceName);
         hfont = CreateFontIndirectA(&lf);