ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: A bit more tests for GetChar(), improve tracing.

This commit is contained in:
Nikolay Sivov 2015-05-27 10:10:24 +03:00 committed by Alexandre Julliard
parent cb095a82a2
commit 6a335ca5da
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/riched20/richole.c
View File

@ -1468,9 +1468,11 @@ static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch)
ITextRangeImpl *This = impl_from_ITextRange(me);
ME_Cursor cursor;
TRACE("(%p)->(%p)\n", This, pch);
if (!This->reOle)
return CO_E_RELEASED;
TRACE("%p\n", pch);
if (!pch)
return E_INVALIDARG;
@ -3934,9 +3936,11 @@ static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch)
ITextSelectionImpl *This = impl_from_ITextSelection(me);
ME_Cursor *start = NULL, *end = NULL;
TRACE("(%p)->(%p)\n", This, pch);
if (!This->reOle)
return CO_E_RELEASED;
TRACE("%p\n", pch);
if (!pch)
return E_INVALIDARG;

24
dlls/riched20/tests/richole.c
View File

@ -683,7 +683,7 @@ static void test_ITextRange_GetChar(void)
ITextDocument *txtDoc = NULL;
ITextRange *txtRge = NULL;
HRESULT hres;
LONG pch = 0xdeadbeef;
LONG pch;
int first, lim;
static const CHAR test_text1[] = "TestSomeText";
@ -742,8 +742,16 @@ static void test_ITextRange_GetChar(void)
ok(hres == S_OK, "got 0x%08x\n", hres);
hres = ITextRange_GetChar(txtRge, NULL);
ok(hres == E_INVALIDARG, "ITextRange_GetChar\n");
ITextRange_Release(txtRge);
release_interfaces(&w, &reOle, &txtDoc, NULL);
hres = ITextRange_GetChar(txtRge, NULL);
ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres);
hres = ITextRange_GetChar(txtRge, &pch);
ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres);
ITextRange_Release(txtRge);
}
static void test_ITextSelection_GetChar(void)
@ -753,7 +761,7 @@ static void test_ITextSelection_GetChar(void)
ITextDocument *txtDoc = NULL;
ITextSelection *txtSel = NULL;
HRESULT hres;
LONG pch = 0xdeadbeef;
LONG pch;
int first, lim;
static const CHAR test_text1[] = "TestSomeText";
@ -791,7 +799,15 @@ static void test_ITextSelection_GetChar(void)
hres = ITextSelection_GetChar(txtSel, NULL);
ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n");
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
release_interfaces(&w, &reOle, &txtDoc, NULL);
hres = ITextSelection_GetChar(txtSel, NULL);
ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres);
hres = ITextSelection_GetChar(txtSel, &pch);
ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres);
ITextSelection_Release(txtSel);
}
static void test_ITextRange_GetStart_GetEnd(void)