[3/10] gdiplus: handle StringFormatFlagsNoWrap in GdipDrawString
Evan Stade
estade at gmail.com
Wed Aug 15 18:22:00 CDT 2007
Hi,
dlls/gdiplus/graphics.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
--
Evan Stade
-------------- next part --------------
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 19f89a0..81ff9c1 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1289,13 +1289,14 @@ GpStatus WINGDIPAPI GdipDrawString(GpGra
if(!graphics || !string || !font || !brush || !rect)
return InvalidParameter;
- if(format || (brush->bt != BrushTypeSolidColor)){
+ if((brush->bt != BrushTypeSolidColor)){
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));
@@ -1402,6 +1403,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGra
if(height > roundr(rect->Height * rel_height))
break;
+
+ /* Stop if this was a linewrap (but not if it was a linebreak). */
+ if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap))
+ break;
}
DeleteObject(rgn);
--
1.4.1
More information about the wine-patches
mailing list