Paul Vriens : riched32/tests: Fix some test failures on Win9x/WinME/NT4.
Alexandre Julliard
julliard at winehq.org
Tue Jun 9 10:45:29 CDT 2009
Module: wine
Branch: master
Commit: 8e0849f7a64eeb2348b9a75461386f73f2ad87b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0849f7a64eeb2348b9a75461386f73f2ad87b0
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Tue Jun 9 16:08:29 2009 +0200
riched32/tests: Fix some test failures on Win9x/WinME/NT4.
---
dlls/riched32/tests/editor.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c
index 269a425..cb5db77 100644
--- a/dlls/riched32/tests/editor.c
+++ b/dlls/riched32/tests/editor.c
@@ -650,6 +650,7 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f,
ft.chrg.cpMin = f->start;
ft.chrg.cpMax = f->end;
ft.lpstrText = f->needle;
+ ft.chrgText.cpMax = 0xdeadbeef;
findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft);
ok(findloc == f->expected_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n",
@@ -659,7 +660,8 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f,
name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin, f->expected_loc);
expected_end_loc = ((f->expected_loc == -1) ? -1
: f->expected_loc + strlen(f->needle));
- ok(ft.chrgText.cpMax == expected_end_loc,
+ ok(ft.chrgText.cpMax == expected_end_loc ||
+ broken(ft.chrgText.cpMin == -1 && ft.chrgText.cpMax == 0xdeadbeef), /* Win9x, WinME and NT4 */
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n",
name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc);
}
More information about the wine-cvs
mailing list