- Wine-Devel - list.winehq.org

[PATCH 1/7] ws2_32: Manage shorter length for TCP_NODELAY.
by Paul Gofman March 10, 2022

March 10, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 18 ++++++++++++------ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9f140a6ee44..80665ff57a4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1725,6 +1725,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl switch(optname) { case TCP_NODELAY: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_NODELAY, optval, optlen ); default: @@ -2998,14 +3004,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - { - INT nodelay = *optval; - if (optlen <= 0) { - SetLastError(WSAEFAULT); + if (optlen <= 0 || !optval) + { + SetLastError( optlen && optval ? WSAENOBUFS : WSAEFAULT ); return SOCKET_ERROR; } - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); - } + value = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&value, sizeof(value) ); + default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a0bbde875d3..ec0bb2254a8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1181,6 +1181,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDBUF, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_NODELAY, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}, {0}, FALSE}, -- 2.35.1

3 15

[PATCH] mshtml: implement the IsNoCacheReponse method
by Pat Leamon March 10, 2022

March 10, 2022

From: Pat Leamon <pat.leamon(a)gmail.com> Implements IsNoCacheReponse based on IsNoStoreReponse implementation. Signed-off-by: Pat Leamon <pat.leamon(a)gmail.com> --- dlls/mshtml/nsio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fc6602eddf4..33d26670e4c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1501,10 +1501,15 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo static nsresult NSAPI nsChannel_IsNoCacheResponse(nsIHttpChannel *iface, cpp_bool *_retval) { nsChannel *This = impl_from_nsIHttpChannel(iface); + http_header_t *header; - FIXME("(%p)->(%p)\n", This, _retval); + static const WCHAR cache_controlW[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l'}; - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%p)\n", This, _retval); + + header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); + *_retval = header && !wcsicmp(header->data, L"no-cache"); + return NS_OK; } static nsresult NSAPI nsChannel_IsPrivateResponse(nsIHttpChannel *iface, cpp_bool *_retval) -- 2.25.1

2 1

[PATCH] mshtml: Implement nsIHttpChannel::IsNoCacheReponse.
by Jacek Caban March 10, 2022

March 10, 2022

From: Pat Leamon <pat.leamon(a)gmail.com> Signed-off-by: Pat Leamon <pleamonhp(a)yahoo.com.au> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 229496, adds a comment about Gecko handling of max-age header. dlls/mshtml/nsio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH v4 4/8] server: Defer postprocessing until after setting initial status in send_socket handler.
by Jinoh Kang March 10, 2022

March 10, 2022

This allows the client to postpone the initial I/O until the server has queued the I/O request. The server should perform the postprocessing only after the initial I/O has been done. In the case of send_socket, the manipulation of event flags shall ideally be done *after* (not *before*) the client has attempted the initial I/O, since the outbound queue status of the socket may change in the meanwhile. Also, the implicitly bound address is available only after the send* system call has been performed. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - pass around total size of data to be transmitted - detect short write in send_socket_initial_callback v2 -> v3: no changes v3 -> v4: no changes dlls/ntdll/unix/socket.c | 15 ++++++++++++++ server/protocol.def | 1 + server/sock.c | 42 +++++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 23059e3cff8..d04ebb7f874 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -873,6 +873,7 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi NTSTATUS status; unsigned int i; ULONG options; + data_size_t data_size; async_size = offsetof( struct async_send_ioctl, iov[count] ); @@ -906,6 +907,18 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi async->iov_cursor = 0; async->sent_len = 0; + data_size = 0; + for (i = 0; i < count; ++i) + { + SIZE_T len = async->iov[i].iov_len; + if (len > (SIZE_T)(data_size_t)-1 || (data_size_t)(data_size + len) < data_size) + { + release_fileio( &async->io ); + return STATUS_NO_MEMORY; + } + data_size += len; + } + status = try_send( fd, async ); if (status != STATUS_SUCCESS && status != STATUS_DEVICE_NOT_READY) @@ -919,6 +932,7 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( send_socket ) { + req->data_size = data_size; req->status = status; req->total = async->sent_len; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); @@ -1099,6 +1113,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, SERVER_START_REQ( send_socket ) { + req->data_size = async->head_len + async->file_len + async->tail_len; req->status = STATUS_PENDING; req->total = 0; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); diff --git a/server/protocol.def b/server/protocol.def index 9d90544fa41..2e57c91ccad 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1461,6 +1461,7 @@ enum server_fd_type /* Perform a send on a socket */ @REQ(send_socket) + data_size_t data_size; /* total number of bytes to send (>= total) */ async_data_t async; /* async I/O parameters */ unsigned int status; /* status of initial call */ unsigned int total; /* number of bytes already sent */ diff --git a/server/sock.c b/server/sock.c index 91f98556552..0e386e3537c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3454,16 +3454,17 @@ DECL_HANDLER(recv_socket) release_object( sock ); } -DECL_HANDLER(send_socket) +static void send_socket_initial_callback( void *private, struct async *async, struct fd *fd, unsigned int status ) { - struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); - unsigned int status = req->status; - timeout_t timeout = 0; - struct async *async; - struct fd *fd; + struct sock *sock = get_fd_user( fd ); + struct iosb *iosb; + int is_short_write = 0; - if (!sock) return; - fd = sock->fd; + if ((iosb = async_get_iosb( async ))) + { + is_short_write = iosb->result < (unsigned long)private; + release_object( iosb ); + } if (sock->type == WS_SOCK_DGRAM) { @@ -3476,13 +3477,29 @@ DECL_HANDLER(send_socket) sock->bound = 1; } - if (status != STATUS_SUCCESS) + if (status != STATUS_SUCCESS || is_short_write) { - /* send() calls only clear and reselect events if unsuccessful. */ + /* send() calls only clear and reselect events if unsuccessful. + * Also treat short writes as being unsuccessful. + */ sock->pending_events &= ~AFD_POLL_WRITE; sock->reported_events &= ~AFD_POLL_WRITE; } + sock_reselect( sock ); +} + +DECL_HANDLER(send_socket) +{ + struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); + unsigned int status = req->status; + timeout_t timeout = 0; + struct async *async; + struct fd *fd; + + if (!sock) return; + fd = sock->fd; + /* If we had a short write and the socket is nonblocking (and the client is * not trying to force the operation to be asynchronous), return success. * Windows actually refuses to send any data in this case, and returns @@ -3518,15 +3535,14 @@ DECL_HANDLER(send_socket) } set_error( status ); + async_set_initial_status_callback( async, send_socket_initial_callback, (void *)(unsigned long)req->data_size ); + if (timeout) async_set_timeout( async, timeout, STATUS_IO_TIMEOUT ); if (status == STATUS_PENDING) queue_async( &sock->write_q, async ); - /* always reselect; we changed reported_events above */ - sock_reselect( sock ); - reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( fd ); release_object( async ); -- 2.34.1

