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

Jacek Caban : wininet: Updated winehq.org cert info.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f6714f3832541250476989ad579523b4e8b28f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6714f3832541250476989ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:46:21 2016 +0200 wininet: Updated winehq.org cert info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fde2254..3f65784 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4876,14 +4876,11 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)14\r\n" - "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org", "US\r\n" "GeoTrust Inc.\r\n" - "RapidSSL SHA256 CA - G3" + "RapidSSL SHA256 CA" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Jacek Caban : wininet: Fixed http tests on win10.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f4e68eef37615e6351f8264886c686d9980b9876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e68eef37615e6351f826488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:46:40 2016 +0200 wininet: Fixed http tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3f65784..b09f20d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -520,7 +520,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); - ok(length == 0, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); + ok(length == 0 || (length == 1 && !*buffer) /* win10 */, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); ok(!strcmp(buffer, ""), "HTTP_QUERY_RAW_HEADERS: expected string \"\", but got \"%s\"\n", buffer); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -1759,8 +1759,8 @@ static void HttpHeaders_test(void) memset(buffer, 'x', sizeof(buffer)); ok(HttpQueryInfoA(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF, buffer,&len,&index) == TRUE,"Query failed\n"); - ok(len == 2, "Expected 2, got %d\n", len); - ok(strcmp(buffer, "\r\n") == 0, "Expected CRLF, got '%s'\n", buffer); + ok(len == 2 || len == 4 /* win10 */, "Expected 2 or 4, got %d\n", len); + ok(memcmp(buffer, "\r\n\r\n", len) == 0, "Expected CRLF, got '%s'\n", buffer); ok(index == 0, "Index was incremented\n"); ok(HttpAddRequestHeadersA(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), @@ -1962,8 +1962,7 @@ static const char contmsg[] = static const char expandcontmsg[] = "HTTP/1.1 100 Continue\r\n" "Server: winecontinue\r\n" -"Tag: something witty\r\n" -"\r\n"; +"Tag: something witty\r\n"; static const char okmsg[] = "HTTP/1.1 200 OK\r\n" @@ -2390,6 +2389,8 @@ static void test_basic_request(int port, const char *verb, const char *url) DWORD r, count, error; char buffer[0x100]; + trace("basic request %s %s\n", verb, url); + hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); @@ -2403,7 +2404,7 @@ static void test_basic_request(int port, const char *verb, const char *url) r = HttpSendRequestA(hr, NULL, 0, NULL, 0); error = GetLastError(); ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed: %u\n", GetLastError()); count = 0; memset(buffer, 0, sizeof buffer); @@ -3073,14 +3074,24 @@ static void test_header_override(int port) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); - err = GetLastError(); - todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n"); - todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + if(ret) { /* win10 returns success */ + trace("replacing host header is supported.\n"); - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); - test_status_code_todo(req, 400); + test_status_code(req, 200); + }else { + trace("replacing host header is not supported.\n"); + + err = GetLastError(); + ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + } InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Jacek Caban : wininet: Get rid of test_http1_1 test.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 1d834438ca1a490ab7e3725c6dbed17461790b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d834438ca1a490ab7e3725c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:48:23 2016 +0200 wininet: Get rid of test_http1_1 test. I can only guess what author meant to test, but those are useless in their current shape and we already have better persistent connection tests anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b09f20d..1b4ce3b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2041,7 +2041,6 @@ static DWORD CALLBACK server_thread(LPVOID param) int last_request = 0; char host_header[22]; char host_header_override[30]; - static BOOL test_b = FALSE; static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2190,13 +2189,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (!test_b && strstr(buffer, "/testB HTTP/1.1")) - { - test_b = TRUE; - send(c, okmsg, sizeof okmsg-1, 0); - recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); - send(c, okmsg, sizeof okmsg-1, 0); - } if (strstr(buffer, "/testC")) { if (strstr(buffer, "Cookie: cookie=biscuit")) @@ -3098,37 +3090,6 @@ static void test_header_override(int port) InternetCloseHandle(ses); } -static void test_http1_1(int port) -{ - HINTERNET ses, con, req; - BOOL ret; - - ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(ses != NULL, "InternetOpen failed\n"); - - con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(con != NULL, "InternetConnect failed\n"); - - req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); - ok(req != NULL, "HttpOpenRequest failed\n"); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - if (ret) - { - InternetCloseHandle(req); - - req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); - ok(req != NULL, "HttpOpenRequest failed\n"); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); - } - - InternetCloseHandle(req); - InternetCloseHandle(con); - InternetCloseHandle(ses); -} - static void test_connection_closing(int port) { HINTERNET session, connection, req; @@ -4840,7 +4801,6 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); test_header_override(si.port); - test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port); test_invalid_response_headers(si.port);

1 0

Jacek Caban : wininet: Added open_simple_request helper and use it where appropriate.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f5c97b5060a6633a5ca71efb5fdd087818ed323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c97b5060a6633a5ca71efb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:48:36 2016 +0200 wininet: Added open_simple_request helper and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 341 +++++++++++++++++----------------------------- 1 file changed, 125 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5c97b5060a6633a5ca71…

1 0

Gerald Pfeifer : riched20: Properly clear all of a buffer of type WCHAR.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 8fb1802b9c07eabd5740107d33ac7c851a1e2f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb1802b9c07eabd5740107d3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue May 10 09:57:39 2016 -0500 riched20: Properly clear all of a buffer of type WCHAR. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ae9c0a5..6a77d9a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3822,7 +3822,7 @@ static void test_EM_SETTEXTEX(void) getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3837,7 +3837,7 @@ static void test_EM_SETTEXTEX(void) getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n");

1 0

Piotr Caban : msvcrt: Fix mbtowc behavior for buffers containing more than one character.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: a36b5f0741ac7e6a44aaa9d804ebdb7524186723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36b5f0741ac7e6a44aaa9d80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 6 22:09:14 2016 +0200 msvcrt: Fix mbtowc behavior for buffers containing more than one character. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 56945bb..2c73de0 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2157,17 +2157,25 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, if(n <= 0 || !str) return 0; - if(!locinfo->lc_codepage) - tmpdst = (unsigned char)*str; - else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) - return -1; - if(dst) - *dst = tmpdst; - /* return the number of bytes from src that have been used */ - if(!*str) + + if(!*str) { + if(dst) *dst = 0; return 0; - if(n >= 2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale) && str[1]) + } + + if(!locinfo->lc_codepage) { + if(dst) *dst = (unsigned char)*str; + return 1; + } + if(n>=2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale)) { + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 2, &tmpdst, 1)) + return -1; + if(dst) *dst = tmpdst; return 2; + } + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 1, &tmpdst, 1)) + return -1; + if(dst) *dst = tmpdst; return 1; }

1 0

Alex Henrie : riched20: Don' t call UpdateWindow after setting the background color.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: e60b2766987c09dd3ea13adc57df11ee03c05f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60b2766987c09dd3ea13adc5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 9 08:57:12 2016 -0600 riched20: Don't call UpdateWindow after setting the background color. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/tests/editor.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7ac94ca..85395e7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3626,7 +3626,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - ITextHost_TxViewChange(editor->texthost, TRUE); return lColor; } case EM_GETMODIFY: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6a77d9a..31d5128 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8337,6 +8337,17 @@ static void test_rtf_specials(void) DestroyWindow( edit ); } +static void test_background(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + + /* set the background color to black */ + ValidateRect(hwndRichEdit, NULL); + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); + + DestroyWindow(hwndRichEdit); +} START_TEST( editor ) { @@ -8408,6 +8419,7 @@ START_TEST( editor ) test_EM_SETFONTSIZE(); test_alignment_style(); test_rtf_specials(); + test_background(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Kirill Smirnov : msi: Do not return success on failure (spotted by clang).
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 0869852c2e08c7bbd8bd6ebbdf89e92012d8a706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0869852c2e08c7bbd8bd6ebbd… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 13:51:34 2016 +0300 msi: Do not return success on failure (spotted by clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/where.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index e3bc9b7..ddd8c07 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -593,7 +593,7 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const UINT rows[], default: ERR("Invalid expression type\n"); - break; + return ERROR_FUNCTION_FAILED; } return ERROR_SUCCESS;

1 0

Andrey Gusev : wined3d: Fix a typo in checkGLcall.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: ecb5a74b3607f45a545ae87ba97c8030c5035620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb5a74b3607f45a545ae87ba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 28 13:58:53 2016 +0300 wined3d: Fix a typo in checkGLcall. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0a7370..d1f77ca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,7 +827,7 @@ static void create_default_sampler(struct wined3d_device *device) checkGLcall("glGenSamplers"); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST)); - checkGLcall("glSamplerParamteri"); + checkGLcall("glSamplerParameteri"); } else {

1 0

Michael Stefaniuc : wined3d: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 128e6b5975b6837b0a2605cbd857d04d4a2b7ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128e6b5975b6837b0a2605cbd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 21:48:05 2016 +0200 wined3d: Use IsRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3c028c..e0d7c80 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1147,8 +1147,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); src_rect = &r; } - else if (src_rect->left < 0 || src_rect->left >= src_rect->right - || src_rect->top < 0 || src_rect->top >= src_rect->bottom) + else if (src_rect->left < 0 || src_rect->top < 0 || IsRectEmpty(src_rect)) { WARN("Invalid source rectangle.\n"); return WINED3DERR_INVALIDCALL; @@ -4032,8 +4031,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level); - if (dst_rect->left >= dst_rect->right || dst_rect->top >= dst_rect->bottom - || dst_rect->left > dst_w || dst_rect->left < 0 + if (IsRectEmpty(dst_rect) || dst_rect->left > dst_w || dst_rect->left < 0 || dst_rect->top > dst_h || dst_rect->top < 0 || dst_rect->right > dst_w || dst_rect->right < 0 || dst_rect->bottom > dst_h || dst_rect->bottom < 0) @@ -4046,8 +4044,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { src_w = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); src_h = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); - if (src_rect->left >= src_rect->right || src_rect->top >= src_rect->bottom - || src_rect->left > src_w || src_rect->left < 0 + if (IsRectEmpty(src_rect) || src_rect->left > src_w || src_rect->left < 0 || src_rect->top > src_h || src_rect->top < 0 || src_rect->right > src_w || src_rect->right < 0 || src_rect->bottom > src_h || src_rect->bottom < 0)

1 0