[PATCH v3 1/2] gdiplus: Check for NoClip in text height calculation

[James McDonnell]

From: James McDonnell

---
 dlls/gdiplus/graphics.c       | 2 +-
 dlls/gdiplus/tests/graphics.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 0727b63ed4f..aaf04d60961 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5448,7 +5448,7 @@ GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc,

bounds.Width = size.cx;

-        if(height + size.cy > nheight)
+        if(height + size.cy > nheight && (format->attr & StringFormatFlagsNoClip) == 0)
         {
             if (format->attr & StringFormatFlagsLineLimit)
                 break;
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index 4af7f179ec2..74dff64a944 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -4786,7 +4786,6 @@ static void test_measure_string(void)
     expectf(0.0, bounds.X);
     expectf(0.0, bounds.Y);
     expectf_(width, bounds.Width, 0.01);
-    todo_wine
     expectf(height, bounds.Height);

set_rect_empty(&rect);