Huw Davies : gdi32: Win 2000 and Win XP behave differently if there's a '\n ' in the string, so remove the width test completely.

[Alexandre Julliard]

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

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Thu Sep 21 10:11:28 2006 +0100

gdi32: Win 2000 and Win XP behave differently if there's a '\n' in the string, so remove the width test completely.

---

 dlls/gdi/tests/font.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c
index beb7436..6891f14 100644
--- a/dlls/gdi/tests/font.c
+++ b/dlls/gdi/tests/font.c
@@ -383,11 +383,11 @@ static void test_text_extents(void)
     GetTextExtentPointW(hdc, wt, len, &sz2);
     ok(sz1.cy == sz2.cy,
        "cy from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) differ\n", sz1.cy, sz2.cy);
-todo_wine {
-    /* The \n in the string is apparently handled differently in GetTextExtentPoint and GetTextExtentExPoint */
-    ok(sz1.cx != sz2.cx,
-       "cx from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) are the same\n", sz1.cx, sz2.cx);
- }
+    /* Because of the '\n' in the string GetTextExtentExPoint and
+       GetTextExtentPoint return different widths under Win2k, but
+       under WinXP they return the same width.  So we don't test that
+       here. */
+
     for (i = 1; i < len; ++i)
         ok(extents[i-1] <= extents[i],
            "GetTextExtentExPointW generated a non-increasing sequence of partial extents (at position %d)\n",