Commit 9f41866e authored by Thomas Mullaly's avatar Thomas Mullaly Committed by Alexandre Julliard

urlmon: Implemented IUri_GetHostType.

parent b9655344
...@@ -1902,8 +1902,9 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO ...@@ -1902,8 +1902,9 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO
uri->host_type = Uri_HOST_UNKNOWN; uri->host_type = Uri_HOST_UNKNOWN;
break; break;
default: default:
WARN("(%p %p %x %d): Canonicalization not supported yet\n", data, FIXME("(%p %p %x %d): Canonicalization for host type %d not supported.\n", data,
uri, flags, computeOnly); uri, flags, computeOnly, data->host_type);
return FALSE;
} }
} }
...@@ -2020,6 +2021,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, ...@@ -2020,6 +2021,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags,
uri->userinfo_len = 0; uri->userinfo_len = 0;
uri->host_start = -1; uri->host_start = -1;
uri->host_len = 0; uri->host_len = 0;
uri->host_type = Uri_HOST_UNKNOWN;
uri->has_port = FALSE; uri->has_port = FALSE;
} }
...@@ -2398,8 +2400,8 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW ...@@ -2398,8 +2400,8 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW
} }
switch(uriProp) { switch(uriProp) {
case Uri_PROPERTY_SCHEME: case Uri_PROPERTY_HOST_TYPE:
*pcchProperty = This->scheme_type; *pcchProperty = This->host_type;
hres = S_OK; hres = S_OK;
break; break;
case Uri_PROPERTY_PORT: case Uri_PROPERTY_PORT:
...@@ -2412,6 +2414,10 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW ...@@ -2412,6 +2414,10 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW
} }
break; break;
case Uri_PROPERTY_SCHEME:
*pcchProperty = This->scheme_type;
hres = S_OK;
break;
default: default:
FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags);
hres = E_NOTIMPL; hres = E_NOTIMPL;
...@@ -2572,13 +2578,8 @@ static HRESULT WINAPI Uri_GetUserName(IUri *iface, BSTR *pstrUserName) ...@@ -2572,13 +2578,8 @@ static HRESULT WINAPI Uri_GetUserName(IUri *iface, BSTR *pstrUserName)
static HRESULT WINAPI Uri_GetHostType(IUri *iface, DWORD *pdwHostType) static HRESULT WINAPI Uri_GetHostType(IUri *iface, DWORD *pdwHostType)
{ {
Uri *This = URI_THIS(iface); TRACE("(%p)->(%p)\n", iface, pdwHostType);
FIXME("(%p)->(%p)\n", This, pdwHostType); return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_HOST_TYPE, pdwHostType, 0);
if(!pdwHostType)
return E_INVALIDARG;
return E_NOTIMPL;
} }
static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment