June 2021 - Wine-commits - list.winehq.org

Connor McAdams : d3dx9: Remove unnecessary call to D3DXMatrixTranspose.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: cd0e0bbcf70fed9ae55f87a9244509f99e4eb82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0e0bbcf70fed9ae55f87a9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 3 11:57:00 2021 -0400 d3dx9: Remove unnecessary call to D3DXMatrixTranspose. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 376b97f5ea6..7033972af36 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1112,7 +1112,6 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) { D3DXMATRIX mat, *m, min; - D3DXMatrixTranspose(&mat, &min); if (is_pointer) min = *(D3DXMATRIX *)(indata[index / 16]);

1 0

Francois Gouget : user32/tests: Preserve the initial GetLastError() value for test_ClipboardOwner().
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 91a791e5177ac4a529f83262feb973371f1c2d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91a791e5177ac4a529f83262… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 10 12:10:46 2021 +0200 user32/tests: Preserve the initial GetLastError() value for test_ClipboardOwner(). One of the tests expects GetLastError() to still return 0xdeadbeef after has_no_open_wnd(), which would not be the case if another process did open the clipboard. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5071008a0ab..5951fc3247f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -65,6 +65,7 @@ static BOOL open_clipboard(HWND hwnd) static BOOL has_no_open_wnd(void) { DWORD start = GetTickCount(); + DWORD le = GetLastError(); while (1) { HWND clipwnd = GetOpenClipboardWindow(); @@ -72,7 +73,7 @@ static BOOL has_no_open_wnd(void) if (GetTickCount() - start > 100) { char classname[256]; - DWORD le = GetLastError(); + le = GetLastError(); /* See open_clipboard() */ GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); trace("%p (%s) opened the clipboard\n", clipwnd, classname); @@ -80,6 +81,7 @@ static BOOL has_no_open_wnd(void) return FALSE; } Sleep(15); + SetLastError(le); } }

1 0

