Kusanagi Kouichi : gdi32: Don't remove leading '@' from face name.

Alexandre Julliard julliard at winehq.org
Tue Dec 13 13:01:27 CST 2011


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

Author: Kusanagi Kouichi <slash at ac.auone-net.jp>
Date:   Tue Dec 13 19:44:26 2011 +0900

gdi32: Don't remove leading '@' from face name.

---

 dlls/gdi32/freetype.c   |    8 --------
 dlls/gdi32/tests/font.c |    1 -
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 615a01a..9762230 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -3940,14 +3940,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont )
         CHILD_FONT *font_link_entry;
         LPWSTR FaceName = lf.lfFaceName;
 
-        /*
-         * Check for a leading '@' this signals that the font is being
-         * requested in tategaki mode (vertical writing substitution) but
-         * does not affect the fontface that is to be selected.
-         */
-        if (lf.lfFaceName[0]=='@')
-            FaceName = &lf.lfFaceName[1];
-
         psub = get_font_subst(&font_subst_list, FaceName, lf.lfCharSet);
 
 	if(psub) {
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index ed629ce..98c61a0 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4126,7 +4126,6 @@ static void test_vertical_font(void)
 
     check_vertical_font("@WineTestVertical", &installed, &selected, &gm);
     ok(installed, "@WineTestVertical is not installed\n");
-    todo_wine
     ok(selected, "@WineTestVertical is not selected\n");
     todo_wine
     ok(gm.gmBlackBoxX > gm.gmBlackBoxY,




More information about the wine-cvs mailing list