May 2015 - Wine-commits - list.winehq.org

André Hentschel : ntdll: Fix returning from various ARM assembler functions.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: c13be7446e52f2bc8d4779a00d32f7952451be5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13be7446e52f2bc8d4779a00… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 28 22:39:01 2015 +0200 ntdll: Fix returning from various ARM assembler functions. --- dlls/ntdll/signal_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 113139f..0c51c49 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -283,7 +283,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, "str PC, [r0, #0x40]\n\t" /* context->Pc */ "mrs r1, CPSR\n\t" "str r1, [r0, #0x44]\n\t" /* context->Cpsr */ - "mov PC, LR\n" + "bx lr" ) @@ -920,7 +920,7 @@ void signal_free_thread( TEB *teb ) extern void set_tpidrurw( TEB *teb ); __ASM_GLOBAL_FUNC( set_tpidrurw, "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ - "blx lr" ) + "bx lr" ) #else void set_tpidrurw( TEB *teb ) {

1 0

Alexandre Julliard : krnl386.exe: Release the Win16 lock when loading a 32-bit dll.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 3a2e7d1a3dbf42a0385e5c0f64d79e9ea054252e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2e7d1a3dbf42a0385e5c0f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:02:45 2015 +0900 krnl386.exe: Release the Win16 lock when loading a 32-bit dll. --- dlls/krnl386.exe16/ne_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index c0e1a98..70f8a46 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -981,8 +981,11 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if (strlen(basename) < sizeof(dllname)-6) { + DWORD count; char *q; + ReleaseThunkLock( &count ); + strcpy( dllname, basename ); q = strrchr( dllname, '.' ); if (!q) strcat( dllname, ".dll" ); @@ -1011,6 +1014,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ { WARN( "couldn't load owner %s for 16-bit dll %s\n", main_module, dllname ); FreeLibrary( mod32 ); + RestoreThunkLock( count ); return ERROR_FILE_NOT_FOUND; } /* check if module was loaded native */ @@ -1023,6 +1027,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ } } } + RestoreThunkLock( count ); /* loading the 32-bit library can have the side effect of loading the module */ /* if so, simply incr the ref count and return the module */

1 0

Damjan Jovanovic : qcap/tests: Fix SmartTeeFilter reference leaks from the pins in its test.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 6bc6b0bf71bd23fef8962c4e6be936454cd1ecab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc6b0bf71bd23fef8962c4e6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:03:03 2015 +0200 qcap/tests: Fix SmartTeeFilter reference leaks from the pins in its test. --- dlls/qcap/tests/qcap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 19177bd..39737f4 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -127,6 +127,7 @@ static void test_smart_tee_filter(void) while (IEnumPins_Next(enumPins, 1, &pin, NULL) == S_OK) { PIN_INFO pinInfo; + memset(&pinInfo, 0, sizeof(pinInfo)); hr = IPin_QueryPinInfo(pin, &pinInfo); ok(SUCCEEDED(hr), "QueryPinInfo failed, hr=%08x\n", hr); if (FAILED(hr)) @@ -154,6 +155,8 @@ static void test_smart_tee_filter(void) ok(0, "pin %d isn't supposed to exist\n", pinNumber); endwhile: + if (pinInfo.pFilter) + IBaseFilter_Release(pinInfo.pFilter); IPin_Release(pin); pinNumber++; }

1 0

Damjan Jovanovic : qcap/tests: Add many more SmartTee filter tests.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 5405c0feebd1e94e9812dc8d7cc71a2720c65449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5405c0feebd1e94e9812dc8d7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:07 2015 +0200 qcap/tests: Add many more SmartTee filter tests. --- dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/qcap.c | 73 ---- dlls/qcap/tests/smartteefilter.c | 806 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 808 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5405c0feebd1e94e9812d…

1 0

Damjan Jovanovic : qcap/tests: Add media tests for the SmartTee filter.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: d126fd53f7e2427071a70784178206eff0e21e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d126fd53f7e2427071a707841… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:18 2015 +0200 qcap/tests: Add media tests for the SmartTee filter. --- dlls/qcap/tests/smartteefilter.c | 772 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 758 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d126fd53f7e2427071a70…

1 0

