Module: wine Branch: master Commit: 840af642dbf8a222fdd9f40256db0a84c5279fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=840af642dbf8a222fdd9f4025...
Author: Gijs Vermeulen gijsvrm@gmail.com Date: Mon Apr 15 12:14:15 2019 +0200
riched20: Handle tomEnd in ITextRange::ScrollIntoView.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46899 Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/riched20/richole.c | 4 ++++ dlls/riched20/tests/richole.c | 4 ++++ 2 files changed, 8 insertions(+)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 93003eb..4b47310 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2485,6 +2485,10 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) ME_CursorFromCharOfs(editor, This->start, &cursor); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; + case tomEnd: + ME_CursorFromCharOfs(editor, This->end, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; default: FIXME("bStart value %d not handled\n", value); return E_NOTIMPL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d9c7fa1..40feb76 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -853,15 +853,19 @@ static void test_ITextRange_ScrollIntoView(void)
/* Scroll to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0);
/* Scroll to the bottom. */ check_range(w, txtDoc, 19, 20, tomStart, 1); + check_range(w, txtDoc, 19, 20, tomEnd, 1);
/* Back up to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0);
/* Large range */ check_range(w, txtDoc, 0, 20, tomStart, 0); + check_range(w, txtDoc, 0, 20, tomEnd, 1);
hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres);