From 81883c46445ce2569816b490064c714867123b10 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 28 Jun 2011 13:57:23 -0500 Subject: [PATCH 2/4] gdiplus: Test MeasureDriverString with a character that has an underhang. --- dlls/gdiplus/tests/graphics.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 64472f4..0ab570d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2827,6 +2827,7 @@ static void test_string_functions(void) HDC hdc = GetDC( hwnd ); const WCHAR fontname[] = {'T','a','h','o','m','a',0}; const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; + const WCHAR teststring2[] = {'j',0}; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3109,6 +3110,20 @@ static void test_string_functions(void) todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); expectf(char_height, rc.Height); + rc.X = 0; + rc.Y = 0; + rc.Width = 0; + rc.Height = 0; + status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(Ok, status); + + expectf(rc.X, 0.0); + todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + todo_wine ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); + expectf(rc.Height, char_height); + GdipDeleteMatrix(identity); GdipDeleteStringFormat(format); GdipDeleteBrush(brush); -- 1.7.1