Piotr Caban : urlmon: Added PARSE_DOMAIN to CoInternetParseUrl.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3adfe170bfb9a31082d41c6b8fa796f3f33d388c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3adfe170bfb9a31082d41c6b8f...

Author: Piotr Caban 
Date:   Tue Dec 15 23:47:52 2009 +0100

urlmon: Added PARSE_DOMAIN to CoInternetParseUrl.

---

dlls/urlmon/internet.c   |   32 ++++++++++++++++++++++++++++++++
 dlls/urlmon/tests/misc.c |   23 +++++++++++++++++------
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c
index 8bde7b4..c72ac42 100644
--- a/dlls/urlmon/internet.c
+++ b/dlls/urlmon/internet.c
@@ -170,6 +170,36 @@ static HRESULT parse_security_domain(LPCWSTR url, DWORD flags, LPWSTR result,
     return E_FAIL;
 }

+static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result,
+        DWORD size, DWORD *rsize)
+{
+    IInternetProtocolInfo *protocol_info;
+    HRESULT hres;
+
+    TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
+
+    protocol_info = get_protocol_info(url);
+
+    if(protocol_info) {
+        hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_DOMAIN,
+                flags, result, size, rsize, 0);
+        IInternetProtocolInfo_Release(protocol_info);
+        if(SUCCEEDED(hres))
+            return hres;
+    }
+
+    hres = UrlGetPartW(url, result, &size, URL_PART_HOSTNAME, flags);
+    if(rsize)
+        *rsize = size;
+
+    if(hres == E_POINTER)
+        return S_FALSE;
+
+    if(FAILED(hres))
+        return E_FAIL;
+    return S_OK;
+}
+
 /**************************************************************************
  *          CoInternetParseUrl    (URLMON.@)
  */
@@ -192,6 +222,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD
         return parse_schema(pwzUrl, dwFlags, pszResult, cchResult, pcchResult);
     case PARSE_SECURITY_DOMAIN:
         return parse_security_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult);
+    case PARSE_DOMAIN:
+        return parse_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult);
     default:
         FIXME("not supported action %d\n", ParseAction);
     }
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 5b59626..f6d5c87 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -270,6 +270,8 @@ static const WCHAR wszHttp[] = {'h','t','t','p',0};
 static const WCHAR wszAbout[] = {'a','b','o','u','t',0};
 static const WCHAR wszEmpty[] = {0};

+static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0};
+
 struct parse_test {
     LPCWSTR url;
     HRESULT secur_hres;
@@ -277,15 +279,17 @@ struct parse_test {
     HRESULT path_hres;
     LPCWSTR path;
     LPCWSTR schema;
+    LPCWSTR domain;
+    HRESULT domain_hres;
 };

static const struct parse_test parse_tests[] = {
-    {url1, S_OK,   url1,  E_INVALIDARG, NULL, wszRes},
-    {url2, E_FAIL, url2,  E_INVALIDARG, NULL, wszEmpty},
-    {url3, E_FAIL, url3,  S_OK, path3,        wszFile},
-    {url4, E_FAIL, url4e, S_OK, path4,        wszFile},
-    {url5, E_FAIL, url5,  E_INVALIDARG, NULL, wszHttp},
-    {url6, S_OK,   url6,  E_INVALIDARG, NULL, wszAbout}
+    {url1, S_OK,   url1,  E_INVALIDARG, NULL, wszRes, NULL, E_FAIL},
+    {url2, E_FAIL, url2,  E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL},
+    {url3, E_FAIL, url3,  S_OK, path3,        wszFile, wszEmpty, S_OK},
+    {url4, E_FAIL, url4e, S_OK, path4,        wszFile, wszEmpty, S_OK},
+    {url5, E_FAIL, url5,  E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK},
+    {url6, S_OK,   url6,  E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL}
 };

static void test_CoInternetParseUrl(void)
@@ -331,6 +335,13 @@ static void test_CoInternetParseUrl(void)
         ok(hres == S_OK, "[%d] schema failed: %08x\n", i, hres);
         ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i);
         ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i);
+
+        memset(buf, 0xf0, sizeof(buf));
+        hres = CoInternetParseUrl(parse_tests[i].url, PARSE_DOMAIN, 0, buf,
+                sizeof(buf)/sizeof(WCHAR), &size, 0);
+        ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres);
+        if(parse_tests[i].domain)
+            ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf));
     }
 }