Module: wine Branch: master Commit: 68c5fed5cc0b9e648f1a72074c13b15e0c87bed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c5fed5cc0b9e648f1a72074c...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Thu Apr 30 09:19:38 2015 +0300
explorer: Implement Application property.
---
dlls/shell32/tests/shelldispatch.c | 4 +--- programs/explorer/desktop.c | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 14e04c8..3d238f0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -546,11 +546,9 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IWebBrowser2_get_Application(wb, &app); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(disp == app, "got %p, %p\n", app, disp); -} - if (hr == S_OK) IDispatch_Release(app); + IDispatch_Release(app);
hr = IWebBrowser2_get_Document(wb, &doc); todo_wine diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index b83d772..62a07f4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1430,8 +1430,13 @@ static HRESULT WINAPI webbrowser_Stop(IWebBrowser2 *iface) static HRESULT WINAPI webbrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = (IDispatch*)iface; + IDispatch_AddRef(*ppDisp); + + return S_OK; }
static HRESULT WINAPI webbrowser_get_Parent(IWebBrowser2 *iface, IDispatch **ppDisp)