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

Nikolay Sivov : riched20: Implement GetText() for regular range.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: b2e13bc6e746904aa413620929de994165a8853f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e13bc6e746904aa41362092… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:40:29 2015 +0300 riched20: Implement GetText() for regular range. --- dlls/riched20/richole.c | 28 +++++++++++++++++++++++----- dlls/riched20/tests/richole.c | 20 ++++++-------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5b8cad5..5b921fe 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1563,20 +1563,38 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R return hr; } -static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *pbstr) +static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *str) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_Cursor start, end; + int length; + BOOL bEOP; - FIXME("(%p)->(%p): stub\n", This, pbstr); + TRACE("(%p)->(%p)\n", This, str); if (!This->reOle) return CO_E_RELEASED; - if (!pbstr) + if (!str) return E_INVALIDARG; - *pbstr = NULL; - return E_NOTIMPL; + /* return early for degenerate range */ + if (This->start == This->end) { + *str = NULL; + return S_OK; + } + + ME_CursorFromCharOfs(This->reOle->editor, This->start, &start); + ME_CursorFromCharOfs(This->reOle->editor, This->end, &end); + + length = This->end - This->start; + *str = SysAllocStringLen(NULL, length); + if (!*str) + return E_OUTOFMEMORY; + + bEOP = (end.pRun->next->type == diTextEnd && This->end > ME_GetTextLength(This->reOle->editor)); + ME_GetTextW(This->reOle->editor, *str, length, &start, length, FALSE, bEOP); + return S_OK; } static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 02aaefb..79c3c3d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -544,27 +544,24 @@ static void test_GetText(void) hres = ITextDocument_Range(txtDoc, 0, 4, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 4, 0, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 1, 1, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); if (!is64bit) @@ -577,37 +574,33 @@ todo_wine hres = ITextDocument_Range(txtDoc, 8, 12, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW3), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 8, 13, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW2), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 12, 13, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW5), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 0, -1, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); ITextRange_Release(range); @@ -615,10 +608,9 @@ todo_wine hres = ITextDocument_Range(txtDoc, -1, 9, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW6), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); release_interfaces(&w, &reOle, &txtDoc, NULL);

1 0

Nikolay Sivov : riched20/tests: Small test for GetClientSite().
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 383dbeedd75278f3a9369527d8914c02f702798f URL: http://source.winehq.org/git/wine.git/?a=commit;h=383dbeedd75278f3a9369527d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:50:25 2015 +0300 riched20/tests: Small test for GetClientSite(). --- dlls/riched20/tests/richole.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 79c3c3d..0fc4169 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1473,7 +1473,7 @@ static void test_ITextSelection_Collapse(void) ITextSelection_Release(txtSel); } -static void test_IOleClientSite_QueryInterface(void) +static void test_GetClientSite(void) { HWND w; IRichEditOle *reOle = NULL, *reOle1 = NULL; @@ -1487,17 +1487,24 @@ static void test_IOleClientSite_QueryInterface(void) create_interfaces(&w, &reOle, &txtDoc, NULL); hres = IRichEditOle_GetClientSite(reOle, &clientSite); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); - refcount1 = get_refcount((IUnknown *)clientSite); - todo_wine ok(refcount1 == 1, "got wrong ref count: %d\n", refcount1); + +todo_wine + EXPECT_REF(clientSite, 1); hres = IOleClientSite_QueryInterface(clientSite, &IID_IRichEditOle, (void **)&reOle1); ok(hres == E_NOINTERFACE, "IOleClientSite_QueryInterface: %x\n", hres); + hres = IRichEditOle_GetClientSite(reOle, &clientSite1); + ok(hres == S_OK, "got 0x%08x\n", hres); +todo_wine + ok(clientSite != clientSite1, "got %p, %p\n", clientSite, clientSite1); + IOleClientSite_Release(clientSite1); + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleClientSite, (void **)&clientSite1); ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); ok(clientSite == clientSite1, "Should not return a new pointer.\n"); - refcount1 = get_refcount((IUnknown *)clientSite); - todo_wine ok(refcount1 == 2, "got wrong ref count: %d\n", refcount1); +todo_wine + EXPECT_REF(clientSite, 2); /* IOleWindow interface */ hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin); @@ -3087,7 +3094,7 @@ START_TEST(richole) test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); - test_IOleClientSite_QueryInterface(); + test_GetClientSite(); test_IOleWindow_GetWindow(); test_IOleInPlaceSite_GetWindow(); test_GetFont();

