December 2015 - Wine-commits

Alistair Leslie-Hughes : oledb32: GetConversionSize shouldn' t fail for null variants.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: e5daf3397839a7527a921a8edb9091e1655e484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5daf3397839a7527a921a8ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 17:47:48 2015 +1100 oledb32: GetConversionSize shouldn't fail for null variants. If we have a NULL variant which will be converted to a non-fixed sized type (DBTYPE_WSTR) then we just return S_OK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 3 +++ dlls/oledb32/tests/convert.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 891b31c..0a1518d 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1344,6 +1344,9 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, if ((*dst_len = get_length(dst_type))) return S_OK; + if(src_type == DBTYPE_VARIANT && V_VT((VARIANT*)src) == VT_NULL) + return S_OK; + switch (dst_type) { case DBTYPE_STR: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a785457..46719b1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2631,16 +2631,25 @@ static void test_getconversionsize(void) src_len = 20; V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(strW); - hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 5, "%ld\n", dst_len); + VariantClear(&var); + + src_len = 20; + V_VT(&var) = VT_I4; + V_I4(&var) = 4; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(dst_len == 2, "%ld\n", dst_len); VariantClear(&var); dst_len = 0; src_len = 20; - V_VT(&var) = VT_NULL; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 2, "%ld\n", dst_len); VariantClear(&var); dst_len = 0; @@ -2655,6 +2664,30 @@ static void test_getconversionsize(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 1802, "%ld\n", dst_len); VariantClear(&var); + + /* On Windows, NULL variants being convert to a non-fixed sized type will return a dst_len of + * 110 but we aren't testing for this value. + */ + dst_len = 32; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_I4, NULL, &dst_len, &var); + ok(dst_len == 4, "%ld\n", dst_len); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + src_len = 20; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + } static void test_converttobytes(void)

1 0

André Hentschel : msvcrt: Don' t continue on demangle failure (Coverity).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 51098fcd94457b46945a03131c4cd1f049682d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51098fcd94457b46945a03131… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:35:04 2015 +0100 msvcrt: Don't continue on demangle failure (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/undname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index beaec4f..097f036 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1379,6 +1379,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;

1 0

Jactry Zeng : riched20/tests: Test EM_GETTEXTRANGE with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: fb304e0e4e5594c327482e8f1b5eeed01ee72bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb304e0e4e5594c327482e8f1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:16 2015 +0800 riched20/tests: Test EM_GETTEXTRANGE with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1b2a257..dabe104 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1542,6 +1542,19 @@ static void test_EM_GETTEXTRANGE(void) ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + textRange.chrg.cpMin = 4; + textRange.chrg.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + todo_wine ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } + DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched32/tests: Test EM_GETTEXTRANGE with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 4871b0236bca93e33b8e89bbdf18471f264cbf4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4871b0236bca93e33b8e89bbd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:42 2015 +0800 riched32/tests: Test EM_GETTEXTRANGE with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index ff37750..e200ff3 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -566,6 +566,18 @@ static void test_EM_GETTEXTRANGE(void) ok(!strcmp(expect3, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + textRange.chrg.cpMin = 4; + textRange.chrg.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched20/tests: Test EM_GETSELTEXT with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 30049ba798ab9c758f6f7c0bfca22ef82c5b8366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30049ba798ab9c758f6f7c0bf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:54 2015 +0800 riched20/tests: Test EM_GETSELTEXT with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index dabe104..bfd9ba5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1571,15 +1571,27 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + todo_wine ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched32/tests: Test EM_GETSELTEXT with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 2226358773b2c268d8e8c3de0571308622acd9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2226358773b2c268d8e8c3de0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:11 2015 +0800 riched32/tests: Test EM_GETSELTEXT with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index e200ff3..62c0d00 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -596,17 +596,27 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 12); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 8, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect1, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - - ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect2, buffer), "EM_GETSELTEXT filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched20/tests: Add tests for WM_GETTEXTLENGTH.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: bb5974987e66de2386d45f87c75912aae233f3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5974987e66de2386d45f87c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:19 2015 +0800 riched20/tests: Add tests for WM_GETTEXTLENGTH. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bfd9ba5..8e93ba8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8241,6 +8241,37 @@ static void test_alignment_style(void) DestroyWindow(richedit); } +static void test_WM_GETTEXTLENGTH(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; + int result; + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text1), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text1)); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text2), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -8285,6 +8316,7 @@ START_TEST( editor ) test_EM_FORMATRANGE(); test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); + test_WM_GETTEXTLENGTH(); test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY();

1 0

Jactry Zeng : riched32/tests: Test WM_GETTEXTLENGTH with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 439e9c6a31422fa3c4d336d5f7d6c1e54d890b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439e9c6a31422fa3c4d336d5f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:39 2015 +0800 riched32/tests: Test WM_GETTEXTLENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 62c0d00..c299348 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -130,22 +130,33 @@ static void test_WM_SETTEXT(void) static void test_WM_GETTEXTLENGTH(void) { HWND hwndRichEdit = new_richedit(NULL); - static const char text3[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; - static const char text4[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; int result; /* Test for WM_GETTEXTLENGTH */ - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text3), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text3)); + ok(result == lstrlenA(text1), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text1)); - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text4); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text4), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text4)); + ok(result == lstrlenA(text2), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } DestroyWindow(hwndRichEdit); }

1 0

Hans Leidekker : qmgr: Use the full path for HTTP downloads.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 69d0764196506da7405a401c1feb0216b278ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d0764196506da7405a401c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:04:57 2015 +0100 qmgr: Use the full path for HTTP downloads. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 70d3a50..2525caf 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -477,7 +477,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; - WCHAR host[MAX_PATH], path[MAX_PATH]; + WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; BOOL ret; @@ -519,10 +519,8 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.lpszHostName = host; uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); uc.nPort = 0; - uc.lpszUrlPath = path; - uc.dwUrlPathLength = sizeof(path)/sizeof(path[0]); - uc.lpszExtraInfo = NULL; - uc.dwExtraInfoLength = 0; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = ~0u; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) {

1 0

Hans Leidekker : dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: e10c48143aadc9fbec7677847d3d9eab66bf441f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10c48143aadc9fbec7677847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:05:30 2015 +0100 dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 6 +++--- dlls/dnsapi/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/name.c | 21 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 4f6f1c8..de0ed1d 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -32,9 +32,9 @@ @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone @ stdcall DnsFlushResolverCache() -@ stub DnsFlushResolverCacheEntry_A -@ stub DnsFlushResolverCacheEntry_UTF8 -@ stub DnsFlushResolverCacheEntry_W +@ stdcall DnsFlushResolverCacheEntry_A(str) +@ stdcall DnsFlushResolverCacheEntry_UTF8(str) +@ stdcall DnsFlushResolverCacheEntry_W(wstr) @ stdcall DnsFree(ptr long) @ stub DnsFreeAdapterInformation @ stub DnsFreeNetworkInformation diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index d4f716a..93528a2 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -93,6 +93,38 @@ VOID WINAPI DnsFlushResolverCache(void) FIXME(": stub\n"); } +/****************************************************************************** + * DnsFlushResolverCacheEntry_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_A( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_UTF8 [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_UTF8( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_w(entry) ); + if (!entry) return FALSE; + return TRUE; +} /****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index fba6955..3e54355 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -27,6 +27,8 @@ #include "wine/test.h" +BOOL WINAPI DnsFlushResolverCacheEntry_A(PCSTR); + static const struct { LPCSTR name; @@ -202,8 +204,27 @@ static void test_DnsNameCompare_A( void ) ok( DnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsFlushResolverCacheEntry_A(void) +{ + BOOL ret; + DWORD err; + + SetLastError( 0xdeadbeef ); + ret = DnsFlushResolverCacheEntry_A( NULL ); + err = GetLastError(); + ok( !ret, "got %d\n", ret ); + ok( err == 0xdeadbeef, "got %u\n", err ); + + ret = DnsFlushResolverCacheEntry_A( "localhost" ); + ok( ret, "got %d\n", ret ); + + ret = DnsFlushResolverCacheEntry_A( "nxdomain.test.winehq.org" ); + ok( ret, "got %d\n", ret ); +} + START_TEST(name) { test_DnsValidateName_A(); test_DnsNameCompare_A(); + test_DnsFlushResolverCacheEntry_A(); }

1 0