Andrew Eikum : mshtml: Implement IHTMLLocation::get_host.
Alexandre Julliard
julliard at winehq.org
Fri Oct 16 11:26:08 CDT 2009
Module: wine
Branch: master
Commit: 7cb9fe1064f68629cc41901d49a169629d532756
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb9fe1064f68629cc41901d49a169629d532756
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Thu Oct 15 16:17:28 2009 -0500
mshtml: Implement IHTMLLocation::get_host.
---
dlls/mshtml/htmllocation.c | 32 ++++++++++++++++++++++++++++++--
dlls/mshtml/tests/htmllocation.c | 12 ++++++------
2 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c
index e991cf3..badf111 100644
--- a/dlls/mshtml/htmllocation.c
+++ b/dlls/mshtml/htmllocation.c
@@ -228,12 +228,40 @@ static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v)
static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p)
{
HTMLLocation *This = HTMLLOCATION_THIS(iface);
- FIXME("(%p)->(%p)\n", This, p);
+ URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)};
+ HRESULT hres;
+
+ TRACE("(%p)->(%p)\n", This, p);
if(!p)
return E_POINTER;
- return E_NOTIMPL;
+ url.dwHostNameLength = 1;
+ hres = get_url_components(This, &url);
+ if(FAILED(hres))
+ return hres;
+
+ if(!url.dwHostNameLength){
+ *p = NULL;
+ return S_OK;
+ }
+
+ if(url.nPort) {
+ /* <hostname>:<port> */
+ const WCHAR format[] = {'%','d',0};
+ DWORD len = url.dwHostNameLength + 1 + 5 + 1;
+ WCHAR buf[len];
+
+ memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR));
+ buf[url.dwHostNameLength] = ':';
+ snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort);
+ *p = SysAllocString(buf);
+ }else
+ *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength);
+
+ if(!*p)
+ return E_OUTOFMEMORY;
+ return S_OK;
}
static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v)
diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c
index 57b6bcf..aaf8ecf 100644
--- a/dlls/mshtml/tests/htmllocation.c
+++ b/dlls/mshtml/tests/htmllocation.c
@@ -58,7 +58,7 @@ static const struct location_test http_test = {
http_url,
"http://www.winehq.org/?search#hash", FALSE,
"http:", TRUE,
- "www.winehq.org:80", FALSE,
+ "www.winehq.org:80", TRUE,
"www.winehq.org", FALSE,
"80", TRUE,
"", FALSE,
@@ -72,7 +72,7 @@ static const struct location_test http_file_test = {
http_file_url,
"http://www.winehq.org/file?search#hash", TRUE,
"http:", TRUE,
- "www.winehq.org:80", FALSE,
+ "www.winehq.org:80", TRUE,
"www.winehq.org", FALSE,
"80", TRUE,
"file", FALSE,
@@ -86,7 +86,7 @@ static const struct location_test ftp_test = {
ftp_url,
"ftp://ftp.winehq.org/", TRUE,
"ftp:", TRUE,
- "ftp.winehq.org:21", FALSE,
+ "ftp.winehq.org:21", TRUE,
"ftp.winehq.org", FALSE,
"21", TRUE,
"", FALSE,
@@ -100,7 +100,7 @@ static const struct location_test ftp_file_test = {
ftp_file_url,
"ftp://ftp.winehq.org/file", TRUE,
"ftp:", TRUE,
- "ftp.winehq.org:21", FALSE,
+ "ftp.winehq.org:21", TRUE,
"ftp.winehq.org", FALSE,
"21", TRUE,
"file", FALSE,
@@ -114,7 +114,7 @@ static const struct location_test file_test = {
file_url,
"file:///C:/windows/win.ini", FALSE,
"file:", TRUE,
- NULL, FALSE,
+ NULL, TRUE,
NULL, FALSE,
"", TRUE,
"C:\\windows\\win.ini", TRUE,
@@ -195,7 +195,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test)
test->name, E_POINTER, hres);
hres = IHTMLLocation_get_host(loc, &str);
- todo_wine ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres);
+ ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres);
if(hres == S_OK){
if(test->host_ok)
ok(str_eq_wa(str, test->host),
More information about the wine-cvs
mailing list