1 0

Nikolay Sivov : riched20: Move data linking text range to IRichEditOle in separate structure.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: b620fb6e85a9d750d4519bf886d454c00652a38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b620fb6e85a9d750d4519bf88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:51:11 2015 +0300 riched20: Move data linking text range to IRichEditOle in separate structure. --- dlls/riched20/richole.c | 167 ++++++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b620fb6e85a9d750d4519…

1 0

Nikolay Sivov : riched20: Properly implement GetClientSite().
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 41687841bc3ef7a4140a5ad50a31b9c2949ca5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41687841bc3ef7a4140a5ad50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:54:40 2015 +0300 riched20: Properly implement GetClientSite(). --- dlls/riched20/richole.c | 80 +++++++++++++++++++++++++------------------ dlls/riched20/tests/richole.c | 4 --- 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index d637292..7c50304 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -214,8 +214,9 @@ typedef struct IRichEditOleImpl { ME_TextEditor *editor; ITextSelectionImpl *txtSel; - IOleClientSiteImpl *clientSite; + struct list rangelist; + struct list clientsites; } IRichEditOleImpl; struct reole_child { @@ -255,12 +256,11 @@ typedef struct ITextParaImpl { } ITextParaImpl; struct IOleClientSiteImpl { + struct reole_child child; IOleClientSite IOleClientSite_iface; IOleWindow IOleWindow_iface; IOleInPlaceSite IOleInPlaceSite_iface; LONG ref; - - IRichEditOleImpl *reOle; }; static inline IRichEditOleImpl *impl_from_IRichEditOle(IRichEditOle *iface) @@ -940,15 +940,20 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) if (!ref) { + IOleClientSiteImpl *clientsite; ITextRangeImpl *txtRge; TRACE("Destroying %p\n", This); This->txtSel->reOle = NULL; This->editor->reOle = NULL; ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, child.entry) txtRge->child.reole = NULL; + + LIST_FOR_EACH_ENTRY(clientsite, &This->clientsites, IOleClientSiteImpl, child.entry) + clientsite->child.reole = NULL; + heap_free(This); } return ref; @@ -1039,34 +1044,43 @@ IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) static ULONG WINAPI IOleClientSite_fnAddRef(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI IOleClientSite_fnRelease(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) { + if (This->child.reole) { + list_remove(&This->child.entry); + This->child.reole = NULL; + } heap_free(This); + } return ref; } static HRESULT WINAPI IOleClientSite_fnSaveObject(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); return E_NOTIMPL; } - static HRESULT WINAPI IOleClientSite_fnGetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1077,7 +1091,7 @@ static HRESULT WINAPI IOleClientSite_fnGetContainer(IOleClientSite *iface, IOleContainer **ppContainer) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1087,7 +1101,7 @@ static HRESULT WINAPI IOleClientSite_fnGetContainer(IOleClientSite *iface, static HRESULT WINAPI IOleClientSite_fnShowObject(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1097,7 +1111,7 @@ static HRESULT WINAPI IOleClientSite_fnShowObject(IOleClientSite *iface) static HRESULT WINAPI IOleClientSite_fnOnShowWindow(IOleClientSite *iface, BOOL fShow) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1107,7 +1121,7 @@ static HRESULT WINAPI IOleClientSite_fnOnShowWindow(IOleClientSite *iface, BOOL static HRESULT WINAPI IOleClientSite_fnRequestNewObjectLayout(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); - if (!This->reOle) + if (!This->child.reole) return CO_E_RELEASED; FIXME("stub %p\n", iface); @@ -1155,12 +1169,16 @@ static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) { IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + TRACE("(%p)->(%p)\n", This, phwnd); + if (!This->child.reole) + return CO_E_RELEASED; + if (!phwnd) return E_INVALIDARG; - *phwnd = This->reOle->editor->hWnd; + *phwnd = This->child.reole->editor->hWnd; return S_OK; } @@ -1294,34 +1312,35 @@ static const IOleInPlaceSiteVtbl olestvt = IOleInPlaceSite_fnOnPosRectChange }; -static IOleClientSiteImpl * -CreateOleClientSite(IRichEditOleImpl *reOle) +static HRESULT CreateOleClientSite(IRichEditOleImpl *reOle, IOleClientSite **ret) { IOleClientSiteImpl *clientSite = heap_alloc(sizeof *clientSite); + if (!clientSite) - return NULL; + return E_OUTOFMEMORY; clientSite->IOleClientSite_iface.lpVtbl = &ocst; clientSite->IOleWindow_iface.lpVtbl = &olewinvt; clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt; clientSite->ref = 1; - clientSite->reOle = reOle; - return clientSite; + clientSite->child.reole = reOle; + list_add_head(&reOle->clientsites, &clientSite->child.entry); + + *ret = &clientSite->IOleClientSite_iface; + return S_OK; } static HRESULT WINAPI -IRichEditOle_fnGetClientSite(IRichEditOle *me, - LPOLECLIENTSITE *lplpolesite) +IRichEditOle_fnGetClientSite(IRichEditOle *me, IOleClientSite **clientsite) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); - TRACE("%p,%p\n",This, lplpolesite); + TRACE("(%p)->(%p)\n", This, clientsite); - if(!lplpolesite) + if (!clientsite) return E_INVALIDARG; - *lplpolesite = &This->clientSite->IOleClientSite_iface; - IOleClientSite_AddRef(*lplpolesite); - return S_OK; + + return CreateOleClientSite(This, clientsite); } static HRESULT WINAPI @@ -4964,15 +4983,10 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p heap_free(reo); return 0; } - reo->clientSite = CreateOleClientSite(reo); - if (!reo->clientSite) - { - ITextSelection_Release(&reo->txtSel->ITextSelection_iface); - heap_free(reo); - return 0; - } + TRACE("Created %p\n",reo); list_init(&reo->rangelist); + list_init(&reo->clientsites); if (outer_unk) reo->outer_unk = outer_unk; else diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 0fc4169..318b386 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1487,8 +1487,6 @@ static void test_GetClientSite(void) create_interfaces(&w, &reOle, &txtDoc, NULL); hres = IRichEditOle_GetClientSite(reOle, &clientSite); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); - -todo_wine EXPECT_REF(clientSite, 1); hres = IOleClientSite_QueryInterface(clientSite, &IID_IRichEditOle, (void **)&reOle1); @@ -1496,14 +1494,12 @@ todo_wine hres = IRichEditOle_GetClientSite(reOle, &clientSite1); ok(hres == S_OK, "got 0x%08x\n", hres); -todo_wine ok(clientSite != clientSite1, "got %p, %p\n", clientSite, clientSite1); IOleClientSite_Release(clientSite1); hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleClientSite, (void **)&clientSite1); ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); ok(clientSite == clientSite1, "Should not return a new pointer.\n"); -todo_wine EXPECT_REF(clientSite, 2); /* IOleWindow interface */

