[PATCH 0/1] MR11109: ieframe: Return S_FALSE for NULL URLs in WebBrowser_Navigate.
From: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> --- dlls/ieframe/tests/webbrowser.c | 3 +++ dlls/ieframe/webbrowser.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 521b18bb599..e887039434f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3900,6 +3900,9 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) IHTMLDocument2_Release(doc2); IHTMLDocument2_Release(doc); + hres = IWebBrowser2_Navigate(webbrowser, NULL, NULL, NULL, NULL, NULL); + ok(hres == S_FALSE, "Navigate returned: %08lx\n", hres); + if(!do_close) { trace("Navigate2 http URL...\n"); test_ready_state(READYSTATE_COMPLETE, VARIANT_FALSE); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 857287f6311..1acd6e3f745 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -326,7 +326,7 @@ static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl, debugstr_variant(TargetFrameName), debugstr_variant(PostData), debugstr_variant(Headers)); - return navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); + return szUrl ? navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers) : S_FALSE; } static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11109
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11109
participants (3)
-
Gabriel Ivăncescu -
Gabriel Ivăncescu (@insn) -
Jacek Caban (@jacek)