Jactry Zeng : riched20: Implement ITextSelection::GetChar.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Sep 15 13:36:22 CDT 2014
Module: wine
Branch: master
Commit: 329252f88b6dc2d93df8f7b0320418b504182639
URL: http://source.winehq.org/git/wine.git/?a=commit;h=329252f88b6dc2d93df8f7b0320418b504182639
Author: Jactry Zeng <wine at jactry.com>
Date: Tue Sep 16 00:13:51 2014 +0800
riched20: Implement ITextSelection::GetChar.
---
dlls/riched20/richole.c | 9 ++++++--
dlls/riched20/tests/richole.c | 49 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 6a00016..963368f 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1569,11 +1569,16 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr)
static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
+ ME_Cursor *start = NULL, *end = NULL;
+
if (!This->reOle)
return CO_E_RELEASED;
+ TRACE("%p\n", pch);
+ if (!pch)
+ return E_INVALIDARG;
- FIXME("not implemented\n");
- return E_NOTIMPL;
+ ME_GetSelection(This->reOle->editor, &start, &end);
+ return range_GetChar(This->reOle->editor, start, pch);
}
static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index f85de2d..2e9b45a 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -583,6 +583,54 @@ static void test_ITextRange_GetChar(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
+static void test_ITextSelection_GetChar(void)
+{
+ HWND w;
+ IRichEditOle *reOle = NULL;
+ ITextDocument *txtDoc = NULL;
+ ITextSelection *txtSel = NULL;
+ HRESULT hres;
+ LONG pch = 0xdeadbeef;
+ int first, lim;
+ static const CHAR test_text1[] = "TestSomeText";
+
+ create_interfaces(&w, &reOle, &txtDoc, &txtSel);
+ SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1);
+
+ first = 0, lim = 4;
+ SendMessageA(w, EM_SETSEL, first, lim);
+ pch = 0xdeadbeef;
+ hres = ITextSelection_GetChar(txtSel, &pch);
+ ok(hres == S_OK, "ITextSelection_GetChar\n");
+ ok(pch == 'T', "got wrong char: %c\n", pch);
+
+ first = 0, lim = 0;
+ SendMessageA(w, EM_SETSEL, first, lim);
+ pch = 0xdeadbeef;
+ hres = ITextSelection_GetChar(txtSel, &pch);
+ ok(hres == S_OK, "ITextSelection_GetChar\n");
+ ok(pch == 'T', "got wrong char: %c\n", pch);
+
+ first = 12, lim = 12;
+ SendMessageA(w, EM_SETSEL, first, lim);
+ pch = 0xdeadbeef;
+ hres = ITextSelection_GetChar(txtSel, &pch);
+ ok(hres == S_OK, "ITextSelection_GetChar\n");
+ ok(pch == '\r', "got wrong char: %c\n", pch);
+
+ first = 13, lim = 13;
+ SendMessageA(w, EM_SETSEL, first, lim);
+ pch = 0xdeadbeef;
+ hres = ITextSelection_GetChar(txtSel, &pch);
+ ok(hres == S_OK, "ITextSelection_GetChar\n");
+ ok(pch == '\r', "got wrong char: %c\n", pch);
+
+ hres = ITextSelection_GetChar(txtSel, NULL);
+ ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n");
+
+ release_interfaces(&w, &reOle, &txtDoc, &txtSel);
+}
+
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -593,6 +641,7 @@ START_TEST(richole)
test_Interfaces();
test_ITextDocument_Open();
test_ITextSelection_GetText();
+ test_ITextSelection_GetChar();
test_ITextDocument_Range();
test_ITextRange_GetChar();
}
More information about the wine-cvs
mailing list