Damjan Jovanovic : qcap/tests: Test SmartTee filter aggregation.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: e6307f1a4ba827b5f06fbe9c59013bb60e6cf276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6307f1a4ba827b5f06fbe9c5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:24 2015 +0200 qcap/tests: Test SmartTee filter aggregation. --- dlls/qcap/tests/smartteefilter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 126d798..83bcff9 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1532,12 +1532,28 @@ end: IEnumMediaTypes_Release(enumMediaTypes); } +static void test_smart_tee_filter_aggregation(void) +{ + SourceFilter *sourceFilter = create_SourceFilter(); + if (sourceFilter) { + IUnknown *unknown = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SmartTee, (IUnknown*)&sourceFilter->IBaseFilter_iface, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unknown); + todo_wine ok(SUCCEEDED(hr), "SmartTee filter doesn't support aggregation, hr=0x%08x\n", hr); + if (unknown) + IUnknown_Release(unknown); + IBaseFilter_Release(&sourceFilter->IBaseFilter_iface); + } else + ok(0, "out of memory allocating SourceFilter for test\n"); +} + START_TEST(smartteefilter) { if (SUCCEEDED(CoInitialize(NULL))) { event = CreateEventW(NULL, FALSE, FALSE, NULL); if (event) { + test_smart_tee_filter_aggregation(); test_smart_tee_filter(); CloseHandle(event); } else

1 0

Nikolay Sivov : riched20: Implement GetPara() for selection range.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: c1ce95dc961a16b8640151e856b92dbb36a52c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ce95dc961a16b8640151e85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 01:42:04 2015 +0300 riched20: Implement GetPara() for selection range. --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 14c4c8e..4d4ca89 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4031,11 +4031,16 @@ static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pF static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **para) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)->(%p)\n", This, para); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!para) + return E_INVALIDARG; + + return create_textpara((ITextRange*)me, para); } static HRESULT WINAPI ITextSelection_fnSetPara(ITextSelection *me, ITextPara *pPara) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7d90a98..0e08758 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1650,12 +1650,13 @@ static void test_GetPara(void) static const CHAR test_text1[] = "TestSomeText"; IRichEditOle *reOle = NULL; ITextDocument *doc = NULL; + ITextSelection *selection; ITextRange *range = NULL; ITextPara *para, *para2; HRESULT hr; HWND hwnd; - create_interfaces(&hwnd, &reOle, &doc, NULL); + create_interfaces(&hwnd, &reOle, &doc, &selection); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); EXPECT_REF(reOle, 3); @@ -1691,8 +1692,41 @@ static void test_GetPara(void) ITextPara_Release(para); ITextPara_Release(para2); - ITextRange_Release(range); + + EXPECT_REF(reOle, 3); + EXPECT_REF(doc, 3); + EXPECT_REF(selection, 2); + + hr = ITextSelection_GetPara(selection, &para); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(reOle, 3); + EXPECT_REF(doc, 3); + EXPECT_REF(selection, 3); + EXPECT_REF(para, 1); + + hr = ITextSelection_GetPara(selection, &para2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(para != para2, "got %p, %p\n", para, para2); + + ITextPara_Release(para); + ITextPara_Release(para2); release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_GetPara(range, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_GetPara(range, &para); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetPara(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetPara(selection, &para); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); } static void test_dispatch(void)

1 0

Nikolay Sivov : riched20: Implement InRange().
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: cebee9bd71fefdb2e54d21a01b7ffb1bf5e3cf5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebee9bd71fefdb2e54d21a01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 02:16:26 2015 +0300 riched20: Implement InRange(). --- dlls/riched20/richole.c | 51 ++++++++++++++++--- dlls/riched20/tests/richole.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 4d4ca89..cbd3060 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1748,14 +1748,36 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG cpActive, LONG return E_NOTIMPL; } -static HRESULT WINAPI ITextRange_fnInRange(ITextRange *me, ITextRange *pRange, LONG *pb) +static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret) +{ + LONG from, to, v; + + if (!ret) + ret = &v; + + ITextRange_GetStart(range, &from); + ITextRange_GetEnd(range, &to); + + *ret = (start >= from && end <= to) ? tomTrue : tomFalse; + return *ret == tomTrue ? S_OK : S_FALSE; +} + +static HRESULT WINAPI ITextRange_fnInRange(ITextRange *me, ITextRange *range, LONG *ret) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)->(%p %p)\n", This, range, ret); + + if (ret) + *ret = tomFalse; + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!range) + return S_FALSE; + + return textrange_inrange(This->start, This->end, range, ret); } static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, LONG *pb) @@ -4129,14 +4151,31 @@ static HRESULT WINAPI ITextSelection_fnSetRange(ITextSelection *me, LONG cpActiv return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnInRange(ITextSelection *me, ITextRange *pRange, LONG *pb) +static HRESULT WINAPI ITextSelection_fnInRange(ITextSelection *me, ITextRange *range, LONG *ret) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextSelection *selection = NULL; + LONG start, end; + + TRACE("(%p)->(%p %p)\n", This, range, ret); + + if (ret) + *ret = tomFalse; + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!range) + return S_FALSE; + + ITextRange_QueryInterface(range, &IID_ITextSelection, (void**)&selection); + if (!selection) + return S_FALSE; + ITextSelection_Release(selection); + + ITextSelection_GetStart(me, &start); + ITextSelection_GetEnd(me, &end); + return textrange_inrange(start, end, range, ret); } static HRESULT WINAPI ITextSelection_fnInStory(ITextSelection *me, ITextRange *pRange, LONG *pb) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 0e08758..359a8cb 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2521,6 +2521,116 @@ static void test_SetText(void) ITextRange_Release(range); } +static void test_InRange(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + ITextRange *range, *range2, *range3; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextDocument_Range(doc, 0, 4, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* matches selection */ + hr = ITextDocument_Range(doc, 1, 2, &range3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_InRange(range, NULL, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextRange_InRange(range, NULL, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextRange_InRange(range, range2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = tomFalse; + hr = ITextRange_InRange(range, range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomTrue, "got %d\n", value); + + /* selection */ + hr = ITextSelection_InRange(selection, NULL, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_InRange(selection, NULL, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextSelection_InRange(selection, range2, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_InRange(selection, range2, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + value = tomTrue; + hr = ITextSelection_InRange(selection, range3, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + /* seems to work on ITextSelection ranges only */ + value = tomFalse; + hr = ITextSelection_InRange(selection, (ITextRange*)selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomTrue, "got %d\n", value); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_InRange(range, NULL, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextRange_InRange(range, NULL, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextRange_InRange(range, range2, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextRange_InRange(range, range2, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + /* selection */ + hr = ITextSelection_InRange(selection, NULL, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_InRange(selection, NULL, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextSelection_InRange(selection, range2, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_InRange(selection, range2, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + ITextRange_Release(range); + ITextRange_Release(range2); + ITextRange_Release(range3); + ITextSelection_Release(selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2548,4 +2658,5 @@ START_TEST(richole) test_ITextFont(); test_Delete(); test_SetText(); + test_InRange(); }

1 0

