[PATCH v2 2/3] riched20: Implement ITextRange::Move() for tomCharacter

[Damjan Jovanovic]

Signed-off-by: Damjan Jovanovic <damjan.jov at gmail.com>
---
 dlls/riched20/richole.c       | 75 +++++++++++++++++++++++++++++++++--
 dlls/riched20/tests/richole.c | 47 ++++++++++++++++++++++
 2 files changed, 118 insertions(+), 4 deletions(-)
-------------- next part --------------
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index c30db2841c..c7a84b6e78 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2179,16 +2179,78 @@ static HRESULT WINAPI ITextRange_fnEndOf(ITextRange *me, LONG unit, LONG extend,
     return E_NOTIMPL;
 }
 
+static HRESULT textrange_move(ITextRange *range, ME_TextEditor *editor, LONG unit, LONG count, LONG *delta)
+{
+    LONG old_start, old_end, new_start, new_end;
+    LONG move_by;
+    LONG moved;
+    HRESULT hr = S_OK;
+
+    if (!count)
+    {
+        if (delta)
+            *delta = 0;
+        return S_FALSE;
+    }
+
+    ITextRange_GetStart(range, &old_start);
+    ITextRange_GetEnd(range, &old_end);
+    switch (unit)
+    {
+    case tomCharacter:
+    {
+        ME_Cursor cursor;
+
+        if (count > 0) {
+            ME_CursorFromCharOfs(editor, old_end, &cursor);
+            move_by = count;
+            if (old_start != old_end)
+                --move_by;
+        } else {
+            ME_CursorFromCharOfs(editor, old_start, &cursor);
+            move_by = count;
+            if (old_start != old_end)
+                ++move_by;
+        }
+        moved = ME_MoveCursorChars(editor, &cursor, move_by, FALSE);
+        if (count > 0) {
+            new_end = old_end + moved;
+            new_start = new_end;
+            if (old_start != old_end)
+                ++moved;
+        } else {
+            new_start = old_start + moved;
+            new_end = new_start;
+            if (old_start != old_end)
+                --moved;
+        }
+        if (delta) {
+            *delta = moved;
+        }
+        break;
+    }
+    default:
+        FIXME("unit %d is not supported\n", unit);
+        return E_NOTIMPL;
+    }
+    if (moved == 0)
+        hr = S_FALSE;
+    ITextRange_SetStart(range, new_start);
+    ITextRange_SetEnd(range, new_end);
+
+    return hr;
+}
+
 static HRESULT WINAPI ITextRange_fnMove(ITextRange *me, LONG unit, LONG count, LONG *delta)
 {
     ITextRangeImpl *This = impl_from_ITextRange(me);
 
-    FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta);
+    TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta);
 
     if (!This->child.reole)
         return CO_E_RELEASED;
 
-    return E_NOTIMPL;
+    return textrange_move(me, This->child.reole->editor, unit, count, delta);
 }
 
 static HRESULT textrange_movestart(ITextRange *range, ME_TextEditor *editor, LONG unit, LONG count, LONG *delta)
@@ -5027,13 +5089,18 @@ static HRESULT WINAPI ITextSelection_fnEndOf(ITextSelection *me, LONG unit, LONG
 static HRESULT WINAPI ITextSelection_fnMove(ITextSelection *me, LONG unit, LONG count, LONG *delta)
 {
     ITextSelectionImpl *This = impl_from_ITextSelection(me);
+    ITextRange *range = NULL;
+    HRESULT hr;
 
-    FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta);
+    TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta);
 
     if (!This->reOle)
         return CO_E_RELEASED;
 
-    return E_NOTIMPL;
+    ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range);
+    hr = textrange_movestart(range, This->reOle->editor, unit, count, delta);
+    ITextRange_Release(range);
+    return hr;
 }
 
 static HRESULT WINAPI ITextSelection_fnMoveStart(ITextSelection *me, LONG unit, LONG count,
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 5f903aa1ac..7fde2ca232 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -3866,6 +3866,52 @@ static void test_character_moveend(ITextRange *range, int textlen, int i, int j,
     }
 }
 
+static void test_character_move(ITextRange *range, int textlen, int i, int j, LONG target)
+{
+    HRESULT hr;
+    LONG move_by;
+    LONG delta = 0;
+    LONG expected_delta;
+    LONG expected_location = target;
+
+    if (expected_location < 0)
+        expected_location = 0;
+    else if (expected_location > textlen)
+        expected_location = textlen;
+
+    if (target <= i) {
+        move_by = target - i;
+        expected_delta = expected_location - i;
+        if (i != j) {
+            --move_by;
+            --expected_delta;
+        }
+    } else if (j <= target) {
+        move_by = target - j;
+        expected_delta = expected_location - j;
+        if (i != j) {
+            ++move_by;
+            ++expected_delta;
+        }
+    } else {
+        /* There's no way to move to a point between start and end: */
+        return;
+    }
+
+    hr = ITextRange_SetRange(range, i, j);
+    ok(SUCCEEDED(hr), "got 0x%08x\n", hr);
+    hr = ITextRange_Move(range, tomCharacter, move_by, &delta);
+    if (expected_delta == 0) {
+        ok(hr == S_FALSE, "(%d,%d) move by %d got hr=0x%08x\n", i, j, move_by, hr);
+        ok(delta == 0, "(%d,%d) move by %d got delta %d\n", i, j, move_by, delta);
+        CHECK_RANGE(range, expected_location, expected_location);
+    } else {
+        ok(hr == S_OK, "(%d,%d) move by %d got hr=0x%08x\n", i, j, move_by, hr);
+        ok(delta == expected_delta, "(%d,%d) move by %d got delta %d\n", i, j, move_by, delta);
+        CHECK_RANGE(range, expected_location, expected_location);
+    }
+}
+
 static void test_character_movement(void)
 {
   static const char test_text1[] = "ab\n c";
@@ -3892,6 +3938,7 @@ static void test_character_movement(void)
           for (target = -2; target <= textlen + 3; target++) {
               test_character_moveend(range, textlen, i, j, target);
               test_character_movestart(range, textlen, i, j, target);
+              test_character_move(range, textlen, i, j, target);
           }
       }
   }