commit 1e170c9b85c39d2b789f7f44f8fc692af94ffa4b
author Hans Leidekker <hans@codeweavers.com> Mon Nov 24 10:22:26 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Nov 24 14:25:10 2008 +0100
tree 2a58f2be0ce09dedcd8b8ee4bc92dbbb92f20b3f
parent 80a54ca53f8fc1526210f2023b62713223552c4c

gdiplus: Improve GdipMeasureString.

dlls/gdiplus/graphics.c

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