[06/10] gdiplus: Improve GdipMeasureString.
Hans Leidekker
hans at codeweavers.com
Mon Nov 24 03:22:26 CST 2008
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index fa90d73..aba2aca 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2654,10 +2654,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
if(!graphics || !string || !font || !rect)
return InvalidParameter;
- if(codepointsfitted || linesfilled){
- FIXME("not implemented for given parameters\n");
- return NotImplemented;
- }
+ if(linesfilled) *linesfilled = 0;
+ if(codepointsfitted) *codepointsfitted = 0;
if(format)
TRACE("may be ignoring some format flags: attr %x\n", format->attr);
@@ -2722,7 +2720,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics,
nwidth, &j, NULL, &size);
sum += fit + (lret < fitcpy ? 1 : 0);
+ if(codepointsfitted) *codepointsfitted = sum;
+
height += size.cy;
+ if(linesfilled) *linesfilled += size.cy;
max_width = max(max_width, size.cx);
if(height > nheight)
More information about the wine-patches
mailing list