Nikolay Sivov : riched20: Implement IsEqual() for ranges.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 6ccfde327aa9f985e7450af233c2978a0fc4b0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccfde327aa9f985e7450af23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 02:24:01 2015 +0300 riched20: Implement IsEqual() for ranges. --- dlls/riched20/richole.c | 51 ++++++++++++++++--- dlls/riched20/tests/richole.c | 116 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index cbd3060..db002a9 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1790,14 +1790,36 @@ static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, L return E_NOTIMPL; } -static HRESULT WINAPI ITextRange_fnIsEqual(ITextRange *me, ITextRange *pRange, LONG *pb) +static HRESULT textrange_isequal(LONG start, LONG end, ITextRange *range, LONG *ret) +{ + LONG from, to, v; + + if (!ret) + ret = &v; + + ITextRange_GetStart(range, &from); + ITextRange_GetEnd(range, &to); + + *ret = (start == from && end == to) ? tomTrue : tomFalse; + return *ret == tomTrue ? S_OK : S_FALSE; +} + +static HRESULT WINAPI ITextRange_fnIsEqual(ITextRange *me, ITextRange *range, LONG *ret) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)->(%p %p)\n", This, range, ret); + + if (ret) + *ret = tomFalse; + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!range) + return S_FALSE; + + return textrange_isequal(This->start, This->end, range, ret); } static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) @@ -4188,14 +4210,31 @@ static HRESULT WINAPI ITextSelection_fnInStory(ITextSelection *me, ITextRange *p return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *pRange, LONG *pb) +static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *range, LONG *ret) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextSelection *selection = NULL; + LONG start, end; + + TRACE("(%p)->(%p %p)\n", This, range, ret); + + if (ret) + *ret = tomFalse; + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!range) + return S_FALSE; + + ITextRange_QueryInterface(range, &IID_ITextSelection, (void**)&selection); + if (!selection) + return S_FALSE; + ITextSelection_Release(selection); + + ITextSelection_GetStart(me, &start); + ITextSelection_GetEnd(me, &end); + return textrange_isequal(start, end, range, ret); } static HRESULT WINAPI ITextSelection_fnSelect(ITextSelection *me) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 359a8cb..f4bf6f9 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2631,6 +2631,121 @@ static void test_InRange(void) ITextSelection_Release(selection); } +static void test_ITextRange_IsEqual(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + ITextRange *range, *range2, *range3; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextDocument_Range(doc, 0, 4, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* matches selection */ + hr = ITextDocument_Range(doc, 1, 2, &range3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_IsEqual(range, NULL, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextRange_IsEqual(range, NULL, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextRange_IsEqual(range, range2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = tomFalse; + hr = ITextRange_IsEqual(range, range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomTrue, "got %d\n", value); + + value = tomTrue; + hr = ITextRange_IsEqual(range, range3, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + /* selection */ + hr = ITextSelection_IsEqual(selection, NULL, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_IsEqual(selection, NULL, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextSelection_IsEqual(selection, range2, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_IsEqual(selection, range2, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + value = tomTrue; + hr = ITextSelection_IsEqual(selection, range3, &value); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + /* seems to work on ITextSelection ranges only */ + value = tomFalse; + hr = ITextSelection_IsEqual(selection, (ITextRange*)selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomTrue, "got %d\n", value); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_IsEqual(range, NULL, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextRange_IsEqual(range, NULL, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextRange_IsEqual(range, range2, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextRange_IsEqual(range, range2, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + /* selection */ + hr = ITextSelection_IsEqual(selection, NULL, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_IsEqual(selection, NULL, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextSelection_IsEqual(selection, range2, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = tomTrue; + hr = ITextSelection_IsEqual(selection, range2, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + ITextRange_Release(range); + ITextRange_Release(range2); + ITextRange_Release(range3); + ITextSelection_Release(selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2659,4 +2774,5 @@ START_TEST(richole) test_Delete(); test_SetText(); test_InRange(); + test_ITextRange_IsEqual(); }

1 0

Nikolay Sivov : riched20: Implement Select().
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: cb095a82a25b3b296227de5c3e3de588d801d1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb095a82a25b3b296227de5c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 02:36:49 2015 +0300 riched20: Implement Select(). --- dlls/riched20/richole.c | 14 ++++++++++---- dlls/riched20/tests/richole.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index db002a9..e25f2ea 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1825,11 +1825,14 @@ static HRESULT WINAPI ITextRange_fnIsEqual(ITextRange *me, ITextRange *range, LO static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)\n", This); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + ME_SetSelection(This->reOle->editor, This->start, This->end); + return S_OK; } static HRESULT WINAPI ITextRange_fnStartOf(ITextRange *me, LONG Unit, LONG Extend, @@ -4240,11 +4243,14 @@ static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *r static HRESULT WINAPI ITextSelection_fnSelect(ITextSelection *me) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)\n", This); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + /* nothing to do */ + return S_OK; } static HRESULT WINAPI ITextSelection_fnStartOf(ITextSelection *me, LONG Unit, LONG Extend, diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f4bf6f9..33a433a 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2746,6 +2746,50 @@ static void test_ITextRange_IsEqual(void) ITextSelection_Release(selection); } +static void test_Select(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + ITextRange *range; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_Select(range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 1; + hr = ITextSelection_GetStart(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + hr = ITextRange_Select(range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextSelection_Select(selection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_Select(range); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_Select(selection); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextRange_Release(range); + ITextSelection_Release(selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2775,4 +2819,5 @@ START_TEST(richole) test_SetText(); test_InRange(); test_ITextRange_IsEqual(); + test_Select(); }

1 0