1 0

Nikolay Sivov : riched20: Create selection instance first time it' s requested.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: f0c508661816a5e6f6221e88ddea6e0151a189ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c508661816a5e6f6221e88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:56:45 2015 +0300 riched20: Create selection instance first time it's requested. --- dlls/riched20/richole.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 7c50304..f3a4a01 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -310,6 +310,7 @@ static inline ITextParaImpl *impl_from_ITextPara(ITextPara *iface) static HRESULT create_textfont(ITextRange*, const ITextFontImpl*, ITextFont**); static HRESULT create_textpara(ITextRange*, ITextPara**); +static ITextSelectionImpl *CreateTextSelection(IRichEditOleImpl*); static void textranges_update_ranges(IRichEditOleImpl *reole, LONG start, LONG end, enum range_update_op op) { @@ -943,10 +944,11 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) IOleClientSiteImpl *clientsite; ITextRangeImpl *txtRge; - TRACE("Destroying %p\n", This); - This->txtSel->reOle = NULL; This->editor->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); + if (This->txtSel) { + This->txtSel->reOle = NULL; + ITextSelection_Release(&This->txtSel->ITextSelection_iface); + } LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, child.entry) txtRge->child.reole = NULL; @@ -3790,15 +3792,25 @@ ITextDocument_fnGetName(ITextDocument* me, BSTR* pName) } static HRESULT WINAPI -ITextDocument_fnGetSelection(ITextDocument* me, ITextSelection** ppSel) +ITextDocument_fnGetSelection(ITextDocument *me, ITextSelection **selection) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - TRACE("(%p)\n", me); - if(!ppSel) + TRACE("(%p)->(%p)\n", me, selection); + + if (!selection) return E_INVALIDARG; - *ppSel = &This->txtSel->ITextSelection_iface; - ITextSelection_AddRef(*ppSel); + + if (!This->txtSel) { + This->txtSel = CreateTextSelection(This); + if (!This->txtSel) { + *selection = NULL; + return E_OUTOFMEMORY; + } + } + + *selection = &This->txtSel->ITextSelection_iface; + ITextSelection_AddRef(*selection); return S_OK; } @@ -4977,12 +4989,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->ITextDocument_iface.lpVtbl = &tdvt; reo->ref = 1; reo->editor = editor; - reo->txtSel = CreateTextSelection(reo); - if (!reo->txtSel) - { - heap_free(reo); - return 0; - } + reo->txtSel = NULL; TRACE("Created %p\n",reo); list_init(&reo->rangelist);

