From d4107db6bb77b0ad1446f6139dadf8fb3354fdd2 Mon Sep 17 00:00:00 2001 From: Evan Stade Date: Wed, 15 Aug 2007 16:22:04 -0700 Subject: [PATCH] gdiplus: Handle StringFormatFlagsNoWrap in GdipMeasureString. --- dlls/gdiplus/graphics.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 81ff9c153e1..754da2726f7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1729,13 +1729,14 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics || !string || !font || !rect) return InvalidParameter; - if(format || codepointsfitted || linesfilled){ + if(codepointsfitted || linesfilled){ FIXME("not implemented for given parameters\n"); - if(format) - TRACE("format attr is %d\n", format->attr); return NotImplemented; } + if(format) + TRACE("may be ignoring some format flags: attr %x\n", format->attr); + if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc(length * sizeof(WCHAR)); @@ -1797,6 +1798,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(height > roundr(rect->Height)) break; + + /* Stop if this was a linewrap (but not if it was a linebreak). */ + if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap)) + break; } bounds->X = rect->X;