March 2022 - Wine-commits - list.winehq.org

Paul Gofman : ws2_32: Manage shorter length for IPV6_V6ONLY.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 081ba0ee2fc0a221f07e0a3167c2848bcff61faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=081ba0ee2fc0a221f07e0a31… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:53 2022 +0300 ws2_32: Manage shorter length for IPV6_V6ONLY. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a4a60df8d6..3d0c2deca35 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1890,6 +1890,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF, optval, optlen ); case IPV6_V6ONLY: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_V6ONLY, optval, optlen ); default: @@ -3277,7 +3283,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); case IPV6_V6ONLY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_V6ONLY, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + value = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_V6ONLY, (char *)&value, sizeof(value) ); default: FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0746b07f4f1..6cb8ff0a7a8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1196,6 +1196,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_RECVTCLASS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_UNICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_V6ONLY, TRUE, {1, 1, 1}, {0}, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Stefan Dösinger : wined3d: Rename resource_acquire to resource_reference.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: bff2bbc904966d284591bcd1564964316c6f8acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff2bbc904966d284591bcd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 15:02:53 2022 +0300 wined3d: Rename resource_acquire to resource_reference. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 106 ++++++++++++++++++++--------------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +-- 3 files changed, 57 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bff2bbc904966d284591…

1 0

Stefan Dösinger : wined3d: Replace the GE_WRAP macro with a function.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: b854c12a3eb65f0f26279e73ee1f31941d9fa341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b854c12a3eb65f0f26279e73… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 15:02:54 2022 +0300 wined3d: Replace the GE_WRAP macro with a function. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4492ce6ef42..9fb3b27444e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5087,6 +5087,12 @@ static inline void wined3d_resource_reference(struct wined3d_resource *resource) resource->access_time = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; } +static inline BOOL wined3d_ge_wrap(ULONG x, ULONG y) +{ + return (x - y) < UINT_MAX / 2; +} +C_ASSERT(WINED3D_CS_QUEUE_SIZE < UINT_MAX / 4); + static inline void wined3d_resource_wait_idle(const struct wined3d_resource *resource) { const struct wined3d_cs *cs = resource->device->cs; @@ -5100,11 +5106,11 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res /* The basic idea is that a resource is busy if tail < access_time <= head. * But we have to be careful about wrap-around of the head and tail. The - * GE_WRAP macro below considers x >= y if x - y is smaller than half the + * wined3d_ge_wrap function considers x >= y if x - y is smaller than half the * UINT range. Head is at most WINED3D_CS_QUEUE_SIZE ahead of tail, because * otherwise the queue memory is considered full and queue_require_space - * stalls. Thus GE_WRAP(head, tail) is always true. The C_ASSERT below ensures - * this in case we decide to grow the queue size in the future. + * stalls. Thus wined3d_ge_wrap(head, tail) is always true. The C_ASSERT above + * ensures this in case we decide to grow the queue size in the future. * * It is possible that a resource has not been used for a long time and is idle, but the head and * tail wrapped around in such a way that the previously set access time falls between head and tail. @@ -5117,8 +5123,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res * Note that the access time is set before the command is submitted, so we have to wait until the * tail is bigger than access_time, not equal. */ -#define GE_WRAP(x, y) (((x)-(y)) < (UINT_MAX / 2)) - if (!GE_WRAP(head, access_time)) + if (!wined3d_ge_wrap(head, access_time)) return; while (1) @@ -5127,14 +5132,12 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res if (head == tail) /* Queue empty. */ break; - if (!GE_WRAP(access_time, tail) && access_time != tail) + if (!wined3d_ge_wrap(access_time, tail) && access_time != tail) break; YieldProcessor(); } -#undef GE_WRAP } -C_ASSERT(WINED3D_CS_QUEUE_SIZE < UINT_MAX / 4); /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other * fixed function semantics as D3DCOLOR or FLOAT16 */

1 0

Stefan Dösinger : wined3d: Replace while (1) with for (;;).
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 50b6b72d305758e5adfb936dda912e2d2cb3496f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50b6b72d305758e5adfb936d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 15:02:55 2022 +0300 wined3d: Replace while (1) with for (;;). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9fb3b27444e..bc3b9699fa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5126,7 +5126,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res if (!wined3d_ge_wrap(head, access_time)) return; - while (1) + for (;;) { tail = *(volatile ULONG *)&cs->queue[WINED3D_CS_QUEUE_DEFAULT].tail; if (head == tail) /* Queue empty. */

1 0

Hugh McMaster : conhost: Reimplement font dialog handling.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: da854c537d887fd275b71153a67cf5c43a27cd58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da854c537d887fd275b71153… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 3 22:37:05 2022 +1100 conhost: Reimplement font dialog handling. Much of the existing font dialog code is overly complicated and difficult to follow. There are also bugs in the code, which cannot be fixed with minimal changes due to the complexity of the existing source. For example, changing the font face via the listbox unexpectedly changes the font size. It is also unnecessary to recreate the list of available font sizes each font face selection if the font type remains unchanged. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 227 +++++++++++----------------------------------- 1 file changed, 55 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da854c537d887fd275b7…

1 0

Alexandre Julliard : Release 7.4.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 330dc601978922aa1d5864d29d94882d6b1990d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=330dc601978922aa1d5864d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 21:45:50 2022 +0100 Release 7.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1329 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 609 insertions(+), 743 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=330dc601978922aa1d58…

1 0

Tag wine-7.4 : Alexandre Julliard : Release 7.4
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: refs/tags/wine-7.4 Tag: dce5c150d938677b6bdd3e62dcc9e01801a9041a URL: https://source.winehq.org/git/wine.git/?a=tag;h=dce5c150d938677b6bdd3e62dcc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 21:45:50 2022 +0100 Release 7.4

1 0

Zebediah Figura : d3d11: Report support for ConstantBufferPartialUpdate.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: a37b16e4afb59abe73288270d7da7c57bc5ac078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37b16e4afb59abe73288270… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 19:22:46 2022 -0600 d3d11: Report support for ConstantBufferPartialUpdate. Microsoft is not exactly clear what this means, but it seems likely it refers to the ability to bind a range of a constant buffer [i.e. with ID3D11DeviceContext::*SetConstantBuffers1()] rather than the whole buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7d2c2636f4b..e73d6726f5d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4087,7 +4087,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->FlagsForUpdateAndCopySeenByDriver = FALSE; options->ClearView = FALSE; options->CopyWithOverlap = FALSE; - options->ConstantBufferPartialUpdate = FALSE; + options->ConstantBufferPartialUpdate = TRUE; options->ConstantBufferOffsetting = TRUE; options->MapNoOverwriteOnDynamicConstantBuffer = TRUE; options->MapNoOverwriteOnDynamicBufferSRV = TRUE;

1 0

Matteo Bruni : wined3d: Use list_empty() in shader_glsl_destroy().
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 32799848e3b100f9a19a35f45a453cd3009bebb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32799848e3b100f9a19a35f4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 10 19:56:44 2022 -0600 wined3d: Use list_empty() in shader_glsl_destroy(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index acecb2e9ce5..f79fa1571e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10818,7 +10818,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) TRACE("Deleting linked programs.\n"); linked_programs = &shader->linked_programs; - if (linked_programs->next) + if (!list_empty(linked_programs)) { struct glsl_shader_prog_link *entry, *entry2; UINT i;

1 0

Zhiyi Zhang : d2d1: Release bitmap on d2d_device_context_SetTarget() error path.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: d0902b7c8e2aba00a2f922dc456bf93191d5286f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0902b7c8e2aba00a2f922dc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 11 14:31:41 2022 +0800 d2d1: Release bitmap on d2d_device_context_SetTarget() error path. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ce74d7c1582..47da411f3b6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2051,6 +2051,7 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i if (!(bitmap_impl->options & D2D1_BITMAP_OPTIONS_TARGET)) { + ID2D1Bitmap_Release(bitmap); d2d_device_context_set_error(context, D2DERR_INVALID_TARGET); return; }

1 0