December 2015 - Wine-Commits

Alexandre Julliard : Wine release 1.8-rc3
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: website Branch: master Commit: 69a8bb0b6c9de8be1b48b4a80bd06f0e2763d623 URL: http://source.winehq.org/git/website.git/?a=commit;h=69a8bb0b6c9de8be1b48b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:19:36 2015 +0900 Wine release 1.8-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015120401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2015120401.xml b/news/en/2015120401.xml new file mode 100644 index 0000000..426f4a3 --- /dev/null +++ b/news/en/2015120401.xml @@ -0,0 +1,12 @@ +<news> +<date>December 4, 2015</date> +<title>Wine 1.8-rc3 Released</title> +<body> + The Wine development release 1.8-rc3 is now available. + <a href="{$root}/announce/1.8-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.8-rc3 : Alexandre Julliard : Release 1.8-rc3
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: refs/tags/wine-1.8-rc3 Tag: e91b5dc9bdc3fd4e72554cf8cf28636842a2c716 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e91b5dc9bdc3fd4e72554cf8cf28… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:17:34 2015 +0900 Release 1.8-rc3

1 0

Alexandre Julliard : Release 1.8-rc3.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: ffee96a80c0585fb5fcb041382540e2014d2f77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffee96a80c0585fb5fcb04138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:17:34 2015 +0900 Release 1.8-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 374 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 177 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffee96a80c0585fb5fcb0…

1 0

Alexandre Julliard : gdi32: Fix StretchDIBits color mapping for monochrome bitmaps without a color table.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: eddc4609eca7589c021e181b1701ec25b1ee0e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc4609eca7589c021e181b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:40:14 2015 +0900 gdi32: Fix StretchDIBits color mapping for monochrome bitmaps without a color table. This is the equivalent of df924f6a8ca6d4835c579141d16d866a574b380a for the StretchDIBits case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2817ede..cf1ebe4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -567,22 +567,33 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { + DWORD dst_colors = dst_info->bmiHeader.biClrUsed; + /* 1-bpp destination without a color table requires a fake 1-entry table - * that contains only the background color */ - if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed) + * that contains only the background color; except with a 1-bpp source, + * in which case it uses the source colors */ + if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { - COLORREF color = GetBkColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue( color ); - dst_info->bmiColors[0].rgbGreen = GetGValue( color ); - dst_info->bmiColors[0].rgbBlue = GetBValue( color ); - dst_info->bmiColors[0].rgbReserved = 0; - dst_info->bmiHeader.biClrUsed = 1; + if (src_info->bmiHeader.biBitCount > 1) + { + COLORREF color = GetBkColor( dev->hdc ); + dst_info->bmiColors[0].rgbRed = GetRValue( color ); + dst_info->bmiColors[0].rgbGreen = GetGValue( color ); + dst_info->bmiColors[0].rgbBlue = GetBValue( color ); + dst_info->bmiColors[0].rgbReserved = 0; + dst_info->bmiHeader.biClrUsed = 1; + } + else + { + memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); + dst_info->bmiHeader.biClrUsed = 2; + } } if (!(err = convert_bits( src_info, &src, dst_info, &src_bits ))) { /* get rid of the fake 1-bpp table */ - if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; + dst_info->bmiHeader.biClrUsed = dst_colors; err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, rop ); } }

1 0

Henri Verbeet : ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 821c2ed6a3478fadeafe7c64213b5f0af5f19d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821c2ed6a3478fadeafe7c642… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:15 2015 +0100 ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 ++++++- dlls/ddraw/tests/ddraw1.c | 74 ++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 74 ++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 86 +++++++++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw7.c | 86 +++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 292 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=821c2ed6a3478fadeafe7…

1 0

Henri Verbeet : ddraw: Mark surfaces as lost when the device window is deactivated.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 1ebb42ca534b58221b32cbf687de2ace00b4cbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebb42ca534b58221b32cbf68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:14 2015 +0100 ddraw: Mark surfaces as lost when the device window is deactivated. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 23 ++++++++++++++++++++--- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/surface.c | 23 ++++++----------------- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- dlls/wined3d/surface.c | 25 +------------------------ dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 3 --- 11 files changed, 46 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ebb42ca534b58221b32c…

1 0

Alistair Leslie-Hughes : webservices: Add missing break.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 7aefdc2f18beeb27e15c60c34ee93b88e50c3a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aefdc2f18beeb27e15c60c34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 4 20:55:22 2015 +1100 webservices: Add missing break. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 10f3aab..f701dce 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -321,6 +321,7 @@ void free_node( struct node *node ) { WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; heap_free( comment->value.bytes ); + break; } case WS_XML_NODE_TYPE_END_ELEMENT: case WS_XML_NODE_TYPE_EOF:

1 0

Dmitry Timoshkov : winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText().
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 34e88a4a7661e93f2420a82c493548ec7d6ea2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e88a4a7661e93f2420a82c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:15:11 2015 +0800 winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1dbfe08..bc36fa2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3051,6 +3051,7 @@ static void test_credentials(void) static void test_IWinHttpRequest(void) { + static const WCHAR data_start[] = {'<','!','D','O','C','T','Y','P','E',' ','h','t','m','l',' ','P','U','B','L','I','C'}; static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -3358,6 +3359,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); SysFreeString( response ); hr = IWinHttpRequest_get_Status( req, NULL );

1 0

Dmitry Timoshkov : winhttp/tests: For a secure connection check what WinHttpQueryDataAvailable() returns as well as first chunk of actual data.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 4b1eae9facbd028291cdc1ff77743e5732d2826a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1eae9facbd028291cdc1ff7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:14:38 2015 +0800 winhttp/tests: For a secure connection check what WinHttpQueryDataAvailable() returns as well as first chunk of actual data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d6b4649..1dbfe08 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -970,8 +970,9 @@ static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, L static void test_secure_connection(void) { + static const char data_start[] = "<!DOCTYPE html PUBLIC"; HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size, err; + DWORD size, status, policy, bitness, read_size, err, available_size; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -1050,6 +1051,11 @@ static void test_secure_connection(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + available_size = 0; + ret = WinHttpQueryDataAvailable(req, &available_size); + ok(ret, "failed to query available data %u\n", GetLastError()); + ok(available_size > 2014, "available_size = %u\n", available_size); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -1068,8 +1074,11 @@ static void test_secure_connection(void) ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); if (!size) break; read_size += size; + + if (read_size <= 32) + ok(!memcmp(buffer, data_start, sizeof(data_start)-1), "not expected: %.32s\n", buffer); } - ok(read_size > 2014, "read_size = %u\n", read_size); + ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); cleanup: WinHttpCloseHandle(req);

1 0

Nikolay Sivov : browseui: Use defined context kind constant with CoGetMalloc().
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 3e7da62ab85f2151906f1540510d38d4dbffdb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7da62ab85f2151906f15405… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 4 12:23:22 2015 +0300 browseui: Use defined context kind constant with CoGetMalloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 70c78c9..24183bd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -93,7 +93,7 @@ static void set_buffer(LPWSTR *buffer, LPCWSTR string) if (string == NULL) string = empty_string; - CoGetMalloc(1, &malloc); + CoGetMalloc(MEMCTX_TASK, &malloc); cb = (strlenW(string) + 1)*sizeof(WCHAR); if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer))

1 0