Module: wine Branch: master Commit: e37ca6f927b6daeeb0470a0b35f3fa6373485df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37ca6f927b6daeeb0470a0b35...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Nov 20 01:49:20 2007 +0100
shdocvw: Return correct error from WebBrowser::Quit.
---
dlls/shdocvw/tests/webbrowser.c | 5 +++++ dlls/shdocvw/webbrowser.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index bd56fe4..2659bc4 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1147,6 +1147,11 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_get_Application(wb, NULL); ok(hres == E_POINTER, "get_Application failed: %08x, expected E_POINTER\n", hres);
+ /* Quit */ + + hres = IWebBrowser2_Quit(wb); + ok(hres == E_FAIL, "Quit failed: %08x, expected E_FAIL\n", hres); + IWebBrowser2_Release(wb); }
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 3e80f0f..79ae4a1 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -457,8 +457,11 @@ static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBo static HRESULT WINAPI WebBrowser_Quit(IWebBrowser2 *iface) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* It's a InternetExplorer specific method, we have nothing to do here. */ + return E_FAIL; }
static HRESULT WINAPI WebBrowser_ClientToWindow(IWebBrowser2 *iface, int *pcx, int *pcy)