Vincent Povirk : gdiplus: Fix StringFormatFlagsLineLimit handling.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fbcbd09bb3c160be88e789bc7b04e0296ef50f40
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fbcbd09bb3c160be88e789bc7b...

Author: Vincent Povirk 
Date:   Tue Nov 19 15:56:49 2013 -0600

gdiplus: Fix StringFormatFlagsLineLimit handling.

---

dlls/gdiplus/graphics.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 366fa0e..c2a5d42 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -4572,7 +4572,11 @@ GpStatus gdip_format_string(HDC hdc,
         bounds.Width = size.cx;

if(height + size.cy > nheight)
+        {
+            if (format->attr & StringFormatFlagsLineLimit)
+                break;
             bounds.Height = nheight - (height + size.cy);
+        }
         else
             bounds.Height = size.cy;

@@ -4615,7 +4619,7 @@ GpStatus gdip_format_string(HDC hdc,

/* Stop if this was a linewrap (but not if it was a linebreak). */
         if ((lret == fitcpy) && format &&
-            (format->attr & (StringFormatFlagsNoWrap | StringFormatFlagsLineLimit)))
+            (format->attr & StringFormatFlagsNoWrap))
             break;
     }