Module: wine Branch: master Commit: 34c4687f254c349049bd7cb7fcbae99e9dbff9aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c4687f254c349049bd7cb7f...
Author: Akihiro Sagawa sagawa.aki@gmail.com Date: Sun Feb 4 21:02:11 2018 +0900
gdi32/tests: Add more ABC width tests with vertical font.
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7a74565..d5f04ff 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5929,7 +5929,7 @@ static void check_vertical_metrics(const char *face) GLYPHMETRICS rgm, vgm; const UINT code = 0x5EAD, height = 1000; WORD idx; - ABC abc; + ABC abc, vabc; OUTLINETEXTMETRICA otm; USHORT numOfLongVerMetrics;
@@ -5957,6 +5957,15 @@ static void check_vertical_metrics(const char *face) hfont_prev = SelectObject(hdc, hfont); ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &vgm, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + ret = GetCharABCWidthsW(hdc, code, code, &vabc); + ok(ret, "GetCharABCWidthsW failed\n"); + todo_wine ok(vabc.abcA == vgm.gmptGlyphOrigin.x, "expected %d, got %d\n", + vabc.abcA, vgm.gmptGlyphOrigin.x); + todo_wine ok(vabc.abcB == vgm.gmBlackBoxX, "expected %d, got %d\n", + vabc.abcB, vgm.gmBlackBoxX); + ok(vabc.abcA + vabc.abcB + vabc.abcC == vgm.gmCellIncX, + "expected %d, got %d\n", + vabc.abcA + vabc.abcB + vabc.abcC, vgm.gmCellIncX);
memset(&otm, 0, sizeof(otm)); otm.otmSize = sizeof(otm);