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

Alexandre Julliard : ntdll: Copy the implementation of __wine_dbg_strdup and __wine_dbg_header to the PE side.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: c2d84da8134cc9d07a114561c10c75bf91078370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d84da8134cc9d07a114561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 17:16:30 2021 +0200 ntdll: Copy the implementation of __wine_dbg_strdup and __wine_dbg_header to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/debug.c | 10 +++++----- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unixlib.h | 5 +---- 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index bcf010724c4..d86d20448bf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -34,12 +34,33 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(thread); +WINE_DECLARE_DEBUG_CHANNEL(pid); +WINE_DECLARE_DEBUG_CHANNEL(timestamp); struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1020]; /* buffer for temporary strings */ + char output[1020]; /* current output line */ +}; + +C_ASSERT( sizeof(struct debug_info) == 0x800 ); + static int nb_debug_options; static struct __wine_debug_channel *debug_options; +static inline struct debug_info *get_info(void) +{ +#ifdef _WIN64 + return (struct debug_info *)((TEB32 *)((char *)NtCurrentTeb() + 0x2000) + 1); +#else + return (struct debug_info *)(NtCurrentTeb() + 1); +#endif +} + static void init_options(void) { unsigned int offset = page_size * (sizeof(void *) / 4); @@ -81,7 +102,14 @@ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel */ const char * __cdecl __wine_dbg_strdup( const char *str ) { - return unix_funcs->dbg_strdup( str ); + struct debug_info *info = get_info(); + unsigned int pos = info->str_pos; + size_t n = strlen( str ) + 1; + + assert( n <= sizeof(info->strings) ); + if (pos + n > sizeof(info->strings)) pos = 0; + info->str_pos = pos + n; + return memcpy( info->strings + pos, str, n ); } /*********************************************************************** @@ -90,7 +118,27 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *function ) { - return unix_funcs->dbg_header( cls, channel, function ); + static const char * const classes[] = { "fixme", "err", "warn", "trace" }; + struct debug_info *info = get_info(); + char *pos = info->output; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + /* only print header if we are at the beginning of the line */ + if (info->out_pos) return 0; + + if (TRACE_ON(timestamp)) + { + ULONG ticks = NtGetTickCount(); + pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); + } + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + if (function && cls < ARRAY_SIZE( classes )) + pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ", + classes[cls], channel->name, function ); + info->out_pos = pos - info->output; + return info->out_pos; } /*********************************************************************** diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 753bc36e469..0272e68bea6 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -277,7 +277,7 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ { static const char * const classes[] = { "fixme", "err", "warn", "trace" }; struct debug_info *info = get_info(); - char buffer[200], *pos = buffer; + char *pos = info->output; if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; @@ -295,10 +295,10 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); } if (function && cls < ARRAY_SIZE( classes )) - snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", - classes[cls], channel->name, function ); - - return append_output( info, buffer, strlen( buffer )); + pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ", + classes[cls], channel->name, function ); + info->out_pos = pos - info->output; + return info->out_pos; } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0b2a7f3721c..fca63141ba3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1850,9 +1850,7 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_strdup, __wine_dbg_output, - __wine_dbg_header, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d0f2f4ed508..cbe5c9d3ccd 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 121 +#define NTDLL_UNIXLIB_VERSION 122 struct unix_funcs { @@ -80,10 +80,7 @@ struct unix_funcs CONTEXT *context ); /* debugging functions */ - const char * (CDECL *dbg_strdup)( const char *str ); int (CDECL *dbg_output)( const char *str ); - int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function ); }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Jacek Caban : win32u: Add stub DLL.
by Alexandre Julliard 15 Jun '21

15 Jun '21

Module: wine Branch: master Commit: 1e84cc0fa78c2213aa1531ff0b19b4aee0bc272c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e84cc0fa78c2213aa1531ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 15 14:38:23 2021 +0200 win32u: Add stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/win32u/Makefile.in | 1 + dlls/win32u/win32u.spec | 1317 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1321 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e84cc0fa78c2213aa15…

1 0

Zebediah Figura : server: Use AFD_POLL_* flags internally.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: bbb126dc7576baaf328d6bb7e2b35f13c87f440a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb126dc7576baaf328d6bb7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:47 2021 -0500 server: Use AFD_POLL_* flags internally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 19 ++++++ server/sock.c | 168 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 129 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb126dc7576baaf328d…

1 0

Zebediah Figura : server: Store the socket errors as an array of Unix errno values.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: e6258c544de29aa2664195a54cc3d1b9b67bb2e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6258c544de29aa2664195a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:48 2021 -0500 server: Store the socket errors as an array of Unix errno values. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2a22bb2340b..026188e79af 100644 --- a/server/sock.c +++ b/server/sock.c @@ -167,7 +167,7 @@ struct sock user_handle_t window; /* window to send the message to */ unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ - unsigned int errors[AFD_POLL_BIT_COUNT]; /* event errors */ + int errors[AFD_POLL_BIT_COUNT]; /* event errors */ timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* queue for asynchronous reads */ @@ -486,7 +486,7 @@ static void sock_wake_up( struct sock *sock ) enum afd_poll_bit event = event_bitorder[i]; if (events & (1 << event)) { - lparam_t lparam = afd_poll_flag_to_win32(1 << event) | (sock->errors[event] << 16); + lparam_t lparam = afd_poll_flag_to_win32(1 << event) | (sock_get_error( sock->errors[event] ) << 16); post_message( sock->window, sock->message, sock->wparam, lparam ); } } @@ -851,7 +851,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) return event; } -static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, unsigned int error ) +static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, int error ) { unsigned int event = (1 << event_bit); @@ -874,12 +874,12 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs if (event & POLLOUT) post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, sock_get_error( error ) ); + post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); break; case SOCK_LISTENING: if (event & (POLLIN | POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_ACCEPT, sock_get_error( error ) ); + post_socket_event( sock, AFD_POLL_BIT_ACCEPT, error ); break; case SOCK_CONNECTED: @@ -894,7 +894,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs post_socket_event( sock, AFD_POLL_BIT_OOB, 0 ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_HUP, sock_get_error( error ) ); + post_socket_event( sock, AFD_POLL_BIT_HUP, error ); break; } @@ -2457,13 +2457,13 @@ DECL_HANDLER(get_socket_event) reply->mask = afd_poll_flag_to_win32( sock->mask ); reply->pmask = afd_poll_flag_to_win32( sock->pending_events ); - errors[FD_READ_BIT] = sock->errors[AFD_POLL_BIT_READ]; - errors[FD_WRITE_BIT] = sock->errors[AFD_POLL_BIT_WRITE]; - errors[FD_OOB_BIT] = sock->errors[AFD_POLL_BIT_OOB]; - errors[FD_ACCEPT_BIT] = sock->errors[AFD_POLL_BIT_ACCEPT]; - errors[FD_CONNECT_BIT] = sock->errors[AFD_POLL_BIT_CONNECT_ERR]; - if (!(errors[FD_CLOSE_BIT] = sock->errors[AFD_POLL_BIT_HUP])) - errors[FD_CLOSE_BIT] = sock->errors[AFD_POLL_BIT_RESET]; + errors[FD_READ_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_READ] ); + errors[FD_WRITE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_WRITE] ); + errors[FD_OOB_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_OOB] ); + errors[FD_ACCEPT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_ACCEPT] ); + errors[FD_CONNECT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); + if (!(errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_HUP] ))) + errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_RESET] ); set_reply_data( errors, min( get_reply_max_size(), sizeof(errors) )); if (req->service)

