wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Alexandre Julliard : ntdll: Go through the syscall return path for syscall faults.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: db26df5934b0b1ce153730f1f1e0137a278d8fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db26df5934b0b1ce153730f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 15:43:22 2021 +0200 ntdll: Go through the syscall return path for syscall faults. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 16 +++---------- dlls/ntdll/unix/signal_arm64.c | 9 +++---- dlls/ntdll/unix/signal_i386.c | 24 ++++++++++--------- dlls/ntdll/unix/signal_x86_64.c | 17 +++---------- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 53 ++++++++++++++++++++++++----------------- 6 files changed, 54 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db26df5934b0b1ce1537…

1 0

Zebediah Figura : server: Remove the no longer used get_socket_info request.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 5b47e4ac0be12c01fe4bad1d6e6147621987ab4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b47e4ac0be12c01fe4bad1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:57 2021 -0500 server: Remove the no longer used get_socket_info request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 21 +-------------------- server/protocol.def | 10 ---------- server/request.h | 8 -------- server/sock.c | 16 ---------------- server/trace.c | 15 --------------- 5 files changed, 1 insertion(+), 69 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d23603248bb..aac97b26b99 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1747,22 +1747,6 @@ struct get_socket_event_reply -struct get_socket_info_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_socket_info_reply -{ - struct reply_header __header; - int family; - int type; - int protocol; - char __pad_20[4]; -}; - - - struct recv_socket_request { struct request_header __header; @@ -5473,7 +5457,6 @@ enum request REQ_lock_file, REQ_unlock_file, REQ_get_socket_event, - REQ_get_socket_info, REQ_recv_socket, REQ_poll_socket, REQ_send_socket, @@ -5754,7 +5737,6 @@ union generic_request struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; struct get_socket_event_request get_socket_event_request; - struct get_socket_info_request get_socket_info_request; struct recv_socket_request recv_socket_request; struct poll_socket_request poll_socket_request; struct send_socket_request send_socket_request; @@ -6033,7 +6015,6 @@ union generic_reply struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; struct get_socket_event_reply get_socket_event_reply; - struct get_socket_info_reply get_socket_info_reply; struct recv_socket_reply recv_socket_reply; struct poll_socket_reply poll_socket_reply; struct send_socket_reply send_socket_reply; @@ -6257,7 +6238,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 714 +#define SERVER_PROTOCOL_VERSION 715 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 72f2f2c20ae..b5bc049ccf6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1435,16 +1435,6 @@ enum server_fd_type @END -/* Get socket info */ -@REQ(get_socket_info) - obj_handle_t handle; /* handle to the socket */ -@REPLY - int family; /* family, see socket manpage */ - int type; /* type, see socket manpage */ - int protocol; /* protocol, see socket manpage */ -@END - - /* Perform a recv on a socket */ @REQ(recv_socket) int oob; /* are we receiving OOB data? */ diff --git a/server/request.h b/server/request.h index 5e95ef6e625..30fbfcc516a 100644 --- a/server/request.h +++ b/server/request.h @@ -173,7 +173,6 @@ DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); DECL_HANDLER(get_socket_event); -DECL_HANDLER(get_socket_info); DECL_HANDLER(recv_socket); DECL_HANDLER(poll_socket); DECL_HANDLER(send_socket); @@ -453,7 +452,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_lock_file, (req_handler)req_unlock_file, (req_handler)req_get_socket_event, - (req_handler)req_get_socket_info, (req_handler)req_recv_socket, (req_handler)req_poll_socket, (req_handler)req_send_socket, @@ -1043,12 +1041,6 @@ 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( 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 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, type) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, protocol) == 16 ); -C_ASSERT( sizeof(struct get_socket_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 ); diff --git a/server/sock.c b/server/sock.c index 46018887692..b73fbb98388 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2967,22 +2967,6 @@ DECL_HANDLER(get_socket_event) release_object( &sock->obj ); } -DECL_HANDLER(get_socket_info) -{ - struct sock *sock; - - sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_READ_ATTRIBUTES, &sock_ops ); - if (!sock) return; - - if (get_unix_fd( sock->fd ) == -1) return; - - reply->family = sock->family; - reply->type = sock->type; - reply->protocol = sock->proto; - - release_object( &sock->obj ); -} - DECL_HANDLER(recv_socket) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); diff --git a/server/trace.c b/server/trace.c index 855348fa60a..46f6678fb87 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2087,18 +2087,6 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re dump_varargs_ints( ", errors=", cur_size ); } -static void dump_get_socket_info_request( const struct get_socket_info_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_socket_info_reply( const struct get_socket_info_reply *req ) -{ - fprintf( stderr, " family=%d", req->family ); - fprintf( stderr, ", type=%d", req->type ); - fprintf( stderr, ", protocol=%d", req->protocol ); -} - static void dump_recv_socket_request( const struct recv_socket_request *req ) { fprintf( stderr, " oob=%d", req->oob ); @@ -4584,7 +4572,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, (dump_func)dump_get_socket_event_request, - (dump_func)dump_get_socket_info_request, (dump_func)dump_recv_socket_request, (dump_func)dump_poll_socket_request, (dump_func)dump_send_socket_request, @@ -4861,7 +4848,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_lock_file_reply, NULL, (dump_func)dump_get_socket_event_reply, - (dump_func)dump_get_socket_info_reply, (dump_func)dump_recv_socket_reply, (dump_func)dump_poll_socket_reply, (dump_func)dump_send_socket_reply, @@ -5138,7 +5124,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "lock_file", "unlock_file", "get_socket_event", - "get_socket_info", "recv_socket", "poll_socket", "send_socket",

1 0

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

21 Jun '21

Module: wine Branch: master Commit: 5bece995c33d51031c46826c2205c445a2546823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bece995c33d51031c46826c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:56 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_INFO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f8ba7025ec5..44c0690d535 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1433,41 +1433,29 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { + struct afd_get_info_params params; + IO_STATUS_BLOCK io; NTSTATUS status; - int address_family; - int socket_type; - int protocol; unsigned int i; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); - SERVER_START_REQ( get_socket_info ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - status = wine_server_call( req ); - if (!status) - { - address_family = reply->family; - socket_type = reply->type; - protocol = reply->protocol; - } - } - SERVER_END_REQ; - + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, + IOCTL_AFD_WINE_GET_INFO, NULL, 0, &params, sizeof(params) ); if (status) { - unsigned int err = NtStatusToWSAError( status ); - SetLastError( err == WSAEBADF ? WSAENOTSOCK : err ); + SetLastError( NtStatusToWSAError( status ) ); return FALSE; } for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { const WSAPROTOCOL_INFOW *info = &supported_protocols[i]; - if (address_family == info->iAddressFamily && - socket_type == info->iSocketType && - protocol >= info->iProtocol && protocol <= info->iProtocol + info->iProtocolMaxOffset) + if (params.family == info->iAddressFamily && + params.type == info->iSocketType && + params.protocol >= info->iProtocol && + params.protocol <= info->iProtocol + info->iProtocolMaxOffset) { if (unicode) *buffer = *info; @@ -1478,12 +1466,12 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i WideCharToMultiByte( CP_ACP, 0, info->szProtocol, -1, bufferA->szProtocol, sizeof(bufferA->szProtocol), NULL, NULL ); } - buffer->iProtocol = protocol; + buffer->iProtocol = params.protocol; return TRUE; } } - FIXME("Could not fill protocol information for family %d, type %d, protocol %d.\n", - address_family, socket_type, protocol); + FIXME( "Could not fill protocol information for family %d, type %d, protocol %d.\n", + params.family, params.type, params.protocol ); return TRUE; }

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_INFO.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: a4b3ed9f2a2e207ccd05025a7c90ef31b351bfcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b3ed9f2a2e207ccd05025a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:55 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_INFO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 6 ++++++ server/sock.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6f0a78ca933..e497eece0be 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -158,6 +158,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { @@ -218,4 +219,9 @@ struct afd_message_select_params int mask; }; +struct afd_get_info_params +{ + int family, type, protocol; +}; + #endif diff --git a/server/sock.c b/server/sock.c index 547287572d5..46018887692 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2515,6 +2515,23 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_INFO: + { + struct afd_get_info_params params; + + if (get_reply_max_size() < sizeof(params)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + params.family = sock->family; + params.type = sock->type; + params.protocol = sock->proto; + set_reply_data( &params, sizeof(params) ); + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : ws2_32: Reimplement select() on top of IOCTL_AFD_POLL.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 414b31bc0bbbfe005e90a1946a649082dc303c55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=414b31bc0bbbfe005e90a194… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:54 2021 -0500 ws2_32: Reimplement select() on top of IOCTL_AFD_POLL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 315 +++++++++++++++---------------------------- dlls/ws2_32/tests/sock.c | 10 +- dlls/ws2_32/ws2_32_private.h | 2 - 3 files changed, 114 insertions(+), 213 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=414b31bc0bbbfe005e90…

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_POLL in WSAPoll().
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 639a4cab1d1fe60e7910a7f6f8dfc567cb7995c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=639a4cab1d1fe60e7910a7f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:53 2021 -0500 ws2_32: Use IOCTL_AFD_POLL in WSAPoll(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 156 +++++++++++++++++++++++++---------------------- dlls/ws2_32/tests/sock.c | 14 ++--- 2 files changed, 90 insertions(+), 80 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfc4bb6c09d..f5958e86e9f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -510,17 +510,6 @@ static const int ws_socktype_map[][2] = {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; -static const int ws_poll_map[][2] = -{ - MAP_OPTION( POLLERR ), - MAP_OPTION( POLLHUP ), - MAP_OPTION( POLLNVAL ), - MAP_OPTION( POLLWRNORM ), - MAP_OPTION( POLLWRBAND ), - MAP_OPTION( POLLRDNORM ), - { WS_POLLRDBAND, POLLPRI } -}; - UINT sock_get_error( int err ) { switch(err) @@ -988,40 +977,6 @@ convert_socktype_u2w(int unixsocktype) { return -1; } -static int convert_poll_w2u(int events) -{ - int i, ret; - for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) - { - if (ws_poll_map[i][0] & events) - { - ret |= ws_poll_map[i][1]; - events &= ~ws_poll_map[i][0]; - } - } - - if (events) - FIXME("Unsupported WSAPoll() flags 0x%x\n", events); - return ret; -} - -static int convert_poll_u2w(int events) -{ - int i, ret; - for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) - { - if (ws_poll_map[i][1] & events) - { - ret |= ws_poll_map[i][0]; - events &= ~ws_poll_map[i][1]; - } - } - - if (events) - FIXME("Unsupported poll() flags 0x%x\n", events); - return ret; -} - static int set_ipx_packettype(int sock, int ptype) { #ifdef HAS_IPX @@ -3531,65 +3486,120 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) /*********************************************************************** - * WSAPoll + * WSAPoll (ws2_32.@) */ -int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) +int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) { - int i, ret; - struct pollfd *ufds; + struct afd_poll_params *params; + ULONG params_size, i, j; + SOCKET poll_socket = 0; + IO_STATUS_BLOCK io; + HANDLE sync_event; + int ret_count = 0; + NTSTATUS status; if (!count) { SetLastError(WSAEINVAL); return SOCKET_ERROR; } - if (!wfds) + if (!fds) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if (!(ufds = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ufds[0])))) + if (!(sync_event = get_sync_event())) return -1; + + params_size = offsetof( struct afd_poll_params, sockets[count] ); + if (!(params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, params_size ))) { SetLastError(WSAENOBUFS); return SOCKET_ERROR; } - for (i = 0; i < count; i++) + params->timeout = (timeout >= 0 ? timeout * -10000 : TIMEOUT_INFINITE); + + for (i = 0; i < count; ++i) { - ufds[i].fd = get_sock_fd(wfds[i].fd, 0, NULL); - ufds[i].events = convert_poll_w2u(wfds[i].events); - ufds[i].revents = 0; + unsigned int flags = AFD_POLL_HUP | AFD_POLL_RESET | AFD_POLL_CONNECT_ERR; + + if ((INT_PTR)fds[i].fd < 0 || !socket_list_find( fds[i].fd )) + { + fds[i].revents = WS_POLLNVAL; + continue; + } + + poll_socket = fds[i].fd; + params->sockets[params->count].socket = fds[i].fd; + + if (fds[i].events & WS_POLLRDNORM) + flags |= AFD_POLL_ACCEPT | AFD_POLL_READ; + if (fds[i].events & WS_POLLRDBAND) + flags |= AFD_POLL_OOB; + if (fds[i].events & WS_POLLWRNORM) + flags |= AFD_POLL_WRITE; + params->sockets[params->count].flags = flags; + ++params->count; + + fds[i].revents = 0; } - ret = do_poll(ufds, count, timeout); + if (!poll_socket) + { + SetLastError( WSAENOTSOCK ); + HeapFree( GetProcessHeap(), 0, params ); + return -1; + } - for (i = 0; i < count; i++) + status = NtDeviceIoControlFile( (HANDLE)poll_socket, sync_event, NULL, NULL, &io, IOCTL_AFD_POLL, + params, params_size, params, params_size ); + if (status == STATUS_PENDING) { - if (ufds[i].fd != -1) + if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) { - release_sock_fd(wfds[i].fd, ufds[i].fd); - if (ufds[i].revents & POLLHUP) + HeapFree( GetProcessHeap(), 0, params ); + return -1; + } + status = io.u.Status; + } + if (!status) + { + for (i = 0; i < count; ++i) + { + for (j = 0; j < params->count; ++j) { - /* Check if the socket still exists */ - int fd = get_sock_fd(wfds[i].fd, 0, NULL); - if (fd != -1) + if (fds[i].fd == params->sockets[j].socket) { - wfds[i].revents = WS_POLLHUP; - release_sock_fd(wfds[i].fd, fd); + unsigned int revents = 0; + + if (params->sockets[j].flags & (AFD_POLL_ACCEPT | AFD_POLL_READ)) + revents |= WS_POLLRDNORM; + if (params->sockets[j].flags & AFD_POLL_OOB) + revents |= WS_POLLRDBAND; + if (params->sockets[j].flags & AFD_POLL_WRITE) + revents |= WS_POLLWRNORM; + if (params->sockets[j].flags & AFD_POLL_HUP) + revents |= WS_POLLHUP; + if (params->sockets[j].flags & (AFD_POLL_RESET | AFD_POLL_CONNECT_ERR)) + revents |= WS_POLLERR; + if (params->sockets[j].flags & AFD_POLL_CLOSE) + revents |= WS_POLLNVAL; + + fds[i].revents = revents & (fds[i].events | WS_POLLHUP | WS_POLLERR | WS_POLLNVAL); + + if (fds[i].revents) + ++ret_count; } - else - wfds[i].revents = WS_POLLNVAL; } - else - wfds[i].revents = convert_poll_u2w(ufds[i].revents); } - else - wfds[i].revents = WS_POLLNVAL; } + if (status == STATUS_TIMEOUT) status = STATUS_SUCCESS; - HeapFree(GetProcessHeap(), 0, ufds); - return ret; + HeapFree( GetProcessHeap(), 0, params ); + + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : ret_count; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b171e6c03e1..7b92d0b4e84 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6064,7 +6064,7 @@ static void test_WSAPoll(void) WSASetLastError(0xdeadbeef); ret = pWSAPoll(fds, 2, 0); ok(!ret, "got %d\n", ret); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(fds[0].revents == POLLNVAL, "got events %#x\n", fds[0].revents); ok(!fds[1].revents, "got events %#x\n", fds[1].revents); @@ -6077,7 +6077,7 @@ static void test_WSAPoll(void) WSASetLastError(0xdeadbeef); ret = pWSAPoll(fds, 2, 0); ok(!ret, "got %d\n", ret); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(!fds[0].revents, "got events %#x\n", fds[0].revents); ok(fds[1].revents == POLLNVAL, "got events %#x\n", fds[1].revents); @@ -6102,7 +6102,7 @@ static void test_WSAPoll(void) fds[1].revents = 0xdead; WSASetLastError(0xdeadbeef); ret = pWSAPoll(fds, 2, 0); - todo_wine ok(ret == -1, "got %d\n", ret); + ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAENOTSOCK, "got error %u\n", WSAGetLastError()); ok(fds[0].revents == POLLNVAL, "got events %#x\n", fds[0].revents); ok(fds[1].revents == POLLNVAL, "got events %#x\n", fds[1].revents); @@ -6222,8 +6222,8 @@ static void test_WSAPoll(void) ok(ret == 1, "got %d\n", ret); check_poll(client, POLLWRNORM); - check_poll_mask_todo(server, POLLRDNORM | POLLRDBAND, POLLRDNORM); - check_poll_todo(server, POLLWRNORM | POLLRDNORM); + check_poll_mask(server, POLLRDNORM | POLLRDBAND, POLLRDNORM); + check_poll(server, POLLWRNORM | POLLRDNORM); buffer[0] = 0xcc; ret = recv(server, buffer, 1, 0); @@ -6261,8 +6261,8 @@ static void test_WSAPoll(void) closesocket(client); - check_poll_mask_todo(server, 0, POLLHUP); - check_poll_todo(server, POLLWRNORM | POLLHUP); + check_poll_mask(server, 0, POLLHUP); + check_poll(server, POLLWRNORM | POLLHUP); closesocket(server);

1 0

Zebediah Figura : ws2_32/tests: Avoid some more test failures on Vista.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: b3e9d0f88c5588ebbb67fa9ec7c03207a4047e5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e9d0f88c5588ebbb67fa9e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:52 2021 -0500 ws2_32/tests: Avoid some more test failures on Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f67bc4efae5..b171e6c03e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3816,6 +3816,9 @@ static void test_fionread_siocatmark(void) ret = recv(client, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask_todo(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo(client, 2, FALSE); ret = recv(client, buffer, 5, 0); @@ -3831,6 +3834,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + ret = 1; ret = setsockopt(client, SOL_SOCKET, SO_OOBINLINE, (char *)&ret, sizeof(ret)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -3845,6 +3851,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 1, TRUE); closesocket(client);

1 0

Francois Gouget : fr: Add a closing parenthesis.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: eb248cdf07cc47ec5fe9649bf3e7d99bbb8252f3 URL: https://source.winehq.org/git/website.git/?a=commit;h=eb248cdf07cc47ec5fe96… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:54:05 2021 +0200 fr: Add a closing parenthesis. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/fr/home.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index 8a7ea907..243a7a36 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -43,7 +43,7 @@ <div class="clear"></div> </div> - <p>Wine (à l'origine un acronyme pour « Wine Is Not an Emulator » est une couche de compatibilité capable d'exécuter des applications Windows sur divers systèmes d'exploitation conformes à POSIX comme Linux, macOS et BSD. Plutôt que de simuler la logique interne de Windows comme une machine virtuelle ou un émulateur, Wine traduit les appels de l'API Windows en appels POSIX à la volée, éliminant les pénalités mémoire et de performance d'autre méthodes et vous permettant d'intégrer proprement les applications Windows à votre bureau.</p> + <p>Wine (à l'origine un acronyme pour « Wine Is Not an Emulator ») est une couche de compatibilité capable d'exécuter des applications Windows sur divers systèmes d'exploitation conformes à POSIX comme Linux, macOS et BSD. Plutôt que de simuler la logique interne de Windows comme une machine virtuelle ou un émulateur, Wine traduit les appels de l'API Windows en appels POSIX à la volée, éliminant les pénalités mémoire et de performance d'autre méthodes et vous permettant d'intégrer proprement les applications Windows à votre bureau.</p> </div>

1 0

Francois Gouget : php: Fix the spelling of PHP comments.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: 69d0de55cab9df822716f1182d0c537c80d1c9aa URL: https://source.winehq.org/git/website.git/?a=commit;h=69d0de55cab9df822716f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:53:12 2021 +0200 php: Fix the spelling of PHP comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/incl.php | 4 ++-- include/utils.php | 2 +- include/wwn.php | 2 +- site.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/incl.php b/include/incl.php index 4a528614..443bde2c 100644 --- a/include/incl.php +++ b/include/incl.php @@ -84,7 +84,7 @@ else $avail = array_map("strtolower", $avail); foreach ($avail as $inLang) { - // check to see if langage is available + // check to see if language is available if (in_array($inLang, $GLOBALS['config']->languages)) { debug("global", "lang from browser: {$inLang}"); @@ -92,7 +92,7 @@ else break; } - // check to see if variation of langage is available + // check to see if variation of language is available if (strlen($inLang) > 2) { $inLangAlt = substr($inLang, 0, 2); diff --git a/include/utils.php b/include/utils.php index 4876bd89..7052f67e 100644 --- a/include/utils.php +++ b/include/utils.php @@ -357,7 +357,7 @@ function array_finder ($array, $filter) return $ret; } -// sort a multi-dimentional array by one of the keys +// sort a multi-dimensional array by one of the keys function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) { // $array - the array to be sorted diff --git a/include/wwn.php b/include/wwn.php index d13957ec..9231be81 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -21,7 +21,7 @@ class wwn private $map_array; private $inquote = 0; - // constuctor + // constructor public function __construct () { $this->summary = array(); diff --git a/site.php b/site.php index e108f779..1c4be8ce 100644 --- a/site.php +++ b/site.php @@ -56,7 +56,7 @@ if (isset($_SERVER['PATH_INFO'])) $_SERVER['PHP_SELF'] = str_replace($page_params, '', $_SERVER['PHP_SELF']); $_SERVER['PHP_SELF'] = preg_replace('/\/\/$/', '/', $_SERVER['PHP_SELF']); - // don't contine the loop, this is the end page + // don't continue the loop, this is the end page unset($page_params); break; }

1 0

Francois Gouget : js: Fix the spelling of a comment.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: 6f43af5e6bbec99e6bfc70fc5e10f78ff3c5f7a1 URL: https://source.winehq.org/git/website.git/?a=commit;h=6f43af5e6bbec99e6bfc7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:52:28 2021 +0200 js: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/utils.js b/js/utils.js index a07fe62d..0aeb0efd 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,5 +1,5 @@ /* - Misc JavaScipt for WineHQ + Misc JavaScript for WineHQ */ // load the vars passed on the `src` line

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
82
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 June 2021