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

mshtml: Use IUri in IHTMLLocation::put_port implementation.

This commit is contained in:
Jacek Caban 2011-12-30 12:23:41 +01:00 committed by Alexandre Julliard
parent 71109b509e
commit 2e2a80ce8a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/mshtml/htmllocation.c
View File

@ -402,7 +402,7 @@ static HRESULT WINAPI HTMLLocation_put_port(IHTMLLocation *iface, BSTR v)
static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p)
{ {
HTMLLocation *This = impl_from_IHTMLLocation(iface); HTMLLocation *This = impl_from_IHTMLLocation(iface);
URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; DWORD port;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
@ -410,18 +410,23 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p)
if(!p) if(!p)
return E_POINTER; return E_POINTER;
hres = get_url_components(This, &url); if(!This->window || !This->window->uri) {
FIXME("No current URI\n");
return E_NOTIMPL;
}
hres = IUri_GetPort(This->window->uri, &port);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
if(url.nPort) { if(hres == S_OK) {
const WCHAR format[] = {'%','u',0}; static const WCHAR formatW[] = {'%','u',0};
WCHAR buf[6]; WCHAR buf[12];
snprintfW(buf, 6, format, url.nPort);
sprintfW(buf, formatW, port);
*p = SysAllocString(buf); *p = SysAllocString(buf);
}else { }else {
const WCHAR empty[] = {0}; *p = SysAllocStringLen(NULL, 0);
*p = SysAllocString(empty);
} }
if(!*p) if(!*p)