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

Nikolay Sivov : dwrite: Don' t reset advances if original and modified advances are the same array.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: cc610a09334731f1832492c79d7b0075df2556d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc610a09334731f1832492c79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:51:36 2016 +0300 dwrite: Don't reset advances if original and modified advances are the same array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 3 ++- dlls/dwrite/tests/analyzer.c | 64 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 90b53ad..9ae0cca 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1374,7 +1374,8 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly len, glyph_count, clustermap, advances, offsets, props, modified_advances, modified_offsets); if (min_advance_width < 0.0f) { - memset(modified_advances, 0, glyph_count*sizeof(*modified_advances)); + if (modified_advances != advances) + memset(modified_advances, 0, glyph_count*sizeof(*modified_advances)); return E_INVALIDARG; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 23c3d22..ea09bd5 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1723,7 +1723,7 @@ static void test_ApplyCharacterSpacing(void) offsets[0].advanceOffset = ptr->offsets[0]; offsets[1].advanceOffset = ptr->offsets[1]; offsets[2].advanceOffset = ptr->offsets[2]; - /* Ascender offsets are never thouched as spacing applies in reading direction only, + /* Ascender offsets are never touched as spacing applies in reading direction only, we'll only test them to see if they are not changed */ offsets[0].ascenderOffset = 23.0; offsets[1].ascenderOffset = 32.0; @@ -1758,11 +1758,8 @@ static void test_ApplyCharacterSpacing(void) props, advances, offsets); - /* invalid argument cases */ - if (ptr->min_advance < 0.0) - ok(hr == E_INVALIDARG, "%d: got 0x%08x\n", i, hr); - else - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "%d: got 0x%08x\n", i, hr); + if (hr == S_OK) { ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); @@ -1791,6 +1788,61 @@ static void test_ApplyCharacterSpacing(void) ok(offsets[0].ascenderOffset == 23.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); ok(offsets[1].ascenderOffset == 32.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); } + + /* same, with argument aliasing */ + memcpy(advances, ptr->advances, glyph_count * sizeof(*advances)); + offsets[0].advanceOffset = ptr->offsets[0]; + offsets[1].advanceOffset = ptr->offsets[1]; + offsets[2].advanceOffset = ptr->offsets[2]; + /* Ascender offsets are never touched as spacing applies in reading direction only, + we'll only test them to see if they are not changed */ + offsets[0].ascenderOffset = 23.0f; + offsets[1].ascenderOffset = 32.0f; + offsets[2].ascenderOffset = 31.0f; + + hr = IDWriteTextAnalyzer1_ApplyCharacterSpacing(analyzer1, + ptr->leading, + ptr->trailing, + ptr->min_advance, + sizeof(clustermap)/sizeof(clustermap[0]), + glyph_count, + clustermap, + advances, + offsets, + props, + advances, + offsets); + ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "%d: got 0x%08x\n", i, hr); + + if (hr == S_OK) { + ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); + ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); + if (glyph_count > 2) + ok(ptr->modified_advances[2] == advances[2], "%d: got advance[2] %.2f, expected %.2f\n", i, advances[2], ptr->modified_advances[2]); + + ok(ptr->modified_offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + offsets[0].advanceOffset, ptr->modified_offsets[0]); + ok(ptr->modified_offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + offsets[1].advanceOffset, ptr->modified_offsets[1]); + if (glyph_count > 2) + ok(ptr->modified_offsets[2] == offsets[2].advanceOffset, "%d: got offset[2] %.2f, expected %.2f\n", i, + offsets[2].advanceOffset, ptr->modified_offsets[2]); + + ok(offsets[0].ascenderOffset == 23.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); + ok(offsets[2].ascenderOffset == 31.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[2].ascenderOffset); + } + else { + /* with aliased advances original values are retained */ + ok(ptr->advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->advances[0]); + ok(ptr->advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->advances[1]); + ok(ptr->offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + offsets[0].advanceOffset, ptr->modified_offsets[0]); + ok(ptr->offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + offsets[1].advanceOffset, ptr->modified_offsets[1]); + ok(offsets[0].ascenderOffset == 23.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); + } } IDWriteTextAnalyzer1_Release(analyzer1);

1 0

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

17 May '16

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 : amstream/tests: Simplify refcount check.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: b9357ecaad919a96df5a1461c9527b56718f8b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9357ecaad919a96df5a1461c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:54:31 2016 +0300 amstream/tests: Simplify refcount check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1db88c2..c9e9392 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -29,9 +29,10 @@ #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0};

1 0

Sebastian Lackner : wininet: Return synchronously from InternetReadFile if there is no more data to read.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a3a572beb07a9072cba9a619eafeae26ccc8cb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a572beb07a9072cba9a619e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 11 23:25:18 2016 +0200 wininet: Return synchronously from InternetReadFile if there is no more data to read. Similar to 87fffa1ebfb71fe7a34aa989fa88f85409dbb62f. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 646619b..c7d857e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3242,7 +3242,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW if (TryEnterCriticalSection( &req->read_section )) { - if (get_avail_data(req)) + if (get_avail_data(req) || end_of_read_data(req)) { res = HTTPREQ_Read(req, buffer, size, read); LeaveCriticalSection( &req->read_section );

1 0

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

17 May '16

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 : po: Update Russian translation.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 0fc9a55c8b646cac88882949a7e65449297159cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc9a55c8b646cac88882949a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 22:16:38 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index a78a280..c3259ce 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 22:10+0300\n" +"PO-Revision-Date: 2016-05-16 22:15+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -2994,7 +2994,7 @@ msgstr "%1!u!МБ используется, %2!u!МБ доступно" #: gdi32.rc:28 msgid "Western" -msgstr "Западный" +msgstr "Западноевропейский" #: gdi32.rc:29 msgid "Central European" @@ -3038,19 +3038,19 @@ msgstr "Японский" #: gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "CHINESE_GB2312" +msgstr "Китайский GB2312" #: gdi32.rc:40 msgid "Hangul" -msgstr "Хангул" +msgstr "Хангыль" #: gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "CHINESE_BIG5" +msgstr "Китайский BIG5" #: gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "Хангул(Johab)" +msgstr "Хангыль(Johab)" #: gdi32.rc:43 msgid "Symbol"

1 0

Jacek Caban : wininet: Fixed internet tests on win10.
by Alexandre Julliard 17 May '16

17 May '16

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

Jacek Caban : wininet: Fixed handing NULL buffer in InternetReadFileExW.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: f70c9ae8d147ac2f4377dae1f90eacf18d05df91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70c9ae8d147ac2f4377dae1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:19 2016 +0200 wininet: Fixed handing NULL buffer in InternetReadFileExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/http.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5359794..e192592 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2280,7 +2280,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext); - if (lpBuffer->dwStructSize != sizeof(*lpBuffer)) { + if (!lpBuffer || lpBuffer->dwStructSize != sizeof(*lpBuffer)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b4cad7d..78cec50 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1067,6 +1067,11 @@ static void InternetReadFileExA_test(int flags) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe); + ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER), + "InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n", + rc ? "TRUE" : "FALSE", GetLastError()); + /* tests invalid dwStructSize */ inetbuffers.dwStructSize = sizeof(inetbuffers)+1; inetbuffers.lpcszHeader = NULL;

1 0

Jacek Caban : wininet: Pass domain to get_cookie_domain as a substring.
by Alexandre Julliard 17 May '16

17 May '16

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

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

17 May '16

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