Aric Stewart : gdi32: GetGlyphIndices does substitute glyph.

[Alexandre Julliard]

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

Author: Aric Stewart 
Date:   Fri May 17 14:32:39 2013 -0500

gdi32: GetGlyphIndices does substitute glyph.

---

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

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 141238b..ae48914 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5841,6 +5841,8 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP
             }
             pgi[i] = default_char;
         }
+        else
+            pgi[i] = get_GSUB_vert_glyph(physdev->font, pgi[i]);
     }
     LeaveCriticalSection( &freetype_cs );
     return count;
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 5202985..fdb6451 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4835,7 +4835,7 @@ static void test_vertical_font(void)
        "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n",
        gm.gmBlackBoxX, gm.gmBlackBoxY);

-    todo_wine ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi);
+    ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi);

ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0);
     ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());