2 12

[PATCH 1/4] windows.media.speech: Import DEFINE_INSPECTABLE macros.
by Bernhard Kölbl March 10, 2022

March 10, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index b1df726413d..2694b23beab 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -46,4 +46,46 @@ extern IActivationFactory *synthesizer_factory; + + +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) +#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) + #endif -- 2.35.1

3 9

[PATCH 8/8] win32u: Move NtUserUpdateLayeredWindow implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 15 +------- dlls/user32/win.c | 49 +++---------------------- dlls/win32u/driver.c | 7 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 +++ dlls/win32u/window.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 9 +++++ include/ntuser.h | 3 ++ 9 files changed, 100 insertions(+), 60 deletions(-)

2 1

[PATCH 7/8] win32u: Move NtUserSetLayeredWindowAttributes implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

2 1

[PATCH 6/8] win32u: Move WM_WINE_UPDATEWINDOWSTATE implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 3 --- dlls/user32/user_main.c | 2 ++ dlls/user32/user_private.h | 1 - dlls/user32/win.c | 2 +- dlls/win32u/message.c | 11 ++++++++++ dlls/win32u/ntuser_private.h | 4 ++++ dlls/win32u/sysparams.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/window.c | 26 ++++++++++++++++++++++ 9 files changed, 89 insertions(+), 5 deletions(-)

2 1

[PATCH 5/8] win32u: Move GetWindowPlacement and MonitorFromWindow implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 19 +--- dlls/user32/winpos.c | 80 +--------------- dlls/win32u/region.c | 2 +- dlls/win32u/sysparams.c | 23 ++++- dlls/win32u/win32u_private.h | 6 +- dlls/win32u/window.c | 174 +++++++++++++++++++++++++++++++++-- include/ntuser.h | 2 + 7 files changed, 201 insertions(+), 105 deletions(-)

2 1

[PATCH 3/8] win32u: Move NtUserMoveWindow implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

2 1