1 0

Zebediah Figura : server: Implement IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 9bbf3ab96b30b79f1dd0b8723157b45f21c0d17c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbf3ab96b30b79f1dd0b872… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:49 2021 -0500 server: Implement IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 11 ++++++++++ include/wine/afd.h | 19 +++++++++++++++++ server/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c1cd319ccf9..088f29f85ff 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1170,6 +1170,17 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_EVENT_SELECT: + { + const struct afd_event_select_params *params = in_buffer; + + TRACE( "event %p, mask %#x\n", params->event, params->mask ); + if (out_size) FIXME( "unexpected output size %u\n", out_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + } + case IOCTL_AFD_RECV: { const struct afd_recv_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index c4a15d6688c..2eb3e6f12a9 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -35,6 +35,7 @@ #define IOCTL_AFD_LISTEN CTL_CODE(FILE_DEVICE_BEEP, 0x802, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_RECV CTL_CODE(FILE_DEVICE_BEEP, 0x805, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_POLL CTL_CODE(FILE_DEVICE_BEEP, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_EVENT_SELECT CTL_CODE(FILE_DEVICE_BEEP, 0x821, METHOD_NEITHER, FILE_ANY_ACCESS) enum afd_poll_bit { @@ -106,6 +107,24 @@ struct afd_poll_params }; #include <poppack.h> +struct afd_event_select_params +{ + HANDLE event; + int mask; +}; + +struct afd_event_select_params_64 +{ + ULONGLONG event; + int mask; +}; + +struct afd_event_select_params_32 +{ + ULONG event; + int mask; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 026188e79af..3556ee21aa3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2011,6 +2011,59 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return 1; + case IOCTL_AFD_EVENT_SELECT: + { + struct event *event = NULL; + obj_handle_t event_handle; + int mask; + + if (is_machine_64bit( current->process->machine )) + { + const struct afd_event_select_params_64 *params = get_req_data(); + + if (get_req_data_size() < sizeof(params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 1; + } + + event_handle = params->event; + mask = params->mask; + } + else + { + const struct afd_event_select_params_32 *params = get_req_data(); + + if (get_req_data_size() < sizeof(params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 1; + } + + event_handle = params->event; + mask = params->mask; + } + + if ((event_handle || mask) && + !(event = get_event_obj( current->process, event_handle, EVENT_MODIFY_STATE ))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 1; + } + + if (sock->event) release_object( sock->event ); + sock->event = event; + sock->mask = mask; + sock->window = 0; + sock->message = 0; + sock->wparam = 0; + sock->nonblocking = 1; + + sock_reselect( sock ); + + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 6e4f03d745e4453f02ee0d3356d289a5c58a7e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4f03d745e4453f02ee0d33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:50 2021 -0500 ws2_32: Use IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 55 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f4e3a6c9e43..69dec158e5a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4379,30 +4379,51 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp return SOCKET_ERROR; } -/*********************************************************************** - * WSAEventSelect (WS2_32.39) - */ -int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent) + +static unsigned int afd_poll_flag_from_win32( unsigned int flags ) { - int ret; + static const unsigned int map[] = + { + AFD_POLL_READ, + AFD_POLL_WRITE, + AFD_POLL_OOB, + AFD_POLL_ACCEPT, + AFD_POLL_CONNECT | AFD_POLL_CONNECT_ERR, + AFD_POLL_RESET | AFD_POLL_HUP, + }; - TRACE("%04lx, hEvent %p, event %08x\n", s, hEvent, lEvent); + unsigned int i, ret = 0; - SERVER_START_REQ( set_socket_event ) + for (i = 0; i < ARRAY_SIZE(map); ++i) { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->mask = lEvent; - req->event = wine_server_obj_handle( hEvent ); - req->window = 0; - req->msg = 0; - ret = wine_server_call( req ); + if (flags & (1 << i)) ret |= map[i]; } - SERVER_END_REQ; - if (!ret) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; + + return ret; } + +/*********************************************************************** + * WSAEventSelect (ws2_32.@) + */ +int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) +{ + struct afd_event_select_params params; + IO_STATUS_BLOCK io; + NTSTATUS status; + + TRACE( "socket %#lx, event %p, mask %#x\n", s, event, mask ); + + params.event = event; + params.mask = afd_poll_flag_from_win32( mask ); + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, + &params, sizeof(params), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; +} + + /********************************************************************** * WSAGetOverlappedResult (WS2_32.40) */

1 0

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: fd9a521c615fca11c0886564f366d8324f4d38ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd9a521c615fca11c0886564… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:51 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 87e4779b980..e08fc977ad4 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1136,6 +1136,99 @@ static void test_recv(void) CloseHandle(event); } +static void test_event_select(void) +{ + struct afd_event_select_params params; + WSANETWORKEVENTS events; + SOCKET client, server; + IO_STATUS_BLOCK io; + HANDLE event; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, NULL, 0, NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(io.Status == STATUS_INVALID_PARAMETER, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + params.event = 0; + params.mask = ~0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(io.Status == STATUS_INVALID_PARAMETER, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + params.event = event; + params.mask = ~0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(events.lNetworkEvents == (FD_CONNECT | FD_WRITE), "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + tcp_socketpair(&client, &server); + + params.event = event; + params.mask = AFD_POLL_CONNECT; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(events.lNetworkEvents == FD_CONNECT, "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + tcp_socketpair(&client, &server); + + params.event = event; + params.mask = ~0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + params.event = 0; + params.mask = 0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!events.lNetworkEvents, "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + CloseHandle(event); +} + START_TEST(afd) { WSADATA data; @@ -1146,6 +1239,7 @@ START_TEST(afd) test_poll(); test_poll_completion_port(); test_recv(); + test_event_select(); WSACleanup(); }

1 0

Zebediah Figura : ntdll: Reserve space for the whole 64-bit YMM context in struct x86_thread_data.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 79c102d6bec81b79e10290f23e9ac3816da6b58f URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c102d6bec81b79e10290f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 12 02:11:33 2021 -0500 ntdll: Reserve space for the whole 64-bit YMM context in struct x86_thread_data. Fixes a regression introduced by 308a5e7c4d01525184b057058949c68c0ee77dba. This was previously broken, but happened to work until the aforementioned commit put the YMM state right at the end of a page. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51262 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 53 +++++++++++++------------------------------ 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0b2b269505f..446fed25eb8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -461,24 +461,6 @@ enum i386_trap_code #endif }; -struct syscall_xsave -{ - union - { - XSAVE_FORMAT xsave; - FLOATING_SAVE_AREA fsave; - } u; - struct - { - ULONG64 mask; - ULONG64 compaction_mask; - ULONG64 reserved[6]; - M128A ymm_high[8]; - } xstate; -}; - -C_ASSERT( sizeof(struct syscall_xsave) == 0x2c0 ); - struct syscall_frame { DWORD restore_flags; /* 000 */ @@ -504,16 +486,13 @@ struct syscall_frame XSAVE_FORMAT xsave; FLOATING_SAVE_AREA fsave; } u; - struct /* 240 */ - { - ULONG64 mask; - ULONG64 compaction_mask; - ULONG64 reserved[6]; - M128A ymm_high[8]; - } xstate; + /* Leave space for the whole set of YMM registers. They're not used in + * 32-bit mode, but some processors fault if they're not in writable memory. + */ + XSTATE xstate; /* 240 */ }; -C_ASSERT( sizeof(struct syscall_frame) == 0x300 ); +C_ASSERT( sizeof(struct syscall_frame) == 0x380 ); struct x86_thread_data { @@ -1011,7 +990,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) memcpy( &frame->u.xsave, context->ExtendedRegisters, sizeof(frame->u.xsave) ); /* reset the current interrupt status */ frame->u.xsave.StatusWord &= frame->u.xsave.ControlWord | 0xff80; - frame->xstate.mask |= XSTATE_MASK_LEGACY; + frame->xstate.Mask |= XSTATE_MASK_LEGACY; } else if (flags & CONTEXT_FLOATING_POINT) { @@ -1023,7 +1002,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { frame->u.fsave = context->FloatSave; } - frame->xstate.mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; + frame->xstate.Mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; } if (flags & CONTEXT_XSTATE) { @@ -1032,10 +1011,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (xs->Mask & XSTATE_MASK_GSSE) { - frame->xstate.mask |= XSTATE_MASK_GSSE; - memcpy( &frame->xstate.ymm_high, &xs->YmmContext, sizeof(frame->xstate.ymm_high) ); + frame->xstate.Mask |= XSTATE_MASK_GSSE; + frame->xstate.YmmContext = xs->YmmContext; } - else frame->xstate.mask &= ~XSTATE_MASK_GSSE; + else frame->xstate.Mask &= ~XSTATE_MASK_GSSE; } frame->restore_flags |= flags & ~CONTEXT_INTEGER; @@ -1104,7 +1083,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->FloatSave = frame->u.fsave; } else if (!xstate_compaction_enabled || - (frame->xstate.mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + (frame->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) { fpux_to_fpu( &context->FloatSave, &frame->u.xsave ); } @@ -1120,7 +1099,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) XSAVE_FORMAT *xs = (XSAVE_FORMAT *)context->ExtendedRegisters; if (!xstate_compaction_enabled || - (frame->xstate.mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + (frame->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) { memcpy( xs, &frame->u.xsave, FIELD_OFFSET( XSAVE_FORMAT, MxCsr )); memcpy( xs->FloatRegisters, frame->u.xsave.FloatRegisters, @@ -1133,7 +1112,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) xs->ControlWord = 0x37f; } - if (!xstate_compaction_enabled || (frame->xstate.mask & XSTATE_MASK_LEGACY_SSE)) + if (!xstate_compaction_enabled || (frame->xstate.Mask & XSTATE_MASK_LEGACY_SSE)) { memcpy( xs->XmmRegisters, frame->u.xsave.XmmRegisters, sizeof( xs->XmmRegisters )); xs->MxCsr = frame->u.xsave.MxCsr; @@ -1168,7 +1147,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) return STATUS_INVALID_PARAMETER; mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; - xstate->Mask = frame->xstate.mask & mask; + xstate->Mask = frame->xstate.Mask & mask; xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) @@ -1176,7 +1155,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; - memcpy( &xstate->YmmContext, frame->xstate.ymm_high, sizeof(frame->xstate.ymm_high) ); + xstate->YmmContext = frame->xstate.YmmContext; } } } @@ -2401,7 +2380,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /* set syscall frame */ "cmpl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame */ "jnz 1f\n\t" - "leal -0x300(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ + "leal -0x380(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ "andl $~63,%eax\n\t" "movl %eax,%fs:0x1f8\n" /* x86_thread_data()->syscall_frame */ /* switch to thread stack */

1 0

Austin English : dpnhupnp: Add stub dll.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 825ebd4e58588595b9f8bc6d0999be0f4f287a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=825ebd4e58588595b9f8bc6d… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 12 09:05:54 2021 +1000 dpnhupnp: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dpnhupnp/Makefile.in | 6 ++++++ dlls/dpnhupnp/dpnhupnp.spec | 6 ++++++ dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/configure b/configure index 4c4ce7e6e20..c38153e53cf 100755 --- a/configure +++ b/configure @@ -1283,6 +1283,7 @@ enable_dplayx enable_dpnaddr enable_dpnet enable_dpnhpast +enable_dpnhupnp enable_dpnlobby enable_dpvoice enable_dpwsockx @@ -20503,6 +20504,7 @@ wine_fn_config_makefile dlls/dpnaddr enable_dpnaddr wine_fn_config_makefile dlls/dpnet enable_dpnet wine_fn_config_makefile dlls/dpnet/tests enable_tests wine_fn_config_makefile dlls/dpnhpast enable_dpnhpast +wine_fn_config_makefile dlls/dpnhupnp enable_dpnhupnp wine_fn_config_makefile dlls/dpnlobby enable_dpnlobby wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests diff --git a/configure.ac b/configure.ac index 8c74532dabc..94e586e07b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3174,6 +3174,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnaddr) WINE_CONFIG_MAKEFILE(dlls/dpnet) WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) WINE_CONFIG_MAKEFILE(dlls/dpnhpast) +WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) WINE_CONFIG_MAKEFILE(dlls/dpnlobby) WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in new file mode 100644 index 00000000000..566ce038f82 --- /dev/null +++ b/dlls/dpnhupnp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dpnhupnp.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + + +RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec new file mode 100644 index 00000000000..2a750e53675 --- /dev/null +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -0,0 +1,6 @@ +@ stub DirectPlayNATHelpCreate + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc new file mode 100644 index 00000000000..21633a49815 --- /dev/null +++ b/dlls/dpnhupnp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp" +#define WINE_FILENAME_STR "dpnhupnp.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Alistair Leslie-Hughes : dpnhupnp: Stub DirectPlayNATHelpCreate and DllGetClassObject.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 9ea58cbfb55950c4ee0f97018f8eefd54dafc951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea58cbfb55950c4ee0f9701… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jun 12 09:05:55 2021 +1000 dpnhupnp: Stub DirectPlayNATHelpCreate and DllGetClassObject. Stop crash in "STAR WARS Galactic Battlegrounds Saga" Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnhupnp/Makefile.in | 2 ++ dlls/dpnhupnp/dpnhupnp.spec | 4 ++-- dlls/dpnhupnp/main.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in index 566ce038f82..6aa9ef1dd80 100644 --- a/dlls/dpnhupnp/Makefile.in +++ b/dlls/dpnhupnp/Makefile.in @@ -2,5 +2,7 @@ MODULE = dpnhupnp.dll EXTRADLLFLAGS = -Wb,--prefer-native +C_SRCS = \ + main.c RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec index 2a750e53675..7dd3b6961a9 100644 --- a/dlls/dpnhupnp/dpnhupnp.spec +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -1,6 +1,6 @@ -@ stub DirectPlayNATHelpCreate +@ stdcall DirectPlayNATHelpCreate(ptr ptr) @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/main.c b/dlls/dpnhupnp/main.c new file mode 100644 index 00000000000..10bca6e7c23 --- /dev/null +++ b/dlls/dpnhupnp/main.c @@ -0,0 +1,39 @@ +/* + * + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnhupnp); + +HRESULT WINAPI DirectPlayNATHelpCreate(LPCGUID pIID, void **ppv) +{ + FIXME("(%p, %p) stub\n", pIID, ppv); + return E_NOTIMPL; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return E_FAIL; +}

1 0