Francois Gouget : user32/tests: Use the caller line number for open_clipboard() & co.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: a21d4fb8e3370e24cff222c132a9b383f3b2ed8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21d4fb8e3370e24cff222c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 10 12:11:16 2021 +0200 user32/tests: Use the caller line number for open_clipboard() & co. In particular this stops the traces in open_clipboard() and has_no_open_wnd() from clobbering the line number when used in expressions such as ok(has_no_open_wnd(), ...). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5951fc3247f..c8de860f8cc 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -33,7 +33,8 @@ static BOOL (WINAPI *pGetUpdatedClipboardFormats)( UINT *formats, UINT count, UI static int thread_from_line; static char *argv0; -static BOOL open_clipboard(HWND hwnd) +#define open_clipboard(hwnd) open_clipboard_(__LINE__, hwnd) +static BOOL open_clipboard_(int line, HWND hwnd) { DWORD start = GetTickCount(); while (1) @@ -54,7 +55,7 @@ static BOOL open_clipboard(HWND hwnd) * response to a native application. */ GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); - trace("%p (%s) opened the clipboard\n", clipwnd, classname); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); SetLastError(le); return ret; } @@ -62,7 +63,8 @@ static BOOL open_clipboard(HWND hwnd) } } -static BOOL has_no_open_wnd(void) +#define has_no_open_wnd() has_no_open_wnd_(__LINE__) +static BOOL has_no_open_wnd_(int line) { DWORD start = GetTickCount(); DWORD le = GetLastError(); @@ -76,7 +78,7 @@ static BOOL has_no_open_wnd(void) le = GetLastError(); /* See open_clipboard() */ GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); - trace("%p (%s) opened the clipboard\n", clipwnd, classname); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); SetLastError(le); return FALSE; }

1 0

Nikolay Sivov : d2d1: Reuse VS constant buffer object.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 9fd51e4d74302a3abf9554134524df48d1ad50fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd51e4d74302a3abf955413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 11 11:35:49 2021 +0300 d2d1: Reuse VS constant buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 22 +++- dlls/d2d1/device.c | 286 ++++++++++++++++++++--------------------------- 2 files changed, 141 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fd51e4d74302a3abf95…

1 0

Jan Sikorski : wined3d: Fix typo in wined3d_texture_vk_prepare_texture().
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 2d44949360e08d3eb114fd8ee4f8baf3ea95988e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d44949360e08d3eb114fd8e… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jun 11 15:29:06 2021 +0200 wined3d: Fix typo in wined3d_texture_vk_prepare_texture(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c77de1796c4..165d83eb035 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5139,7 +5139,7 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, vk_usage |= VK_IMAGE_USAGE_STORAGE_BIT; texture_vk->layout = VK_IMAGE_LAYOUT_GENERAL; - if (wined3d_popcount(resource->bind_flags == 1)) + if (wined3d_popcount(resource->bind_flags) == 1) { switch (resource->bind_flags) {

1 0

Piotr Caban : msvcrt: Import exp2 implementation from musl.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: b06dd5a13b11d24ea151d088c8bde72bd49ce7dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06dd5a13b11d24ea151d088… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 11 20:15:39 2021 +0200 msvcrt: Import exp2 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 14 --- configure.ac | 3 - dlls/msvcrt/math.c | 245 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 --- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 242 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b06dd5a13b11d24ea151…

1 0

Zebediah Figura : server: Do not return the socket state from get_socket_event.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 830fc41fbb619924f89d50de539d86c9565513e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=830fc41fbb619924f89d50de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:23 2021 -0500 server: Do not return the socket state from get_socket_event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 4 +--- server/protocol.def | 1 - server/request.h | 3 +-- server/sock.c | 1 - server/trace.c | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fe1f5394a72..a97974027f1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1758,9 +1758,7 @@ struct get_socket_event_reply struct reply_header __header; unsigned int mask; unsigned int pmask; - unsigned int state; /* VARARG(errors,ints); */ - char __pad_20[4]; }; @@ -6294,7 +6292,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 711 +#define SERVER_PROTOCOL_VERSION 712 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 30624a7cbaf..3609261b848 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1441,7 +1441,6 @@ enum server_fd_type @REPLY unsigned int mask; /* event mask */ unsigned int pmask; /* pending events */ - unsigned int state; /* status bits */ VARARG(errors,ints); /* event errors */ @END diff --git a/server/request.h b/server/request.h index a8d74f01f96..4f6adaa97c2 100644 --- a/server/request.h +++ b/server/request.h @@ -1052,8 +1052,7 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); C_ASSERT( sizeof(struct get_socket_event_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, state) == 16 ); -C_ASSERT( sizeof(struct get_socket_event_reply) == 24 ); +C_ASSERT( sizeof(struct get_socket_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_socket_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 ); diff --git a/server/sock.c b/server/sock.c index b4649abbf08..bbd82d57bd5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2376,7 +2376,6 @@ DECL_HANDLER(get_socket_event) if (get_unix_fd( sock->fd ) == -1) return; reply->mask = sock->mask; reply->pmask = sock->pending_events; - reply->state = sock->state; set_reply_data( sock->errors, min( get_reply_max_size(), sizeof(sock->errors) )); if (req->service) diff --git a/server/trace.c b/server/trace.c index 1c51bffe1aa..42952d3cdff 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2093,7 +2093,6 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re { fprintf( stderr, " mask=%08x", req->mask ); fprintf( stderr, ", pmask=%08x", req->pmask ); - fprintf( stderr, ", state=%08x", req->state ); dump_varargs_ints( ", errors=", cur_size ); } @@ -5391,6 +5390,7 @@ static const struct { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, + { "ADDRESS_ALREADY_ASSOCIATED", STATUS_ADDRESS_ALREADY_ASSOCIATED }, { "ALERTED", STATUS_ALERTED }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BAD_IMPERSONATION_LEVEL", STATUS_BAD_IMPERSONATION_LEVEL },

1 0

Zebediah Figura : server: Make FD_WINE_NONBLOCKING into a separate field.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 5ee78d3460abb0c4c19667dc7b7a09ab3cbb8549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee78d3460abb0c4c19667dc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:24 2021 -0500 server: Make FD_WINE_NONBLOCKING into a separate field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 1 - server/sock.c | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index c299583eaff..a10f81db668 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -293,7 +293,6 @@ extern "C" { #ifdef __WINESRC__ #define FD_WINE_LISTENING 0x10000000 -#define FD_WINE_NONBLOCKING 0x20000000 #define FD_WINE_CONNECTED 0x40000000 #endif diff --git a/server/sock.c b/server/sock.c index bbd82d57bd5..7941ed856d3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -151,7 +151,6 @@ struct sock * any event once until it is reset.) */ unsigned int reported_events; unsigned int flags; /* socket flags */ - int wr_shutdown_pending; /* is a write shutdown pending? */ unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ unsigned short family; /* socket family */ @@ -173,6 +172,8 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ + unsigned int nonblocking : 1; /* is the socket nonblocking? */ }; static void sock_dump( struct object *obj, int verbose ); @@ -1166,7 +1167,6 @@ static struct sock *create_socket(void) sock->mask = 0; sock->pending_events = 0; sock->reported_events = 0; - sock->wr_shutdown_pending = 0; sock->flags = 0; sock->proto = 0; sock->type = 0; @@ -1180,6 +1180,8 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->wr_shutdown_pending = 0; + sock->nonblocking = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -1403,8 +1405,7 @@ static struct sock *accept_socket( struct sock *sock ) /* newly created socket gets the same properties of the listening socket */ acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; - if (sock->state & FD_WINE_NONBLOCKING) - acceptsock->state |= FD_WINE_NONBLOCKING; + acceptsock->nonblocking = sock->nonblocking; acceptsock->mask = sock->mask; acceptsock->proto = sock->proto; acceptsock->type = sock->type; @@ -1657,7 +1658,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct accept_req *req; - if (sock->state & FD_WINE_NONBLOCKING) return 0; + if (sock->nonblocking) return 0; if (get_error() != STATUS_DEVICE_NOT_READY) return 0; if (!(req = alloc_accept_req( sock, NULL, async, NULL ))) return 0; @@ -1818,7 +1819,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->state |= FD_CONNECT; - if (params->synchronous && (sock->state & FD_WINE_NONBLOCKING)) + if (params->synchronous && sock->nonblocking) { sock_reselect( sock ); set_error( STATUS_DEVICE_NOT_READY ); @@ -1882,7 +1883,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->event = NULL; sock->window = 0; sock->mask = 0; - sock->state |= FD_WINE_NONBLOCKING; + sock->nonblocking = 1; } sock_reselect( sock ); @@ -1900,7 +1901,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } force_async = *(int *)get_req_data(); - if ((sock->state & FD_WINE_NONBLOCKING) && !force_async) + if (sock->nonblocking && !force_async) { set_error( STATUS_DEVICE_NOT_READY ); return 0; @@ -1919,7 +1920,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } if (*(int *)get_req_data()) { - sock->state |= FD_WINE_NONBLOCKING; + sock->nonblocking = 1; } else { @@ -1928,7 +1929,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_INVALID_PARAMETER ); return 0; } - sock->state &= ~FD_WINE_NONBLOCKING; + sock->nonblocking = 0; } return 1; @@ -2354,7 +2355,7 @@ DECL_HANDLER(set_socket_event) sock_reselect( sock ); - sock->state |= FD_WINE_NONBLOCKING; + sock->nonblocking = 1; /* if a network event is pending, signal the event object it is possible that FD_CONNECT or FD_ACCEPT network events has happened @@ -2442,7 +2443,7 @@ DECL_HANDLER(recv_socket) fd = sock->fd; /* recv() returned EWOULDBLOCK, i.e. no data available yet */ - if (status == STATUS_DEVICE_NOT_READY && !(sock->state & FD_WINE_NONBLOCKING)) + if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { #ifdef SO_RCVTIMEO struct timeval tv; @@ -2543,11 +2544,11 @@ DECL_HANDLER(send_socket) * not trying to force the operation to be asynchronous), return success. * Windows actually refuses to send any data in this case, and returns * EWOULDBLOCK, but we have no way of doing that. */ - if (status == STATUS_DEVICE_NOT_READY && req->total && (sock->state & FD_WINE_NONBLOCKING)) + if (status == STATUS_DEVICE_NOT_READY && req->total && sock->nonblocking) status = STATUS_SUCCESS; /* send() returned EWOULDBLOCK or a short write, i.e. cannot send all data yet */ - if (status == STATUS_DEVICE_NOT_READY && !(sock->state & FD_WINE_NONBLOCKING)) + if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { #ifdef SO_SNDTIMEO struct timeval tv;

1 0

Zebediah Figura : server: Use separate fields to track socket shutdown state.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 5eaba82a7719e1f059ef5636aee37c4e49f28626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eaba82a7719e1f059ef5636… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:25 2021 -0500 server: Use separate fields to track socket shutdown state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7941ed856d3..4cd84637baf 100644 --- a/server/sock.c +++ b/server/sock.c @@ -172,6 +172,8 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + unsigned int rd_shutdown : 1; /* is the read end shut down? */ + unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ unsigned int nonblocking : 1; /* is the socket nonblocking? */ }; @@ -781,9 +783,9 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) int status = sock_get_ntstatus( error ); struct accept_req *req, *next; - if (!(sock->state & FD_READ)) + if (sock->rd_shutdown) async_wake_up( &sock->read_q, status ); - if (!(sock->state & FD_WRITE)) + if (sock->wr_shutdown) async_wake_up( &sock->write_q, status ); LIST_FOR_EACH_ENTRY_SAFE( req, next, &sock->accept_list, struct accept_req, entry ) @@ -869,7 +871,7 @@ static void sock_poll_event( struct fd *fd, int event ) else if (event & POLLOUT) { /* we got connected */ - sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; + sock->state |= FD_WINE_CONNECTED; sock->state &= ~FD_CONNECT; sock->connect_time = current_time; } @@ -911,12 +913,12 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) + if ((hangup_seen || event & (POLLHUP | POLLERR)) && (!sock->rd_shutdown || !sock->wr_shutdown)) { error = error ? error : sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) - sock->state &= ~FD_WRITE; - sock->state &= ~FD_READ; + sock->wr_shutdown = 1; + sock->rd_shutdown = 1; if (debug_level) fprintf(stderr, "socket %p aborted by error %d, event: %x\n", sock, error, event); @@ -969,7 +971,6 @@ static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd ); unsigned int mask = sock->mask & ~sock->reported_events; - unsigned int smask = sock->state & mask; struct poll_req *req; int ev = 0; @@ -996,7 +997,12 @@ static int sock_get_poll_events( struct fd *fd ) { if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI; } - else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) + else if (sock->state & FD_WINE_LISTENING) + { + if (mask & FD_ACCEPT) + ev |= POLLIN; + } + else if (!sock->rd_shutdown && (mask & FD_READ)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ else if (sock->type == WS_SOCK_STREAM && (mask & FD_CLOSE) && !(sock->reported_events & FD_READ)) @@ -1006,7 +1012,7 @@ static int sock_get_poll_events( struct fd *fd ) { if (async_waiting( &sock->write_q )) ev |= POLLOUT; } - else if (smask & FD_WRITE) + else if (!sock->wr_shutdown && (mask & FD_WRITE)) ev |= POLLOUT; LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) @@ -1039,18 +1045,30 @@ static void sock_queue_async( struct fd *fd, struct async *async, int type, int switch (type) { case ASYNC_TYPE_READ: + if (sock->rd_shutdown) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } queue = &sock->read_q; break; + case ASYNC_TYPE_WRITE: + if (sock->wr_shutdown) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } queue = &sock->write_q; break; + default: set_error( STATUS_INVALID_PARAMETER ); return; } - if ( ( !( sock->state & (FD_READ|FD_CONNECT|FD_WINE_LISTENING) ) && type == ASYNC_TYPE_READ ) || - ( !( sock->state & (FD_WRITE|FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) ) + if ( ( !( sock->state & (FD_CONNECT|FD_WINE_LISTENING) ) && type == ASYNC_TYPE_READ ) || + ( !( sock->state & (FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) ) { set_error( STATUS_PIPE_DISCONNECTED ); return; @@ -1180,6 +1198,8 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->rd_shutdown = 0; + sock->wr_shutdown = 0; sock->wr_shutdown_pending = 0; sock->nonblocking = 0; init_async_queue( &sock->read_q ); @@ -1339,7 +1359,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u } #endif - sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; sock->proto = protocol; sock->type = type; @@ -1404,7 +1423,7 @@ static struct sock *accept_socket( struct sock *sock ) } /* newly created socket gets the same properties of the listening socket */ - acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; + acceptsock->state = FD_WINE_CONNECTED; acceptsock->nonblocking = sock->nonblocking; acceptsock->mask = sock->mask; acceptsock->proto = sock->proto; @@ -1458,7 +1477,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) return FALSE; } - acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; + acceptsock->state |= FD_WINE_CONNECTED; acceptsock->pending_events = 0; acceptsock->reported_events = 0; acceptsock->proto = sock->proto; @@ -1808,7 +1827,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!ret) { - sock->state |= FD_WINE_CONNECTED | FD_READ | FD_WRITE; + sock->state |= FD_WINE_CONNECTED; sock->state &= ~FD_CONNECT; if (!send_len) return 1; @@ -1866,11 +1885,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (how != SD_SEND) { - sock->state &= ~FD_READ; + sock->rd_shutdown = 1; } if (how != SD_RECEIVE) { - sock->state &= ~FD_WRITE; + sock->wr_shutdown = 1; if (list_empty( &sock->write_q.queue )) shutdown( unix_fd, SHUT_WR ); else @@ -2462,8 +2481,7 @@ DECL_HANDLER(recv_socket) status = STATUS_PENDING; } - /* are we shut down? */ - if (status == STATUS_PENDING && !(sock->state & FD_READ)) status = STATUS_PIPE_DISCONNECTED; + if (status == STATUS_PENDING && sock->rd_shutdown) status = STATUS_PIPE_DISCONNECTED; sock->pending_events &= ~(req->oob ? FD_OOB : FD_READ); sock->reported_events &= ~(req->oob ? FD_OOB : FD_READ); @@ -2567,8 +2585,7 @@ DECL_HANDLER(send_socket) status = STATUS_PENDING; } - /* are we shut down? */ - if (status == STATUS_PENDING && !(sock->state & FD_WRITE)) status = STATUS_PIPE_DISCONNECTED; + if (status == STATUS_PENDING && sock->wr_shutdown) status = STATUS_PIPE_DISCONNECTED; if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) {

1 0

Zebediah Figura : server: Use an enum to store socket connection state.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: a7577014faeda217be282222e355c493064e139b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7577014faeda217be282222… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:26 2021 -0500 server: Use an enum to store socket connection state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 5 -- server/sock.c | 185 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 104 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7577014faeda217be28…

1 0