[ros-diffs] [jimtabor] 62487: [User32Test] - Patch by Henri Verbeet : Fix TEXT_WordBreak() when no characters fit. - Update text to wine head.

Author: jimtabor
Date: Thu Mar 13 01:39:31 2014
New Revision: 62487

URL: http://svn.reactos.org/svn/reactos?rev=62487&view=rev
Log:
[User32Test]
- Patch by Henri Verbeet : Fix TEXT_WordBreak() when no characters fit.
- Update text to wine head.

Modified:
    trunk/rostests/winetests/user32/text.c

Modified: trunk/rostests/winetests/user32/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/text.c?re...
==============================================================================
--- trunk/rostests/winetests/user32/text.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/text.c	[iso-8859-1] Thu Mar 13 01:39:31 2014
@@ -42,6 +42,8 @@
         's','t','r','i','n','g','\0'};
     static CHAR emptystring[] = "";
     static WCHAR emptystringW[] = { 0 };
+    static CHAR wordbreak_text[] = "line1 line2";
+    static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0};
     INT textlen, textheight, heightcheck;
     RECT rect = { 0, 0, 100, 0 };
     BOOL ret;
@@ -555,6 +557,20 @@
         ok(0 == rect.top, "expected 0, got %d\n", rect.top);
         ok(rect.bottom, "rect.bottom should not be 0\n");
     }
+
+    SetRect(&rect, 0, 0, 1, 1);
+    heightcheck = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT);
+    SetRect(&rect, 0, 0, 1, 1);
+    textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK);
+    ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n",
+       textheight, heightcheck * 2);
+
+    SetRect(&rect, 0, 0, 1, 1);
+    heightcheck = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT);
+    SetRect(&rect, 0, 0, 1, 1);
+    textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK);
+    ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n",
+       textheight, heightcheck * 2);

SelectObject(hdc, hOldFont);
     ret = DeleteObject(hFont);