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

Nikolay Sivov : mfplay: Keep start/stop positions for items.
by Alexandre Julliard June 21, 2021

June 21, 2021

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

Alexandre Julliard : ntdll: Simulate a syscall return when starting a thread.
by Alexandre Julliard June 21, 2021

June 21, 2021

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

Zebediah Figura : server: Remove the no longer used get_socket_info request.
by Alexandre Julliard June 21, 2021

June 21, 2021

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

Zebediah Figura : ws2_32: Reimplement select() on top of IOCTL_AFD_POLL.
by Alexandre Julliard June 21, 2021

June 21, 2021

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 June 21, 2021

June 21, 2021

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

Georg Lehmann : winevulkan: Automatically generate vkSetPrivateDataEXT.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 741153114d0eaa5a6f31a08b4e67cbd61d5cb2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=741153114d0eaa5a6f31a08b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:24 2021 +0200 winevulkan: Automatically generate vkSetPrivateDataEXT. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 10 ---------- dlls/winevulkan/vulkan_thunks.c | 6 ++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 662f1c8144e..0acc6ca3b8e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -237,7 +237,6 @@ FUNCTION_OVERRIDES = { # VK_EXT_private_data "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index bdd9f2151c0..4553a1030c8 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1400,16 +1400,6 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } -VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, - VkPrivateDataSlotEXT private_data_slot, uint64_t data) -{ - TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, object_type, wine_dbgstr_longlong(object_handle), - wine_dbgstr_longlong(private_data_slot), wine_dbgstr_longlong(data)); - - object_handle = wine_vk_unwrap_handle(object_type, object_handle); - return device->funcs.p_vkSetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); -} - void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, VkPrivateDataSlotEXT private_data_slot, uint64_t *data) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 4d4779582ea..6f61d2a9767 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -7690,6 +7690,12 @@ static VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event) return device->funcs.p_vkSetEvent(device->device, event); } +static VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) +{ + TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), wine_dbgstr_longlong(data)); + return device->funcs.p_vkSetPrivateDataEXT(device->device, objectType, wine_vk_unwrap_handle(objectType, objectHandle), privateDataSlot, data); +} + static VkResult WINAPI wine_vkSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index ccf9491f064..3ac75417c16 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -59,7 +59,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetDebugUtilsObjectNameEXT(VkDevice device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetDebugUtilsObjectTagEXT(VkDevice device, const VkDebugUtilsObjectTagInfoEXT *pTagInfo) DECLSPEC_HIDDEN; -VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; void WINAPI wine_vkSubmitDebugUtilsMessageEXT(VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) DECLSPEC_HIDDEN; /* Private thunks */

1 0

Zebediah Figura : ws2_32/tests: Avoid some more test failures on Vista.
by Alexandre Julliard June 21, 2021

June 21, 2021

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 : include: Fix the spelling of a comment.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: website Branch: master Commit: faf78aae015f88b2058ff2574b31aefe6a82b944 URL: https://source.winehq.org/git/website.git/?a=commit;h=faf78aae015f88b2058ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:52:21 2021 +0200 include: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/htaccess.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index dbb7adf3..8de6b96d 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -89,7 +89,7 @@ RedirectMatch ^/(FAQ|Faq)$ https://wiki.winehq.org/FAQ RedirectMatch ^/(BUGS|Bugs|bugs)$ https://bugs.winehq.org/ RedirectMatch ^/(TROUBLE|Trouble|trouble)$ https://wiki.winehq.org/FAQ -# redirect soure website +# redirect source website RedirectMatch ^/WineAPI(.*)$ https://source.winehq.org/WineAPI$1 RedirectMatch ^/source(.*)$ https://source.winehq.org/source$1 RedirectMatch ^/cvsweb(.*)$ https://cvs.winehq.org/cvsweb$1

1 0

Francois Gouget : fr: Add a closing parenthesis.
by Alexandre Julliard June 21, 2021

June 21, 2021

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 : js: Fix the spelling of a comment.
by Alexandre Julliard June 21, 2021

June 21, 2021

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