gdiplus: Support StringFormatNoWrap for GdipMeasureString.

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

gdiplus: Support StringFormatNoWrap for GdipMeasureString.
c509060f · Ziqing Hui · Alexandre Julliard · 3f228497 · c509060f · c509060f
Commit c509060f authored Oct 23, 2020 by Ziqing Hui Committed by Alexandre Julliard Oct 23, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

graphics.c dlls/gdiplus/graphics.c +1 -1

graphics.c dlls/gdiplus/tests/graphics.c +0 -2

No files found.
--- 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--;


--- 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);