1 0

Nikolay Sivov : mmdevapi: Return interface pointers instead of impl pointers.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 336cc787446a7b04f79415aec292a53e2a3844ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=336cc787446a7b04f79415aec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 23:12:25 2015 +0300 mmdevapi: Return interface pointers instead of impl pointers. --- dlls/mmdevapi/audiovolume.c | 31 ++++++++++++++++--------------- dlls/mmdevapi/devenum.c | 10 +++++----- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 194cfa3..7dddbdf 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl; - typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; @@ -52,18 +50,6 @@ static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx * return CONTAINING_RECORD(iface, AEVImpl, IAudioEndpointVolumeEx_iface); } -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) -{ - AEVImpl *This; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); - *ppv = (IAudioEndpointVolume*)This; - if (!This) - return E_OUTOFMEMORY; - This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; - This->ref = 1; - return S_OK; -} - static void AudioEndpointVolume_Destroy(AEVImpl *This) { HeapFree(GetProcessHeap(), 0, This); @@ -79,7 +65,7 @@ static HRESULT WINAPI AEV_QueryInterface(IAudioEndpointVolumeEx *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioEndpointVolume) || IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) { - *ppv = This; + *ppv = &This->IAudioEndpointVolumeEx_iface; } else return E_NOINTERFACE; @@ -286,3 +272,18 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRange, AEV_GetVolumeRangeChannel }; + +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +{ + AEVImpl *This; + + *ppv = NULL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; + This->ref = 1; + + *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + return S_OK; +} diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1952bda..d50d206 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -551,7 +551,7 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDevice)) - *ppv = This; + *ppv = &This->IMMDevice_iface; else if (IsEqualIID(riid, &IID_IMMEndpoint)) *ppv = &This->IMMEndpoint_iface; if (*ppv) @@ -797,7 +797,7 @@ static HRESULT WINAPI MMDevCol_QueryInterface(IMMDeviceCollection *iface, REFIID return E_POINTER; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDeviceCollection)) - *ppv = This; + *ppv = &This->IMMDeviceCollection_iface; else *ppv = NULL; if (!*ppv) @@ -897,7 +897,7 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) load_driver_devices(eRender); load_driver_devices(eCapture); } - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IMMDeviceEnumerator_QueryInterface(&This->IMMDeviceEnumerator_iface, riid, ppv); } void MMDevEnum_Free(void) @@ -920,7 +920,7 @@ static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFII return E_POINTER; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDeviceEnumerator)) - *ppv = This; + *ppv = &This->IMMDeviceEnumerator_iface; else *ppv = NULL; if (!*ppv) @@ -1345,7 +1345,7 @@ static HRESULT WINAPI MMDevPropStore_QueryInterface(IPropertyStore *iface, REFII return E_POINTER; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPropertyStore)) - *ppv = This; + *ppv = &This->IPropertyStore_iface; else *ppv = NULL; if (!*ppv)

1 0

Nikolay Sivov : ole32: Avoid potential null pointer access (Coverity).
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 5c0e48e8ca523dece3d2556a223c1d675abbedbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0e48e8ca523dece3d2556a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 15:03:50 2015 +0300 ole32: Avoid potential null pointer access (Coverity). --- dlls/ole32/moniker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 6f7afa0..fee205c 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1211,10 +1211,10 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) res=StgOpenStorage(filePathName,NULL,STGM_READ | STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - if (SUCCEEDED(res)) + if (SUCCEEDED(res)) { res=ReadClassStg(pstg,pclsid); - - IStorage_Release(pstg); + IStorage_Release(pstg); + } return res; }

1 0

