Ziqing Hui : gdiplus: Support StringFormatNoWrap for GdipMeasureString.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c509060f52eb2c2e8f95111046c5010f9686eb31
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c509060f52eb2c2e8f9511104...

Author: Ziqing Hui <zhui(a)codeweavers.com>
Date:   Fri Oct 23 10:22:10 2020 +0800

gdiplus: Support StringFormatNoWrap for GdipMeasureString.

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com>
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 190f45d64a2..291f6a94b9d 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5270,7 +5270,7 @@ GpStatus gdip_format_string(HDC hdc,
             if(*(stringdup + sum + fit) == ' ')
                 while(*(stringdup + sum + fit) == ' ')
                     fit++;
-            else
+            else if (!(format->attr & StringFormatFlagsNoWrap))
                 while(*(stringdup + sum + fit - 1) != ' '){
                     fit--;
 
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index 24fc91a1bfe..d1022b1af5b 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -4900,10 +4900,8 @@ todo_wine
     rect.Height = 32000.0;
     status = GdipMeasureString(graphics, string2, -1, font, &rect, format_no_wrap, &bounds, &glyphs, &lines);
     expect(Ok, status);
-    todo_wine {
     expectf_(width_M_M, bounds.Width, 0.1);
     expect(3, glyphs);
-    }
     expect(1, lines);
 
     status = GdipDeleteFont(font);