From d30f1fd7384435fc3b181dedd0eda0a167227f89 Mon Sep 17 00:00:00 2001 From: Vitaliy Margolen Date: Tue, 5 Jul 2005 14:04:25 +0000 Subject: [PATCH] Fix some failing tests. --- dlls/user/edit.c | 2 +- dlls/user/tests/edit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index b3573c0edbb..f048d61a599 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -1457,7 +1457,7 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) x_low = x_now; } } - if (abs(x_high - x) <= abs(x_low - x) + 1) + if (abs(x_high - x) + 1 <= abs(x_low - x)) index = high; else index = low; diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index 5356c33d6b1..61ab5b74025 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -865,7 +865,7 @@ static void test_edit_control_4(void) SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo) / 2 +1; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessage(hwEdit, EM_CHARFROMPOS, 0, (LPARAM) i)); @@ -883,7 +883,7 @@ static void test_edit_control_4(void) SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo) / 2 +1; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessage(hwEdit, EM_CHARFROMPOS, 0, (LPARAM) i)); @@ -901,7 +901,7 @@ static void test_edit_control_4(void) SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo) / 2 +1; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessage(hwEdit, EM_CHARFROMPOS, 0, (LPARAM) i)); -- 2.11.4.GIT