Nikolay Sivov : ole32: Initialize returned value for disconnected case too in proxy_manager_get_remunknown () (Coverity).
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 7c5f639cb86fba26a3b96d9dd0798fd3da2150a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f639cb86fba26a3b96d9dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 17:51:52 2015 +0300 ole32: Initialize returned value for disconnected case too in proxy_manager_get_remunknown() (Coverity). --- dlls/ole32/marshal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index c5c2023..cc8d6fe 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1045,8 +1045,11 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk IRemUnknown_AddRef(*remunk); } else if (!This->parent) + { /* disconnected - we can't create IRemUnknown */ + *remunk = NULL; hr = S_FALSE; + } else { STDOBJREF stdobjref;

1 0

Nikolay Sivov : oleaut32: Implemented a couple more proxy/stub methods.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 0bed1bfd9344daef219a7a4b2fa3193426fc4fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bed1bfd9344daef219a7a4b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 12:31:30 2015 +0300 oleaut32: Implemented a couple more proxy/stub methods. --- dlls/oleaut32/usrmarshal.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index e86b577..39a5f8c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2313,15 +2313,17 @@ void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy( IAdviseSinkEx* This, DWORD dwViewStatus) { - FIXME("not implemented\n"); + TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + IAdviseSinkEx_RemoteOnViewStatusChange_Proxy(This, dwViewStatus); } HRESULT __RPC_STUB IAdviseSinkEx_OnViewStatusChange_Stub( IAdviseSinkEx* This, DWORD dwViewStatus) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + IAdviseSinkEx_OnViewStatusChange(This, dwViewStatus); + return S_OK; } HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( @@ -2330,8 +2332,14 @@ HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( IOleUndoUnit **rgElt, ULONG *pcEltFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + ULONG fetched; + + TRACE("(%u, %p %p)\n", cElt, rgElt, pcEltFetched); + + if (!pcEltFetched) + pcEltFetched = &fetched; + + return IEnumOleUndoUnits_RemoteNext_Proxy(This, cElt, rgElt, pcEltFetched); } HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub( @@ -2340,8 +2348,16 @@ HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub( IOleUndoUnit **rgElt, ULONG *pcEltFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u, %p, %p)\n", cElt, rgElt, pcEltFetched); + + *pcEltFetched = 0; + hr = IEnumOleUndoUnits_Next(This, cElt, rgElt, pcEltFetched); + if (hr == S_OK) + *pcEltFetched = cElt; + + return hr; } HRESULT CALLBACK IQuickActivate_QuickActivate_Proxy(

1 0

Nikolay Sivov : ole32: Implemented some proxy/stubs methods.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 10c878a45170a41cb80c4bcc793e71aed8612ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c878a45170a41cb80c4bcc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 12:50:07 2015 +0300 ole32: Implemented some proxy/stubs methods. --- dlls/ole32/usrmarshal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 7875bef..2cb97f3 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -3011,15 +3011,15 @@ HRESULT CALLBACK IOleInPlaceActiveObject_TranslateAccelerator_Proxy( IOleInPlaceActiveObject* This, LPMSG lpmsg) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p %p)\n", This, lpmsg); + return IOleInPlaceActiveObject_RemoteTranslateAccelerator_Proxy(This); } HRESULT __RPC_STUB IOleInPlaceActiveObject_TranslateAccelerator_Stub( IOleInPlaceActiveObject* This) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return S_FALSE; } HRESULT CALLBACK IOleInPlaceActiveObject_ResizeBorder_Proxy( @@ -3049,8 +3049,8 @@ HRESULT CALLBACK IOleCache2_UpdateCache_Proxy( DWORD grfUpdf, LPVOID pReserved) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p, 0x%08x, %p)\n", This, pDataObject, grfUpdf, pReserved); + return IOleCache2_RemoteUpdateCache_Proxy(This, pDataObject, grfUpdf, (LONG_PTR)pReserved); } HRESULT __RPC_STUB IOleCache2_UpdateCache_Stub( @@ -3059,8 +3059,8 @@ HRESULT __RPC_STUB IOleCache2_UpdateCache_Stub( DWORD grfUpdf, LONG_PTR pReserved) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p, 0x%08x, %li)\n", This, pDataObject, grfUpdf, pReserved); + return IOleCache2_UpdateCache(This, pDataObject, grfUpdf, (void*)pReserved); } HRESULT CALLBACK IEnumOLEVERB_Next_Proxy(

1 0