wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Alexandre Julliard : Wine release 7.0-rc5
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: website Branch: master Commit: ac222383618503b26604ab3c72280242b0c57126 URL: https://source.winehq.org/git/website.git/?a=commit;h=ac222383618503b26604a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 22:05:11 2022 +0100 Wine release 7.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022010701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022010701.xml b/news/en/2022010701.xml new file mode 100644 index 00000000..fc64eee3 --- /dev/null +++ b/news/en/2022010701.xml @@ -0,0 +1,13 @@ +<news> +<date>January 7, 2022</date> +<title>Wine 7.0-rc5 Released</title> +<body> + The Wine development release 7.0-rc5 is now available. + <a href="{$root}/announce/7.0-rc5">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/7.0/wine-7.0-rc5.tar.xz">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-7.0-rc5 : Alexandre Julliard : Release 7.0-rc5
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: refs/tags/wine-7.0-rc5 Tag: c3476ac59a610beece4679435a7bcacfce65ac63 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c3476ac59a610beece4679435a7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 22:03:02 2022 +0100 Release 7.0-rc5

1 0

Alexandre Julliard : Release 7.0-rc5.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 86eaf7eeb2603d1b13d18e3fe71a615e1ee14cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=86eaf7eeb2603d1b13d18e3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 22:03:02 2022 +0100 Release 7.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 229 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 ++--- 3 files changed, 130 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86eaf7eeb2603d1b13d1…

1 0

Stefan Brüns : d2d1/tests: Test StrokeContains when last segment is bezier and closes the path.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 2ec267c0dee64c5dc93305e45dae26ab8d719ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec267c0dee64c5dc93305e4… Author: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Date: Thu Jan 6 20:38:13 2022 +0100 d2d1/tests: Test StrokeContains when last segment is bezier and closes the path. Also check StrokeContains result on the last segment when the last vertex of a bezier curve coincedes with the first vertex of the figure and the figure is explicitly closed. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 70c47795b4e..2d9bcfc892e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10253,8 +10253,14 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, { 90.5f, 485.3f}, 0.1f, 1.0f, TRUE, TRUE}, {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, { 91.5f, 485.3f}, 0.1f, 1.0f, TRUE, FALSE}, {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, { 89.0f, 485.3f}, 0.1f, 1.0f, TRUE, FALSE}, - - /* 20. A curve where the control points project beyond the endpoints + {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, {167.0f, 729.8f}, 0.0f, 1.0f, TRUE, TRUE}, + {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, {167.0f, 728.6f}, 0.0f, 1.0f, TRUE, FALSE}, + {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, {167.0f, 731.0f}, 0.0f, 1.0f, TRUE, FALSE}, + {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, {173.0f, 729.8f}, 0.0f, 1.0f, TRUE, TRUE}, + {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, {173.0f, 728.6f}, 0.0f, 1.0f, TRUE, FALSE}, + {{{{1.0f, 0.0f, 0.0f, 1.0f, 10.0f, 10.0f}}}, {173.0f, 731.0f}, 0.0f, 1.0f, TRUE, FALSE}, + + /* 26. A curve where the control points project beyond the endpoints * onto the line through the endpoints. */ {{{{0.0f}}}, {306.97f, 791.67f}, 0.0f, 1.0f, FALSE, FALSE}, {{{{0.0f}}}, {307.27f, 791.67f}, 0.0f, 1.0f, FALSE, TRUE}, @@ -10271,7 +10277,7 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{0.0f}}}, {392.73f, 791.67f}, 0.0f, 1.0f, FALSE, TRUE}, {{{{0.0f}}}, {393.03f, 791.67f}, 0.0f, 1.0f, FALSE, FALSE}, - /* 32. A curve where the endpoints coincide. */ + /* 38. A curve where the endpoints coincide. */ {{{{0.0f}}}, {570.23f, 799.77f}, 0.0f, 1.0f, FALSE, FALSE}, {{{{0.0f}}}, {570.53f, 799.77f}, 0.0f, 1.0f, FALSE, TRUE}, {{{{0.0f}}}, {571.73f, 799.77f}, 0.0f, 1.0f, FALSE, TRUE}, @@ -10287,7 +10293,7 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{0.0f}}}, {629.47f, 799.77f}, 0.0f, 1.0f, FALSE, TRUE}, {{{{0.0f}}}, {629.77f, 799.77f}, 0.0f, 1.0f, FALSE, FALSE}, - /* 44. A curve with coinciding endpoints, as well as coinciding + /* 50. A curve with coinciding endpoints, as well as coinciding * control points. */ {{{{0.0f}}}, {825.00f, 800.00f}, 0.0f, 1.0f, FALSE, TRUE}, {{{{0.0f}}}, {861.00f, 824.00f}, 0.0f, 1.0f, FALSE, TRUE}, @@ -10296,7 +10302,7 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{0.0f}}}, {864.00f, 824.00f}, 0.0f, 1.0f, FALSE, FALSE}, {{{{0.0f}}}, {864.00f, 826.00f}, 0.0f, 1.0f, FALSE, FALSE}, - /* 50. Shear transforms. */ + /* 56. Shear transforms. */ {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, { 837.2f, 600.0f}, 0.1f, 5.0f, TRUE, FALSE}, {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, { 837.5f, 600.0f}, 0.1f, 5.0f, TRUE, TRUE}, {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1186.3f, 791.7f}, 0.1f, 5.0f, TRUE, TRUE},

1 0

Henri Verbeet : wined3d: Use GL_MAP_PERSISTENT_BIT even for non-persistent bo maps.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 1908cb9501b3bdd87b211735f586eedb8b98a01a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1908cb9501b3bdd87b211735… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 12:58:45 2022 +0100 wined3d: Use GL_MAP_PERSISTENT_BIT even for non-persistent bo maps. While the reason for doing this is to allow draws referencing mapped buffer resources to succeed, the behaviour of the application in the referenced bug report (FlatOut) appears to be slightly different; it does end up drawing while buffer objects are mapped due to reordering of map operations inside the command stream, but as far as I can tell those buffer objects are not referenced by the draw. The driver in question (fglrx/Catalyst) appears to simply be a bit overzealous with throwing errors, and unfortunately doesn't provide much more information than "glDrawElementsBaseVertex has generated an error (GL_INVALID_OPERATION)". The issue is not reproducible with Mesa radeonsi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46118 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c08e44ce372..9fd2ed67dcc 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2711,7 +2711,7 @@ map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_BUFFER_STORAGE] && wined3d_map_persistent()) + if (gl_info->supported[ARB_BUFFER_STORAGE]) { GLbitfield gl_flags; @@ -2719,15 +2719,28 @@ map: * used to create the bo, instead of the access flags passed to the * map call. Otherwise, if for example the initial map call that * caused the bo to be persistently mapped was a read-only map, - * subsequent write access to the bo would be undefined. */ - gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + * subsequent write access to the bo would be undefined. + * + * Note that we use GL_MAP_PERSISTENT_BIT for non-persistent maps here + * as well, in order to allow draws to succeed while referenced buffer + * resources are mapped. On the other hand, we don't want to use the + * access flags used to create the bo for non-persistent maps, because + * that may imply dropping GL_MAP_UNSYNCHRONIZED_BIT. */ + if (wined3d_map_persistent()) + { + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + } + else + { + gl_flags = wined3d_resource_gl_map_flags(bo, flags); + } gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - if (!(gl_flags & GL_MAP_READ_BIT)) - gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; - if (gl_flags & GL_MAP_WRITE_BIT) - gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)))) + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags))) && wined3d_map_persistent()) bo->b.map_ptr = map_ptr; } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE])

1 0

Alex Henrie : d3dx9_36/tests: Add missing call to ID3DXSprite_End.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 4dd6408e89bec13a475180784ee976c7b471dbbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd6408e89bec13a47518078… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 3 00:27:05 2022 -0700 d3dx9_36/tests: Add missing call to ID3DXSprite_End. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index a8477591e87..ea2d1e4465b 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -319,6 +319,8 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) ok (hr == D3D_OK, "Begin returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXSprite_Draw(sprite, tex2, &rect, &center, &pos, D3DCOLOR_XRGB(255, 255, 255)); ok (hr == D3D_OK, "Draw returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXSprite_End(sprite); + ok (hr == D3D_OK, "End returned %#x, expected %#x\n", hr, D3D_OK); IDirect3DDevice9_EndScene(device); check_release((IUnknown*)sprite, 0);

1 0

Olivier F. R. Dierick : taskschd: Set count to zero in regtasks_get_Count stub.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: bbd9b9bfee41ae2274e9579f418b0b741e29e6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd9b9bfee41ae2274e9579f… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Fri Jan 7 00:58:03 2022 +0100 taskschd: Set count to zero in regtasks_get_Count stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52349 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/regtask.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 0b4b5717657..094f34d8f79 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -465,6 +465,7 @@ static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID d static HRESULT WINAPI regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) { FIXME("%p,%p: stub\n", iface, count); + if (count) *count = 0; return E_NOTIMPL; }

1 0

Zebediah Figura : cryptnet: Open the revocation cache file in binary mode.
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: c51bf452bacf74db921dc7ea700cde66bd9374d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c51bf452bacf74db921dc7ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 6 18:47:47 2022 -0600 cryptnet: Open the revocation cache file in binary mode. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2f4e2d895f7..e1b32216353 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1578,7 +1578,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, FILE *file; int len; - if (!(file = open_cached_revocation_file(serial, L"r", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(serial, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1626,7 +1626,7 @@ static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, { FILE *file; - if (!(file = open_cached_revocation_file(serial, L"w", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(serial, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file);

1 0

Zebediah Figura : amstream: Trace some format fields in IDirectDrawMediaStream::SetFormat().
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 73ee53813c2a6b887c53e2617ede23ee0a0516f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ee53813c2a6b887c53e261… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 6 17:27:21 2022 -0600 amstream: Trace some format fields in IDirectDrawMediaStream::SetFormat(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index b1b79756ff9..af4492fe3e8 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -549,6 +549,10 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr if (format->dwSize != sizeof(DDSURFACEDESC)) return E_INVALIDARG; + TRACE("flags %#x, pixel format flags %#x, bit count %u, size %ux%u.\n", + format->dwFlags, format->ddpfPixelFormat.dwFlags, + format->ddpfPixelFormat.u1.dwRGBBitCount, format->dwWidth, format->dwHeight); + if (format->dwFlags & DDSD_PIXELFORMAT) { if (format->ddpfPixelFormat.dwSize != sizeof(DDPIXELFORMAT))

1 0

Zebediah Figura : server: Avoid reporting POLLOUT on connection failure in poll_single_socket().
by Alexandre Julliard 07 Jan '22

07 Jan '22

Module: wine Branch: master Commit: 51e5995d47b7de9a2d0d6a40f7eb3e3c11b83cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e5995d47b7de9a2d0d6a40… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 6 17:26:43 2022 -0600 server: Avoid reporting POLLOUT on connection failure in poll_single_socket(). Ideally we should be using sock_get_poll_events() and sock_poll_event() instead, but that seems like an overly risky change for this late in code freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51442 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 782b1e59729..054e597b719 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6830,7 +6830,7 @@ static void test_WSAPoll(void) fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM; fds[0].revents = 0xdead; ret = pWSAPoll(fds, 1, 10000); - todo_wine ok(ret == 1, "got %d\n", ret); + ok(ret == 1, "got %d\n", ret); todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents); len = sizeof(err); diff --git a/server/sock.c b/server/sock.c index c7378306511..650e67a2e0a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2979,6 +2979,9 @@ static int poll_single_socket( struct sock *sock, int mask ) if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) return 0; + if (sock->state == SOCK_CONNECTING && (pollfd.revents & (POLLERR | POLLHUP))) + pollfd.revents &= ~POLLOUT; + if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM) { char dummy;

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022