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

Paul Gofman : jscript: Implement 'let' declaration in 'for' statement.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 5c756468656afc9207c0f51f774bbc29267e1469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c756468656afc9207c0f51f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 21 20:48:20 2021 +0300 jscript: Implement 'let' declaration in 'for' statement. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 84 ++++++++++++++++++++++++++++++++++++++++-------- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 34 +++++++++++++++++--- dlls/mshtml/tests/es5.js | 12 +++++++ 4 files changed, 113 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c756468656afc9207c0…

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: 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 : 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: 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: 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 */ -(a)REQ(get_socket_info) - obj_handle_t handle; /* handle to the socket */ -(a)REPLY - int family; /* family, see socket manpage */ - int type; /* type, see socket manpage */ - int protocol; /* protocol, see socket manpage */ -(a)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

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

Alexandre Julliard : ntdll: Simulate a syscall return when starting a thread.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: fed7e7a78b4bea183d0cbb107953e275f17baa4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fed7e7a78b4bea183d0cbb10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 15:57:26 2021 +0200 ntdll: Simulate a syscall return when starting a thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 65 ++++++++++--------------- dlls/ntdll/unix/signal_arm64.c | 70 +++++++++++---------------- dlls/ntdll/unix/signal_i386.c | 102 ++++++++++++++++++---------------------- dlls/ntdll/unix/signal_x86_64.c | 91 +++++++++++++++-------------------- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- 7 files changed, 138 insertions(+), 196 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fed7e7a78b4bea183d0c…

1 0

Nikolay Sivov : include: Add MFP_POSITIONTYPE_100NS symbol.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: b090a169a3f4e8905a29081d058db9b4a3e31035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b090a169a3f4e8905a29081d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 11:43:12 2021 +0300 include: Add MFP_POSITIONTYPE_100NS symbol. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfuuid/mfplay.c | 4 ++++ include/mfplay.idl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c index 1d28306fe4f..d73e52607c4 100644 --- a/dlls/mfuuid/mfplay.c +++ b/dlls/mfuuid/mfplay.c @@ -17,5 +17,9 @@ */ #include "evr.h" + +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID + #include "initguid.h" #include "mfplay.h" diff --git a/include/mfplay.idl b/include/mfplay.idl index 7d4345e69e7..42591439a0b 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -197,6 +197,8 @@ cpp_quote("#define MFP_GET_ERROR_EVENT(hdr) __MFP_CAST_EVENT(h cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)") cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)") +cpp_quote("EXTERN_GUID(MFP_POSITIONTYPE_100NS, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0);") + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd),

1 0

Nikolay Sivov : mfplay: Keep start/stop positions for items.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 53446a219db92980e50111ecf7c0cb257ae58411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53446a219db92980e50111ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 11:43:13 2021 +0300 mfplay: Keep start/stop positions for items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index c4913134901..0e41656f0c8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -63,6 +63,8 @@ struct media_item DWORD_PTR user_data; WCHAR *url; IUnknown *object; + LONGLONG start_position; + LONGLONG stop_position; }; struct media_player @@ -418,21 +420,92 @@ static HRESULT WINAPI media_item_SetUserData(IMFPMediaItem *iface, DWORD_PTR use return S_OK; } +static HRESULT media_item_set_position(const GUID *format, const PROPVARIANT *position, LARGE_INTEGER *ret) +{ + ret->QuadPart = 0; + + if (format && !IsEqualGUID(format, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + + if ((format != NULL) ^ (position != NULL)) + return E_POINTER; + + if (position && position->vt != VT_EMPTY && position->vt != VT_I8) + return E_INVALIDARG; + + if ((!format && !position) || position->vt == VT_EMPTY) + return S_OK; + + if (position->hVal.QuadPart == 0) + return MF_E_OUT_OF_RANGE; + + ret->QuadPart = position->hVal.QuadPart; + + return S_OK; +} + +static void media_item_get_position(LONGLONG value, GUID *format, PROPVARIANT *position) +{ + if (!format) + return; + + memcpy(format, &MFP_POSITIONTYPE_100NS, sizeof(*format)); + + if (value) + { + position->vt = VT_I8; + position->hVal.QuadPart = value; + } +} + static HRESULT WINAPI media_item_GetStartStopPosition(IMFPMediaItem *iface, GUID *start_format, PROPVARIANT *start_position, GUID *stop_format, PROPVARIANT *stop_position) { - FIXME("%p, %p, %p, %p, %p.\n", iface, start_format, start_position, stop_format, stop_position); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %p.\n", iface, start_format, start_position, stop_format, stop_position); + + if (start_position) + start_position->vt = VT_EMPTY; + if (stop_position) + stop_position->vt = VT_EMPTY; + + if (((start_format != NULL) ^ (start_position != NULL)) || + ((stop_format != NULL) ^ (stop_position != NULL))) + { + return E_POINTER; + } + + media_item_get_position(item->start_position, start_format, start_position); + media_item_get_position(item->stop_position, stop_format, stop_position); + + return S_OK; } static HRESULT WINAPI media_item_SetStartStopPosition(IMFPMediaItem *iface, const GUID *start_format, const PROPVARIANT *start_position, const GUID *stop_format, const PROPVARIANT *stop_position) { - FIXME("%p, %s, %p, %s, %p.\n", iface, debugstr_guid(start_format), start_position, + struct media_item *item = impl_from_IMFPMediaItem(iface); + LARGE_INTEGER start, stop; + HRESULT hr; + + TRACE("%p, %s, %p, %s, %p.\n", iface, debugstr_guid(start_format), start_position, debugstr_guid(stop_format), stop_position); - return E_NOTIMPL; + hr = media_item_set_position(start_format, start_position, &start); + if (SUCCEEDED(hr)) + hr = media_item_set_position(stop_format, stop_position, &stop); + + if (FAILED(hr)) + return hr; + + if (start.QuadPart > stop.QuadPart) + return MF_E_OUT_OF_RANGE; + + item->start_position = start.QuadPart; + item->stop_position = stop.QuadPart; + + return hr; } static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major)

1 0