May 2016 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Pass arguments as substrings to create_cookie_url.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 51cacda534411bedf8a10b126181e5087f9908e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cacda534411bedf8a10b126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:49 2016 +0200 wininet: Pass arguments as substrings to create_cookie_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 2a3efa6..4e885d7 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -257,7 +257,7 @@ static BOOL cookie_match_path(cookie_container_t *container, const WCHAR *path) return !strncmpiW(container->path, path, strlenW(container->path)); } -static BOOL create_cookie_url(LPCWSTR domain, LPCWSTR path, WCHAR *buf, DWORD buf_len) +static BOOL create_cookie_url(substr_t domain, substr_t path, WCHAR *buf, DWORD buf_len) { static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; @@ -282,18 +282,16 @@ static BOOL create_cookie_url(LPCWSTR domain, LPCWSTR path, WCHAR *buf, DWORD bu *(buf++) = '@'; buf_len--; - len = strlenW(domain); - if(len >= buf_len) + if(domain.len >= buf_len) return FALSE; - memcpy(buf, domain, len*sizeof(WCHAR)); - buf += len; - buf_len -= len; + memcpy(buf, domain.str, domain.len*sizeof(WCHAR)); + buf += domain.len; + buf_len -= domain.len; - len = strlenW(path); - if(len >= buf_len) + if(path.len >= buf_len) return FALSE; - memcpy(buf, path, len*sizeof(WCHAR)); - buf += len; + memcpy(buf, path.str, path.len*sizeof(WCHAR)); + buf += path.len; *buf = 0; @@ -314,8 +312,10 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) WCHAR *name, *data; FILETIME expiry, create, time; - if (!create_cookie_url(domain, path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) + if (!create_cookie_url(substrz(domain), substrz(path), cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) { + FIXME("Failed to create cookie URL.\n"); return FALSE; + } size = 0; RetrieveUrlCacheEntryStreamW(cookie_url, NULL, &size, FALSE, 0); @@ -409,8 +409,11 @@ static BOOL save_persistent_cookie(cookie_container_t *container) FILETIME time; DWORD bytes_written; - if (!create_cookie_url(container->domain->domain, container->path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) + if (!create_cookie_url(substrz(container->domain->domain), substrz(container->path), + cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) { + FIXME("Failed to create cookie URL.\n"); return FALSE; + } /* check if there's anything to save */ GetSystemTimeAsFileTime(&time);

1 0

Jacek Caban : wininet: Pass arguments as substrings to load_persistent_cookie.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: b6f64a468dd101b989c59fd1fb942801bd2e1a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f64a468dd101b989c59fd1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:43:07 2016 +0200 wininet: Pass arguments as substrings to load_persistent_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 4e885d7..debf4b5 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -300,7 +300,7 @@ static BOOL create_cookie_url(substr_t domain, substr_t path, WCHAR *buf, DWORD return TRUE; } -static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) +static BOOL load_persistent_cookie(substr_t domain, substr_t path) { INTERNET_CACHE_ENTRY_INFOW *info; cookie_container_t *cookie_container; @@ -312,7 +312,7 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) WCHAR *name, *data; FILETIME expiry, create, time; - if (!create_cookie_url(substrz(domain), substrz(path), cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) { + if (!create_cookie_url(domain, path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) { FIXME("Failed to create cookie URL.\n"); return FALSE; } @@ -338,7 +338,7 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) str[size] = 0; UnlockUrlCacheEntryStream(cookie, 0); - cookie_container = get_cookie_container(substrz(domain), substrz(path), TRUE); + cookie_container = get_cookie_container(domain, path, TRUE); if(!cookie_container) { heap_free(str); return FALSE; @@ -561,7 +561,6 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki { static const WCHAR empty_path[] = { '/',0 }; - WCHAR *ptr, subpath[INTERNET_MAX_PATH_LENGTH]; const WCHAR *p; cookie_domain_t *domain; cookie_container_t *container; @@ -578,20 +577,16 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki while(p>host && p[-1]!='.') p--; if(p == host) break; - load_persistent_cookie(p, empty_path); + load_persistent_cookie(substr(p, host+len-p), substr(empty_path, 1)); } - len = strlenW(path); - assert(len+1 < INTERNET_MAX_PATH_LENGTH); - memcpy(subpath, path, (len+1)*sizeof(WCHAR)); - ptr = subpath+len; + p = host + len; do { - *ptr = 0; - load_persistent_cookie(host, subpath); + load_persistent_cookie(substr(host, len), substr(path, p-path)); - ptr--; - while(ptr>subpath && ptr[-1]!='/') ptr--; - }while(ptr != subpath); + p--; + while(p > path && p[-1] != '/') p--; + }while(p != path); domain = get_cookie_domain(substrz(host), FALSE); if(!domain) { @@ -1041,7 +1036,7 @@ DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_nam EnterCriticalSection(&cookie_cs); - load_persistent_cookie(domain, path); + load_persistent_cookie(substrz(domain), substrz(path)); container = get_cookie_container(substrz(domain), substrz(path), !expired); if(!container) {

1 0

Jacek Caban : wininet: Pass arguments as substrings to get_cookie.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 4f39a2dbb30e7a65ec0a325b7a47947f0ff1707a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f39a2dbb30e7a65ec0a325b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:43:29 2016 +0200 wininet: Pass arguments as substrings to get_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index debf4b5..2622712 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -252,9 +252,10 @@ static void replace_cookie(cookie_container_t *container, cookie_t *new_cookie) add_cookie(container, new_cookie); } -static BOOL cookie_match_path(cookie_container_t *container, const WCHAR *path) +static BOOL cookie_match_path(cookie_container_t *container, substr_t path) { - return !strncmpiW(container->path, path, strlenW(container->path)); + size_t len = strlenW(container->path); + return path.len >= len && !strncmpiW(container->path, path.str, len); } static BOOL create_cookie_url(substr_t domain, substr_t path, WCHAR *buf, DWORD buf_len) @@ -557,44 +558,42 @@ typedef struct { unsigned string_len; } cookie_set_t; -static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cookie_set_t *res) +static DWORD get_cookie(substr_t host, substr_t path, DWORD flags, cookie_set_t *res) { static const WCHAR empty_path[] = { '/',0 }; const WCHAR *p; cookie_domain_t *domain; cookie_container_t *container; - unsigned len; FILETIME tm; GetSystemTimeAsFileTime(&tm); - len = strlenW(host); - p = host+len; - while(p>host && p[-1]!='.') p--; - while(p != host) { + p = host.str + host.len; + while(p > host.str && p[-1] != '.') p--; + while(p != host.str) { p--; - while(p>host && p[-1]!='.') p--; - if(p == host) break; + while(p > host.str && p[-1] != '.') p--; + if(p == host.str) break; - load_persistent_cookie(substr(p, host+len-p), substr(empty_path, 1)); + load_persistent_cookie(substr(p, host.str+host.len-p), substr(empty_path, 1)); } - p = host + len; + p = path.str + path.len; do { - load_persistent_cookie(substr(host, len), substr(path, p-path)); + load_persistent_cookie(host, substr(path.str, p-path.str)); p--; - while(p > path && p[-1] != '/') p--; - }while(p != path); + while(p > path.str && p[-1] != '/') p--; + }while(p != path.str); - domain = get_cookie_domain(substrz(host), FALSE); + domain = get_cookie_domain(host, FALSE); if(!domain) { - TRACE("Unknown host %s\n", debugstr_w(host)); + TRACE("Unknown host %s\n", debugstr_wn(host.str, host.len)); return ERROR_NO_MORE_ITEMS; } - for(domain = get_cookie_domain(substrz(host), FALSE); domain; domain = domain->parent) { + for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { TRACE("Trying %s domain...\n", debugstr_w(domain->domain)); LIST_FOR_EACH_ENTRY(container, &domain->path_list, cookie_container_t, entry) { @@ -685,7 +684,7 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) EnterCriticalSection(&cookie_cs); - res = get_cookie(host, path, INTERNET_COOKIE_HTTPONLY, &cookie_set); + res = get_cookie(substrz(host), substrz(path), INTERNET_COOKIE_HTTPONLY, &cookie_set); if(res != ERROR_SUCCESS) { LeaveCriticalSection(&cookie_cs); return res; @@ -760,7 +759,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, EnterCriticalSection(&cookie_cs); - res = get_cookie(host, path, flags, &cookie_set); + res = get_cookie(substrz(host), substrz(path), flags, &cookie_set); if(res != ERROR_SUCCESS) { LeaveCriticalSection(&cookie_cs); SetLastError(res);

1 0

Jacek Caban : wininet: Added IsDomainLegalCookieDomainW helper with substrings as arguments.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 8fe7be58ead58fc7114a01dc8365ad72bb86a45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe7be58ead58fc7114a01dc8… Author: Jacek Caban <jacek(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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;

1 0

Jacek Caban : wininet: Pass arguments as substrings to set_cookie.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 18a31e49bc2af5399214612b6d7641a42a25b2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a31e49bc2af5399214612b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:45:41 2016 +0200 wininet: Pass arguments as substrings to set_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 237 +++++++++++++++++++++--------------------------- dlls/wininet/http.c | 10 +- dlls/wininet/internet.h | 2 +- 3 files changed, 108 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18a31e49bc2af53992146…

1 0

Jacek Caban : wininet: Rerite COOKIE_crackUrlSimple to use substrings.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 8264e2de94b61d9b9c349782fc9170b124b7f2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8264e2de94b61d9b9c349782f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:45:57 2016 +0200 wininet: Rerite COOKIE_crackUrlSimple to use substrings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 70 +++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 47 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 4f16efd..5c25fef 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -509,44 +509,23 @@ static BOOL save_persistent_cookie(cookie_container_t *container) return CommitUrlCacheEntryW(cookie_url, cookie_file, time, time, 0, NULL, 0, txtW, 0); } -static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostNameLen, LPWSTR path, int pathLen) +static BOOL cookie_parse_url(const WCHAR *url, substr_t *host, substr_t *path) { - URL_COMPONENTSW UrlComponents; - - UrlComponents.lpszExtraInfo = NULL; - UrlComponents.lpszPassword = NULL; - UrlComponents.lpszScheme = NULL; - UrlComponents.lpszUrlPath = path; - UrlComponents.lpszUserName = NULL; - UrlComponents.lpszHostName = hostName; - UrlComponents.dwExtraInfoLength = 0; - UrlComponents.dwPasswordLength = 0; - UrlComponents.dwSchemeLength = 0; - UrlComponents.dwUserNameLength = 0; - UrlComponents.dwHostNameLength = hostNameLen; - UrlComponents.dwUrlPathLength = pathLen; - - if (!InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents)) return FALSE; + URL_COMPONENTSW comp = { sizeof(comp) }; + static const WCHAR rootW[] = {'/',0}; + + comp.dwHostNameLength = 1; + comp.dwUrlPathLength = 1; + + if(!InternetCrackUrlW(url, 0, 0, &comp) || !comp.dwHostNameLength) + return FALSE; /* discard the webpage off the end of the path */ - if (UrlComponents.dwUrlPathLength) - { - if (path[UrlComponents.dwUrlPathLength - 1] != '/') - { - WCHAR *ptr; - if ((ptr = strrchrW(path, '/'))) *(++ptr) = 0; - else - { - path[0] = '/'; - path[1] = 0; - } - } - } - else if (pathLen >= 2) - { - path[0] = '/'; - path[1] = 0; - } + while(comp.dwUrlPathLength && comp.lpszUrlPath[comp.dwUrlPathLength-1] != '/') + comp.dwUrlPathLength--; + + *host = substr(comp.lpszHostName, comp.dwHostNameLength); + *path = comp.dwUrlPathLength ? substr(comp.lpszUrlPath, comp.dwUrlPathLength) : substr(rootW, 1); return TRUE; } @@ -734,8 +713,8 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPWSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { - WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; cookie_set_t cookie_set = {0}; + substr_t host, path; DWORD res; BOOL ret; @@ -750,16 +729,15 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - host[0] = 0; - ret = COOKIE_crackUrlSimple(lpszUrl, host, sizeof(host)/sizeof(host[0]), path, sizeof(path)/sizeof(path[0])); - if (!ret || !host[0]) { + ret = cookie_parse_url(lpszUrl, &host, &path); + if (!ret) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } EnterCriticalSection(&cookie_cs); - res = get_cookie(substrz(host), substrz(path), flags, &cookie_set); + res = get_cookie(host, path, flags, &cookie_set); if(res != ERROR_SUCCESS) { LeaveCriticalSection(&cookie_cs); SetLastError(res); @@ -780,7 +758,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, lpCookieData[cookie_set.string_len] = 0; } }else { - TRACE("no cookies found for %s\n", debugstr_w(host)); + TRACE("no cookies found for %s\n", debugstr_wn(host.str, host.len)); SetLastError(ERROR_NO_MORE_ITEMS); ret = FALSE; } @@ -1078,9 +1056,8 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPCWSTR lpCookieData, DWORD flags, DWORD_PTR reserved) { - substr_t name, data; + substr_t host, path, name, data; BOOL ret; - WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData), flags, reserved); @@ -1094,9 +1071,8 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return COOKIE_STATE_UNKNOWN; } - hostName[0] = 0; - ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); - if (!ret || !hostName[0]) return COOKIE_STATE_UNKNOWN; + ret = cookie_parse_url(lpszUrl, &host, &path); + if (!ret || !host.len) return COOKIE_STATE_UNKNOWN; if (!lpszCookieName) { const WCHAR *ptr; @@ -1114,7 +1090,7 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, data = substrz(lpCookieData); } - return set_cookie(substrz(hostName), substrz(path), name, data, flags); + return set_cookie(host, path, name, data, flags); } /***********************************************************************

1 0

Jacek Caban : wininet: Added test of cookies with long URL.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 238a462d2b903264e8fbcf5aef00bdea8d768ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=238a462d2b903264e8fbcf5ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:46:08 2016 +0200 wininet: Added test of cookies with long URL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 37490c2..d762768 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -614,6 +614,7 @@ static void test_cookie_attrs(void) static void test_cookie_url(void) { + char long_url[5000] = "http://long.url.test.com/", *p; WCHAR bufw[512]; char buf[512]; DWORD len; @@ -640,6 +641,23 @@ static void test_cookie_url(void) res = pInternetGetCookieExW(about_blankW, NULL, bufw, &len, 0, NULL); ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeExW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + p = long_url + strlen(long_url); + memset(p, 'x', long_url+sizeof(long_url)-p); + p += (long_url+sizeof(long_url)-p) - 3; + p[0] = '/'; + p[2] = 0; + res = InternetSetCookieA(long_url, NULL, "A=B"); + ok(res, "InternetSetCookieA failed: %u\n", GetLastError()); + + len = sizeof(buf); + res = InternetGetCookieA(long_url, NULL, buf, &len); + ok(res, "InternetGetCookieA failed: %u\n", GetLastError()); + ok(!strcmp(buf, "A=B"), "buf = %s\n", buf); + + len = sizeof(buf); + res = InternetGetCookieA("http://long.url.test.com/", NULL, buf, &len); + ok(!res && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookieA failed: %u\n", GetLastError()); } static void test_null(void)

1 0

Maarten Lankhorst : dsound: Fixup DSOUND_WaveQueue checks.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a330b011435e18372f434635c80a1eceea8ffd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a330b011435e18372f434635c… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Mon May 16 09:55:26 2016 -0500 dsound: Fixup DSOUND_WaveQueue checks. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index dec8ffd..4ca0af1 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -621,16 +621,18 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) hr = IAudioRenderClient_GetBuffer(device->render, bytes / device->pwfx->nBlockAlign, &buffer); if(FAILED(hr)){ WARN("GetBuffer failed: %08x\n", hr); - goto done; + return; } memcpy(buffer, pos, bytes); hr = IAudioRenderClient_ReleaseBuffer(device->render, bytes / device->pwfx->nBlockAlign, 0); - if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + if(FAILED(hr)) { + ERR("ReleaseBuffer failed: %08x\n", hr); + IAudioRenderClient_ReleaseBuffer(device->render, 0, 0); + return; + } -done: device->pad += bytes; }

1 0

Maarten Lankhorst : dsound: Fixup IDirectSoundCaptureBuffer_QueryInterface.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 0adf2af7ff1fe6a5d1ace4c2324c68ecffb76d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adf2af7ff1fe6a5d1ace4c23… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Mon May 16 09:55:43 2016 -0500 dsound: Fixup IDirectSoundCaptureBuffer_QueryInterface. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/capture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 0764261..412b59e 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -50,7 +50,7 @@ typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface; IDirectSoundNotify IDirectSoundNotify_iface; LONG numIfaces; /* "in use interfaces" refcount */ - LONG ref, refn; + LONG ref, refn, has_dsc8; /* IDirectSoundCaptureBuffer fields */ DirectSoundCaptureDevice *device; DSCBUFFERDESC *pdscbd; @@ -240,8 +240,9 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_QueryInterface(IDirectSoundC *ppobj = NULL; - if ( IsEqualGUID( &IID_IDirectSoundCaptureBuffer, riid ) || - IsEqualGUID( &IID_IDirectSoundCaptureBuffer8, riid ) ) { + if ( IsEqualIID( &IID_IUnknown, riid ) || + IsEqualIID( &IID_IDirectSoundCaptureBuffer, riid ) || + (This->has_dsc8 && IsEqualIID( &IID_IDirectSoundCaptureBuffer8, riid )) ) { IDirectSoundCaptureBuffer8_AddRef(iface); *ppobj = iface; return S_OK; @@ -1233,6 +1234,8 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCa if (hr != DS_OK) WARN("IDirectSoundCaptureBufferImpl_Create failed\n"); + else + This->device->capture_buffer->has_dsc8 = This->has_dsc8; return hr; }

1 0

Nikolay Sivov : mmdevapi: Increment loop counter once per iteration (Clang ).
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 3ac1059bf47226741f948c8826a2b90ae64a612b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac1059bf47226741f948c882… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 00:41:49 2016 +0300 mmdevapi: Increment loop counter once per iteration (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index aa4baa5..110c802 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -304,7 +304,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) *ppv = &MMDEVAPI_CF[i]; return S_OK; } - i++; } WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid),

1 0