[PATCH 0/1] MR1882: comctl32/tests: Fix failing test on Windows in Arabic UTF-8.

[eric pouech (＠epo)]

Already fixed in user32/tests/edit.c by
614b7d7430e0ba60692a46e97f03b8b9600f0651

Apply same fix for equivalent test on comctl32/tests/edit.c

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52932

Signed-off-by: Eric Pouech

[PATCH 1/1] comctl32/tests: Fix failing test on Windows in Arabic UTF-8.

[Eric Pouech]

From: Eric Pouech

Already fixed in user32/tests/edit.c by
614b7d7430e0ba60692a46e97f03b8b9600f0651

Apply same fix for equivalent test on comctl32/tests/edit.c

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52932

Signed-off-by: Eric Pouech 
---
 dlls/comctl32/tests/edit.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c
index 91d16e044a0..ea0f53d721f 100644
--- a/dlls/comctl32/tests/edit.c
+++ b/dlls/comctl32/tests/edit.c
@@ -1219,7 +1219,8 @@ static void test_char_from_pos(void)
     SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa");
     lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0));
     hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0));
-    mid = lo + (hi - lo) / 2;
+    trace("testing %s with %u %u (%c%c)\n", "aa", lo, hi, (lo&1)?'O':'E', (hi&1)?'O':'E');
+    mid = lo + (hi - lo + 1) / 2;

for (i = lo; i < mid; i++)
     {
@@ -1241,7 +1242,7 @@ static void test_char_from_pos(void)
     SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa");
     lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0));
     hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0));
-    mid = lo + (hi - lo) / 2;
+    mid = lo + (hi - lo + 1) / 2;

for (i = lo; i < mid; i++)
     {
@@ -1263,7 +1264,7 @@ static void test_char_from_pos(void)
     SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa");
     lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0));
     hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0));
-    mid = lo + (hi - lo) / 2;
+    mid = lo + (hi - lo + 1) / 2;

for (i = lo; i < mid; i++)
     {
@@ -1285,7 +1286,7 @@ static void test_char_from_pos(void)
     SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa");
     lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0));
     hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0));
-    mid = lo + (hi - lo) / 2 + 1;
+    mid = lo + (hi - lo + 1) / 2;

for (i = lo; i < mid; i++)
     {
@@ -1307,7 +1308,7 @@ static void test_char_from_pos(void)
     SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa");
     lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0));
     hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0));
-    mid = lo + (hi - lo) / 2 + 1;
+    mid = lo + (hi - lo + 1) / 2;

for (i = lo; i < mid; i++)
     {
@@ -1329,7 +1330,7 @@ static void test_char_from_pos(void)
     SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa");
     lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0));
     hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0));
-    mid = lo + (hi - lo) / 2 + 1;
+    mid = lo + (hi - lo + 1) / 2;

for (i = lo; i < mid; i++)
     {

[PATCH 0/1] MR1882: comctl32/tests: Fix failing test on Windows in Arabic UTF-8. - approved

[Zhiyi Zhang (＠zhiyi)]

This merge request was approved by Zhiyi Zhang.

[PATCH 0/1] MR1882: comctl32/tests: Fix failing test on Windows in Arabic UTF-8. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.