Thomas Mullaly : urlmon: Implemented PARSE_SITE for CoInternetParseIUri.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 500e4fae7ceb7c03a56da39ef222d8731d4b1c15
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=500e4fae7ceb7c03a56da39ef2...

Author: Thomas Mullaly 
Date:   Thu Dec  2 21:32:43 2010 -0500

urlmon: Implemented PARSE_SITE for CoInternetParseIUri.

---

dlls/urlmon/tests/uri.c |    8 +++++++-
 dlls/urlmon/uri.c       |   31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 9ec7288..057850a 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -5960,7 +5960,13 @@ static const uri_parse_test uri_parse_tests[] = {

/* PARSE_SCHEMA tests. */
     {"http://google.com/test%22,0,PARSE_SCHEMA,0,%22http%22,S_OK,FALSE%7D,
-    {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE}
+    {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE},
+
+    /* PARSE_SITE tests. */
+    {"http://google.uk.com/%22,0,PARSE_SITE,0,%22google.uk.com%22,S_OK,FALSE%7D,
+    {"http://google.com.com/%22,0,PARSE_SITE,0,%22google.com.com%22,S_OK,FALSE%7D,
+    {"google.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_SITE,0,"",S_OK,FALSE},
+    {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE}
 };

static inline LPWSTR a2w(LPCSTR str) {
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index 04cffb1..54f7118 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -6414,6 +6414,34 @@ static HRESULT parse_schema(IUri *uri, LPWSTR output, DWORD output_len,
     return S_OK;
 }

+static HRESULT parse_site(IUri *uri, LPWSTR output, DWORD output_len, DWORD *result_len)
+{
+    HRESULT hr;
+    DWORD len;
+    BSTR received;
+
+    hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_HOST, &len, 0);
+    if(FAILED(hr)) {
+        *result_len = 0;
+        return hr;
+    }
+
+    *result_len = len;
+    if(len+1 > output_len)
+        return STRSAFE_E_INSUFFICIENT_BUFFER;
+
+    hr = IUri_GetHost(uri, &received);
+    if(FAILED(hr)) {
+        *result_len = 0;
+        return hr;
+    }
+
+    memcpy(output, received, (len+1)*sizeof(WCHAR));
+    SysFreeString(received);
+
+    return S_OK;
+}
+
 /***********************************************************************
  *           CoInternetParseIUri (urlmon.@)
  */
@@ -6481,6 +6509,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d
     case PARSE_SCHEMA:
         hr = parse_schema(pIUri, pwzResult, cchResult, pcchResult);
         break;
+    case PARSE_SITE:
+        hr = parse_site(pIUri, pwzResult, cchResult, pcchResult);
+        break;
     case PARSE_SECURITY_URL:
     case PARSE_MIME:
     case PARSE_SERVER: