September 2021 - Wine-Devel

[PATCH v8 1/2] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++--- include/wine/afd.h | 2 +- server/protocol.def | 1 + server/sock.c | 53 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..036611e2dd7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,12 +128,14 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct { struct sock *sock; int flags; + int main; } sockets[1]; }; @@ -2839,7 +2841,51 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, +static struct poll_req *get_main_poll(struct sock *sock) +{ + struct poll_req *req; + + LIST_FOR_EACH_ENTRY(req, &poll_list, struct poll_req, entry) + { + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock == sock + && req->sockets[i].main) + return req; + } + } + + return NULL; +} + +static void poll_handle_exclusive(struct poll_req *req) +{ + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + struct poll_req *main_req = get_main_poll(req->sockets[i].sock); + + if (main_req && main_req->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll. */ + main_req->sockets[i].main = FALSE; + + main_req->iosb->status = STATUS_SUCCESS; + main_req->iosb->out_data = main_req->output; + main_req->iosb->out_size = main_req->count * sizeof(*main_req->output); + async_terminate(main_req->async, STATUS_ALERTED); + + main_req = NULL; + } + + req->sockets[i].main = !main_req; + } +} + +static void poll_socket( struct sock *poll_sock, struct async *async, int exclusive, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; @@ -2880,11 +2926,14 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3285,7 +3334,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - poll_socket( sock, async, req->timeout, count, input ); + poll_socket( sock, async, req->exclusive, req->timeout, count, input ); reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); -- 2.33.0

2 2

[PATCH] wininet: Add handling for remaining special errors to InternetErrorDlg.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/dialogs.c | 48 +++++++++++++++++++++++++++++++++-- dlls/wininet/tests/internet.c | 40 ++++------------------------- 2 files changed, 51 insertions(+), 37 deletions(-)

1 0

[PATCH 1/2] dbghelp: set correct parameter name
by Eric Pouech Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 23752cfed9f..29d8a5350a5 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -487,13 +487,13 @@ struct enum_types_AtoW PSYM_ENUMERATESYMBOLS_CALLBACKW callback; }; -static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG size, PVOID _et) { struct enum_types_AtoW* et = _et; SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer; copy_symbolW(siW, si); - return et->callback(siW, addr, et->user); + return et->callback(siW, size, et->user); } /******************************************************************

1 1

[PATCH 6/6] gdi32: Remove no longer needed metafile special case from NtGdiExtTextOutW.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 8 -------- 1 file changed, 8 deletions(-)

2 1

[PATCH 5/6] gdi32: Directly use ntgdi functions in font.c.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 51 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-)

2 1

[PATCH 4/6] gdi32: Fix some ntgdi names.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

2 1

[PATCH 3/6] gdi32/tests: Add GdiTransparentBlt tests.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 254 ++++++++++++++++++++---------------- 1 file changed, 140 insertions(+), 114 deletions(-)

2 1

[PATCH 2/6] gdi32: Use EMR_TRANSPARENTBLT to record GetTransparentBlt.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

And use NtGdiTransparentBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 44 +++++++++++++++++++++++----------------- dlls/gdi32/emfdc.c | 11 +++++++++- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 17 ++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 58 insertions(+), 20 deletions(-)

2 1

[PATCH 1/6 v2] gdi32/test: Add tests for recording MaskBlt and PlgBlt in EMFs.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Using 0 biClrUsed and properly filling mask bits. Thanks, Huw. dlls/gdi32/tests/metafile.c | 185 ++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+)

2 1

[PATCH 1/4] wined3d: Remove wined3d_texture_copy_sysmem_location().
by Jan Sikorski Sept. 10, 2021

Sept. 10, 2021

Use wined3d_context_copy_bo_address() instead. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 58 ++++++++---------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5f7fab49a6..6663e788e9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -745,52 +745,6 @@ void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) } } -static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) -{ - unsigned int size = texture->sub_resources[sub_resource_idx].size; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info; - struct wined3d_bo_gl *src_bo, *dst_bo; - struct wined3d_bo_address dst, src; - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - wined3d_texture_get_memory(texture, sub_resource_idx, &dst, location); - wined3d_texture_get_memory(texture, sub_resource_idx, &src, - texture->sub_resources[sub_resource_idx].locations); - - if ((dst_bo = (struct wined3d_bo_gl *)dst.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst_bo->id)); - GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), dst_bo); - checkGLcall("PBO upload"); - context_release(context); - return TRUE; - } - - if ((src_bo = (struct wined3d_bo_gl *)src.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src_bo->id)); - GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), src_bo); - checkGLcall("PBO download"); - context_release(context); - return TRUE; - } - - memcpy(dst.addr, src.addr, size); - return TRUE; -} - /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, @@ -837,7 +791,17 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) - ret = wined3d_texture_copy_sysmem_location(texture, sub_resource_idx, context, location); + { + unsigned int size = texture->sub_resources[sub_resource_idx].size; + struct wined3d_bo_address source, destination; + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + wined3d_texture_get_memory(texture, sub_resource_idx, &source, current); + wined3d_texture_get_memory(texture, sub_resource_idx, &destination, location); + wined3d_context_copy_bo_address(context, &destination, &source, size); + ret = TRUE; + } else ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); -- 2.30.2

3 7