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

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

May 17, 2016

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_container.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: b1aa9bf8072d441170aa0d8bcddc1aa65e5e530e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1aa9bf8072d441170aa0d8bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:33 2016 +0200 wininet: Pass arguments as substrings to get_cookie_container. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 6734c1f..2a3efa6 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -142,24 +142,22 @@ static cookie_domain_t *get_cookie_domain(substr_t domain, BOOL create) } } -static cookie_container_t *get_cookie_container(const WCHAR *domain, const WCHAR *path, BOOL create) +static cookie_container_t *get_cookie_container(substr_t domain, substr_t path, BOOL create) { cookie_domain_t *cookie_domain; cookie_container_t *cookie_container, *iter; - size_t path_len, len; + size_t len; - cookie_domain = get_cookie_domain(substrz(domain), create); + cookie_domain = get_cookie_domain(domain, create); if(!cookie_domain) return NULL; - path_len = strlenW(path); - LIST_FOR_EACH_ENTRY(cookie_container, &cookie_domain->path_list, cookie_container_t, entry) { len = strlenW(cookie_container->path); - if(len < path_len) + if(len < path.len) break; - if(!strcmpiW(cookie_container->path, path)) + if(path.len == strlenW(cookie_container->path) && !strncmpiW(cookie_container->path, path.str, path.len)) return cookie_container; } @@ -170,7 +168,7 @@ static cookie_container_t *get_cookie_container(const WCHAR *domain, const WCHAR if(!cookie_container) return NULL; - cookie_container->path = heap_strdupW(path); + cookie_container->path = heap_strndupW(path.str, path.len); if(!cookie_container->path) { heap_free(cookie_container); return NULL; @@ -179,9 +177,8 @@ static cookie_container_t *get_cookie_container(const WCHAR *domain, const WCHAR cookie_container->domain = cookie_domain; list_init(&cookie_container->cookie_list); - LIST_FOR_EACH_ENTRY(iter, &cookie_domain->path_list, cookie_container_t, entry) { - if(strlenW(iter->path) <= path_len) { + if(strlenW(iter->path) <= path.len) { list_add_before(&iter->entry, &cookie_container->entry); return cookie_container; } @@ -341,7 +338,7 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) str[size] = 0; UnlockUrlCacheEntryStream(cookie, 0); - cookie_container = get_cookie_container(domain, path, TRUE); + cookie_container = get_cookie_container(substrz(domain), substrz(path), TRUE); if(!cookie_container) { heap_free(str); return FALSE; @@ -1043,7 +1040,7 @@ DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_nam load_persistent_cookie(domain, path); - container = get_cookie_container(domain, path, !expired); + container = get_cookie_container(substrz(domain), substrz(path), !expired); if(!container) { heap_free(data); if (value != data) heap_free(value);

1 0

Jacek Caban : wininet: Fixed internet tests on win10.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: cebb5d3066d79eaabb77b5471ebc960c202b20cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebb5d3066d79eaabb77b5471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:14 2016 +0200 wininet: Fixed internet tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 45907e4..37490c2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1500,6 +1500,10 @@ static void test_InternetErrorDlg(void) continue; } break; + case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: + if(res == ERROR_SUCCESS) /* win10 returns ERROR_SUCCESS */ + expected = ERROR_SUCCESS; + break; default: break; }

1 0

Nikolay Sivov : comctl32/listview: Hit test data pointer is never NULL when sending LVN_ITEMACTIVATE.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 3febb462373db015ecbe02ae9716d11d99dea6b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3febb462373db015ecbe02ae9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 22:03:55 2016 +0300 comctl32/listview: Hit test data pointer is never NULL when sending LVN_ITEMACTIVATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38c376c..b922ef7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -844,31 +844,30 @@ static inline void notify_itemactivate(const LISTVIEW_INFO *infoPtr, const LVHIT NMITEMACTIVATE nmia; LVITEMW item; - if (htInfo) { - nmia.uNewState = 0; - nmia.uOldState = 0; - nmia.uChanged = 0; - nmia.uKeyFlags = 0; - - item.mask = LVIF_PARAM|LVIF_STATE; - item.iItem = htInfo->iItem; - item.iSubItem = 0; - item.stateMask = (UINT)-1; - if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) { - nmia.lParam = item.lParam; - nmia.uOldState = item.state; - nmia.uNewState = item.state | LVIS_ACTIVATING; - nmia.uChanged = LVIF_STATE; - } - - nmia.iItem = htInfo->iItem; - nmia.iSubItem = htInfo->iSubItem; - nmia.ptAction = htInfo->pt; - - if (GetKeyState(VK_SHIFT) & 0x8000) nmia.uKeyFlags |= LVKF_SHIFT; - if (GetKeyState(VK_CONTROL) & 0x8000) nmia.uKeyFlags |= LVKF_CONTROL; - if (GetKeyState(VK_MENU) & 0x8000) nmia.uKeyFlags |= LVKF_ALT; + nmia.uNewState = 0; + nmia.uOldState = 0; + nmia.uChanged = 0; + nmia.uKeyFlags = 0; + + item.mask = LVIF_PARAM|LVIF_STATE; + item.iItem = htInfo->iItem; + item.iSubItem = 0; + item.stateMask = (UINT)-1; + if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) { + nmia.lParam = item.lParam; + nmia.uOldState = item.state; + nmia.uNewState = item.state | LVIS_ACTIVATING; + nmia.uChanged = LVIF_STATE; } + + nmia.iItem = htInfo->iItem; + nmia.iSubItem = htInfo->iSubItem; + nmia.ptAction = htInfo->pt; + + if (GetKeyState(VK_SHIFT) & 0x8000) nmia.uKeyFlags |= LVKF_SHIFT; + if (GetKeyState(VK_CONTROL) & 0x8000) nmia.uKeyFlags |= LVKF_CONTROL; + if (GetKeyState(VK_MENU) & 0x8000) nmia.uKeyFlags |= LVKF_ALT; + notify_hdr(infoPtr, LVN_ITEMACTIVATE, (LPNMHDR)&nmia); }

1 0

Nikolay Sivov : dwrite/tests: Get rid of global script analysis variable.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: a935716f1d2270553b5b8dea775fd042fd826ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a935716f1d2270553b5b8dea7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:51:37 2016 +0300 dwrite/tests: Get rid of global script analysis variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0ed80e3..13d27da 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -32,7 +32,16 @@ static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; -static DWRITE_SCRIPT_ANALYSIS g_sa; +struct testanalysissink +{ + IDWriteTextAnalysisSink IDWriteTextAnalysisSink_iface; + DWRITE_SCRIPT_ANALYSIS sa; /* last analysis, with SetScriptAnalysis() */ +}; + +static inline struct testanalysissink *impl_from_IDWriteTextAnalysisSink(IDWriteTextAnalysisSink *iface) +{ + return CONTAINING_RECORD(iface, struct testanalysissink, IDWriteTextAnalysisSink_iface); +} /* test IDWriteTextAnalysisSink */ static HRESULT WINAPI analysissink_QueryInterface(IDWriteTextAnalysisSink *iface, REFIID riid, void **obj) @@ -60,7 +69,8 @@ static ULONG WINAPI analysissink_Release(IDWriteTextAnalysisSink *iface) static HRESULT WINAPI analysissink_SetScriptAnalysis(IDWriteTextAnalysisSink *iface, UINT32 position, UINT32 length, DWRITE_SCRIPT_ANALYSIS const* sa) { - g_sa = *sa; + struct testanalysissink *sink = impl_from_IDWriteTextAnalysisSink(iface); + sink->sa = *sa; return S_OK; } @@ -95,7 +105,10 @@ static IDWriteTextAnalysisSinkVtbl analysissinkvtbl = { analysissink_SetNumberSubstitution }; -static IDWriteTextAnalysisSink analysissink = { &analysissinkvtbl }; +static struct testanalysissink analysissink = { + { &analysissinkvtbl }, + { 0 } +}; /* test IDWriteTextAnalysisSource */ static HRESULT WINAPI analysissource_QueryInterface(IDWriteTextAnalysisSource *iface, @@ -202,10 +215,10 @@ static void get_script_analysis(const WCHAR *str, UINT32 len, DWRITE_SCRIPT_ANAL hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, len, &analysissink); + hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, len, &analysissink.IDWriteTextAnalysisSink_iface); ok(hr == S_OK, "got 0x%08x\n", hr); - *sa = g_sa; + *sa = analysissink.sa; IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : msdaps: Always initialize error pointers in proxies.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: b50342ed53f019c08d445c90dc9f1123154acb64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50342ed53f019c08d445c90d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:48:14 2016 +0300 msdaps: Always initialize error pointers in proxies. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b50342ed53f019c08d445…

1 0

Jacek Caban : wininet: Rerite COOKIE_crackUrlSimple to use substrings.
by Alexandre Julliard May 17, 2016

May 17, 2016

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: Pass arguments as substrings to set_cookie.
by Alexandre Julliard May 17, 2016

May 17, 2016

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: Pass arguments as substrings to get_cookie.
by Alexandre Julliard May 17, 2016

May 17, 2016

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: Pass domain to get_cookie_domain as a substring.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 5b98186abfa9abe4f727807022d82695209f1d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b98186abfa9abe4f72780702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:25 2016 +0200 wininet: Pass domain to get_cookie_domain as a substring. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 19 ++++++++++--------- dlls/wininet/internet.h | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 36346d5..6734c1f 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -92,19 +92,20 @@ static CRITICAL_SECTION_DEBUG cookie_cs_debug = static CRITICAL_SECTION cookie_cs = { &cookie_cs_debug, -1, 0, 0, 0, 0 }; static struct list domain_list = LIST_INIT(domain_list); -static cookie_domain_t *get_cookie_domain(const WCHAR *domain, BOOL create) +static cookie_domain_t *get_cookie_domain(substr_t domain, BOOL create) { - const WCHAR *ptr = domain + strlenW(domain), *ptr_end, *subdomain_ptr; + const WCHAR *ptr = domain.str + domain.len, *ptr_end, *subdomain_ptr; cookie_domain_t *iter, *current_domain, *prev_domain = NULL; struct list *current_list = &domain_list; while(1) { - for(ptr_end = ptr--; ptr > domain && *ptr != '.'; ptr--); + for(ptr_end = ptr--; ptr > domain.str && *ptr != '.'; ptr--); subdomain_ptr = *ptr == '.' ? ptr+1 : ptr; current_domain = NULL; LIST_FOR_EACH_ENTRY(iter, current_list, cookie_domain_t, entry) { - if(ptr_end-subdomain_ptr == iter->subdomain_len && !memcmp(subdomain_ptr, iter->domain, iter->subdomain_len)) { + if(ptr_end-subdomain_ptr == iter->subdomain_len + && !memcmp(subdomain_ptr, iter->domain, iter->subdomain_len*sizeof(WCHAR))) { current_domain = iter; break; } @@ -118,7 +119,7 @@ static cookie_domain_t *get_cookie_domain(const WCHAR *domain, BOOL create) if(!current_domain) return NULL; - current_domain->domain = heap_strdupW(subdomain_ptr); + current_domain->domain = heap_strndupW(subdomain_ptr, domain.str + domain.len - subdomain_ptr); if(!current_domain->domain) { heap_free(current_domain); return NULL; @@ -133,7 +134,7 @@ static cookie_domain_t *get_cookie_domain(const WCHAR *domain, BOOL create) list_add_tail(current_list, &current_domain->entry); } - if(ptr == domain) + if(ptr == domain.str) return current_domain; prev_domain = current_domain; @@ -147,7 +148,7 @@ static cookie_container_t *get_cookie_container(const WCHAR *domain, const WCHAR cookie_container_t *cookie_container, *iter; size_t path_len, len; - cookie_domain = get_cookie_domain(domain, create); + cookie_domain = get_cookie_domain(substrz(domain), create); if(!cookie_domain) return NULL; @@ -592,13 +593,13 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki while(ptr>subpath && ptr[-1]!='/') ptr--; }while(ptr != subpath); - domain = get_cookie_domain(host, FALSE); + domain = get_cookie_domain(substrz(host), FALSE); if(!domain) { TRACE("Unknown host %s\n", debugstr_w(host)); return ERROR_NO_MORE_ITEMS; } - for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { + for(domain = get_cookie_domain(substrz(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) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index eb3a023..7a01cdc 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -215,6 +215,22 @@ static inline char *heap_strdupWtoA(LPCWSTR str) return ret; } +typedef struct { + const WCHAR *str; + size_t len; +} substr_t; + +static inline substr_t substr(const WCHAR *str, size_t len) +{ + substr_t r = {str, len}; + return r; +} + +static inline substr_t substrz(const WCHAR *str) +{ + return substr(str, strlenW(str)); +} + static inline void WININET_find_data_WtoA(LPWIN32_FIND_DATAW dataW, LPWIN32_FIND_DATAA dataA) { dataA->dwFileAttributes = dataW->dwFileAttributes;

1 0