Paul Vriens : riched32/tests: Fix test failures on Win9x, WinMe and NT4.
Alexandre Julliard
julliard at winehq.org
Mon Jun 15 07:59:04 CDT 2009
Module: wine
Branch: master
Commit: c5946beccc4c316df024b1ecc489c3b4c619fa18
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5946beccc4c316df024b1ecc489c3b4c619fa18
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Fri Jun 12 21:24:59 2009 +0200
riched32/tests: Fix test failures on Win9x, WinMe and NT4.
---
dlls/riched32/tests/editor.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c
index 0d853a6..5cc269d 100644
--- a/dlls/riched32/tests/editor.c
+++ b/dlls/riched32/tests/editor.c
@@ -768,7 +768,9 @@ static void test_EM_POSFROMCHAR(void)
if (i == 0)
{
ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y);
- ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x);
+ ok(pl.x == 1 ||
+ broken(pl.x == 0), /* Win9x, WinME and NT4 */
+ "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x);
xpos = pl.x;
}
else if (i == 1)
@@ -829,7 +831,9 @@ static void test_EM_POSFROMCHAR(void)
result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0);
ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result);
ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y);
- ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x);
+ ok(pl.x == 1 ||
+ broken(pl.x == 0), /* Win9x, WinME and NT4 */
+ "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x);
xpos = pl.x;
SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0);
@@ -838,7 +842,9 @@ static void test_EM_POSFROMCHAR(void)
ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y);
todo_wine {
/* Fails on builtin because horizontal scrollbar is not being shown */
- ok(pl.x < xpos, "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos);
+ ok(pl.x < xpos ||
+ broken(pl.x == xpos), /* Win9x, WinME and NT4 */
+ "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", pl.x, xpos);
}
DestroyWindow(hwndRichEdit);
}
More information about the wine-cvs
mailing list