ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLPrivateWindow_GetAddressBarUrl implementation.

This commit is contained in:
Piotr Caban 2011-03-11 11:14:08 +01:00 committed by Alexandre Julliard
parent 3660bf72a7
commit 12b85befc0
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/mshtml/htmlwindow.c
View File

@ -1777,8 +1777,13 @@ static HRESULT WINAPI HTMLPrivateWindow_FindWindowByName(IHTMLPrivateWindow *ifa
static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url) static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url)
{ {
HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface);
FIXME("(%p)->(%p)\n", This, url); TRACE("(%p)->(%p)\n", This, url);
return E_NOTIMPL;
if(!url)
return E_INVALIDARG;
*url = SysAllocString(This->url);
return S_OK;
} }
static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = {

14
dlls/mshtml/tests/htmldoc.c
View File

@ -3533,7 +3533,6 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace)
str2 = a2bstr(""); str2 = a2bstr("");
V_VT(&vempty) = VT_EMPTY; V_VT(&vempty) = VT_EMPTY;
hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0);
SysFreeString(str);
SysFreeString(str2); SysFreeString(str2);
ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres);
@ -3548,9 +3547,20 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace)
test_GetCurMoniker(doc_unk, doc_mon, NULL); test_GetCurMoniker(doc_unk, doc_mon, NULL);
doc_mon = NULL; doc_mon = NULL;
} }
IHTMLPrivateWindow_Release(priv_window); hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2);
ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres);
ok(!strcmp_wa(str2, use_replace?"about:blank":"http://www.winehq.org/"),
"unexpected address bar url: %s\n", wine_dbgstr_w(str2));
SysFreeString(str2);
test_download(DWL_VERBDONE); test_download(DWL_VERBDONE);
hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2);
ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres);
ok(!lstrcmpW(str2, str), "unexpected address bar url: %s\n", wine_dbgstr_w(str2));
SysFreeString(str2);
SysFreeString(str);
IHTMLPrivateWindow_Release(priv_window);
} }
static void test_open_window(IHTMLDocument2 *doc) static void test_open_window(IHTMLDocument2 *doc)