June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v4 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/244

June 20, 2022

Re: [PATCH v4 0/3] MR281: A few fixes in xmllite - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

Re: [PATCH v2 0/1] MR284: riched20: Commit and wrap paragraphs after changing text properties. (#53170) - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/284

June 20, 2022

Re: [PATCH v5 0/1] MR192: ws2_32: Allow getsockname after AcceptEx - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/192

June 20, 2022

[PATCH v5 1/1] ws2_32: Allow getsockname after AcceptEx.

by David Curtiss

From: David Curtiss <david.curtiss(a)ni.com> .NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ server/sock.c | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index af4226e6258..3ec0ab67040 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8143,6 +8143,15 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %ld\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %ld\n", bytesReturned); + /* Try to call getsockname on the acceptor socket. + * + * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */ + iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET)); + ok(!iret, "Failed to set accept context %ld\n", GetLastError()); + iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed.\n"); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); diff --git a/server/sock.c b/server/sock.c index b11ebddb51d..2f1b33a333d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1846,6 +1846,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) } acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; acceptsock->pending_events = 0; acceptsock->reported_events = 0; acceptsock->proto = sock->proto; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/192

June 20, 2022

[PATCH v5 0/1] MR192: ws2_32: Allow getsockname after AcceptEx

by DavidCurtiss (＠DavidCurtiss)

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> -- v5: ws2_32: Allow getsockname after AcceptEx. https://gitlab.winehq.org/wine/wine/-/merge_requests/192

June 20, 2022

Re: [PATCH v2 0/7] MR285: win32u: Default window proc conversion - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/285

June 20, 2022

Re: [PATCH v2 0/1] MR280: include: Add definition of ScriptPlaceOpenType(). - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/280

June 20, 2022

Re: [PATCH v5 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/252

June 20, 2022

Re: [PATCH v2 0/9] MR278: d2d1: Partially implement effect registration parsing. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/278

June 20, 2022