Jacek Caban : wininet: Added IsDomainLegalCookieDomainW helper with substrings as arguments.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon May 16 22:43:43 2016 +0200

wininet: Added IsDomainLegalCookieDomainW helper with substrings as arguments.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wininet/cookie.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index 2622712..beb3894 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -867,40 +867,25 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
  */
 BOOL WINAPI InternetGetCookieA(const char *url, const char *name, char *data, DWORD *size)
 {
-    TRACE("(%s, %s, %s, %p)\n", debugstr_a(url), debugstr_a(name), debugstr_a(data), size);
+    TRACE("(%s, %s, %p, %p)\n", debugstr_a(url), debugstr_a(name), data, size);
 
     return InternetGetCookieExA(url, name, data, size, 0, NULL);
 }
 
-/***********************************************************************
- *           IsDomainLegalCookieDomainW (WININET.@)
- */
-BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 )
+static BOOL is_domain_legal_for_cookie(substr_t domain, substr_t full_domain)
 {
-    DWORD s1_len, s2_len;
+    const WCHAR *ptr;
 
-    FIXME("(%s, %s) semi-stub\n", debugstr_w(s1), debugstr_w(s2));
-
-    if (!s1 || !s2)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }
-    if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0])
-    {
+    if(!domain.len || *domain.str == '.' || !full_domain.len || *full_domain.str == '.') {
         SetLastError(ERROR_INVALID_NAME);
         return FALSE;
     }
-    if(!strchrW(s1, '.') || !strchrW(s2, '.'))
-        return FALSE;
 
-    s1_len = strlenW(s1);
-    s2_len = strlenW(s2);
-    if (s1_len > s2_len)
+    if(domain.len > full_domain.len || !memchrW(domain.str, '.', domain.len) || !memchrW(full_domain.str, '.', full_domain.len))
         return FALSE;
 
-    if (strncmpiW(s1, s2+s2_len-s1_len, s1_len) || (s2_len>s1_len && s2[s2_len-s1_len-1]!='.'))
-    {
+    ptr = full_domain.str + full_domain.len - domain.len;
+    if (strncmpiW(domain.str, ptr, domain.len) || (full_domain.len > domain.len && ptr[-1] != '.')) {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
@@ -908,6 +893,21 @@ BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 )
     return TRUE;
 }
 
+/***********************************************************************
+ *           IsDomainLegalCookieDomainW (WININET.@)
+ */
+BOOL WINAPI IsDomainLegalCookieDomainW(const WCHAR *domain, const WCHAR *full_domain)
+{
+    FIXME("(%s, %s) semi-stub\n", debugstr_w(domain), debugstr_w(full_domain));
+
+    if (!domain || !full_domain) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    return is_domain_legal_for_cookie(substrz(domain), substrz(full_domain));
+}
+
 DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_name, const WCHAR *cookie_data, DWORD flags)
 {
     cookie_container_t *container;