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

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 0272f19049e9473a1fd7a5314ab0952eac96d887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0272f19049e9473a1fd7a531… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:46 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index e08fc977ad4..443b6e4e42f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1229,6 +1229,110 @@ static void test_event_select(void) CloseHandle(event); } +static void test_get_events(void) +{ + const struct sockaddr_in invalid_addr = + { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = 255, + }; + struct afd_get_events_params params; + WSANETWORKEVENTS events; + SOCKET client, server; + IO_STATUS_BLOCK io; + unsigned int i; + HANDLE event; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %u\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == (AFD_POLL_WRITE | AFD_POLL_CONNECT), "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", GetLastError()); + ok(!events.lNetworkEvents, "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + tcp_socketpair(&client, &server); + + ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %u\n", GetLastError()); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", GetLastError()); + ok(events.lNetworkEvents == (FD_WRITE | FD_CONNECT), "got events %#x\n", events.lNetworkEvents); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(!params.flags, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + + closesocket(client); + closesocket(server); + + /* Test a failed connection. The following call can take over 2 seconds to + * complete, so make the test interactive-only. */ + + if (winetest_interactive) + { + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + ResetEvent(event); + ret = WSAEventSelect(client, event, FD_CONNECT); + ok(!ret, "got error %u\n", GetLastError()); + + ret = connect(client, (struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(event, 2000); + ok(!ret, "got %#x\n", ret); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + { + if (i == AFD_POLL_BIT_CONNECT_ERR) + ok(params.status[i] == STATUS_CONNECTION_REFUSED, "got status[%u] %#x\n", i, params.status[i]); + else + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + } + + closesocket(client); + } + + CloseHandle(event); +} + START_TEST(afd) { WSADATA data; @@ -1240,6 +1344,7 @@ START_TEST(afd) test_poll_completion_port(); test_recv(); test_event_select(); + test_get_events(); WSACleanup(); }

1 0

Zebediah Figura : server: Implement IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 69549fc0c7b513868da367326ac5e1b19d63cab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69549fc0c7b513868da36732… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:43 2021 -0500 server: Implement IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 ++++++ include/wine/afd.h | 7 +++++++ server/sock.c | 22 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 088f29f85ff..3b8206474f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1181,6 +1181,12 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_GET_EVENTS: + if (in_size) FIXME( "unexpected input size %u\n", in_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + case IOCTL_AFD_RECV: { const struct afd_recv_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index 2eb3e6f12a9..46d242c7582 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -36,6 +36,7 @@ #define IOCTL_AFD_RECV CTL_CODE(FILE_DEVICE_BEEP, 0x805, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_POLL CTL_CODE(FILE_DEVICE_BEEP, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_EVENT_SELECT CTL_CODE(FILE_DEVICE_BEEP, 0x821, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_AFD_GET_EVENTS CTL_CODE(FILE_DEVICE_BEEP, 0x822, METHOD_NEITHER, FILE_ANY_ACCESS) enum afd_poll_bit { @@ -125,6 +126,12 @@ struct afd_event_select_params_32 int mask; }; +struct afd_get_events_params +{ + int flags; + NTSTATUS status[13]; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 3556ee21aa3..1d992d8f9e4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2011,6 +2011,28 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return 1; + case IOCTL_AFD_GET_EVENTS: + { + struct afd_get_events_params params = {0}; + unsigned int i; + + if (get_reply_max_size() < sizeof(params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + params.flags = sock->pending_events & sock->mask; + for (i = 0; i < ARRAY_SIZE( params.status ); ++i) + params.status[i] = sock_get_ntstatus( sock->errors[i] ); + + sock->pending_events = 0; + sock_reselect( sock ); + + set_reply_data( &params, sizeof(params) ); + return 0; + } + case IOCTL_AFD_EVENT_SELECT: { struct event *event = NULL;

1 0

Rémi Bernon : hid: Implement HidP_SetUsageValueArray stub.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 619bd1867ac650aa664327765a8ec7fbdeaa73d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=619bd1867ac650aa66432776… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 14 09:15:50 2021 +0200 hid: Implement HidP_SetUsageValueArray stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 10 ++++++++++ include/ddk/hidpi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 98508a456ce..edfdb004fd0 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -37,7 +37,7 @@ @ stub HidP_SetData @ stub HidP_SetScaledUsageValue @ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) -@ stub HidP_SetUsageValueArray +@ stdcall HidP_SetUsageValueArray(long long long long ptr long ptr ptr long) @ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) @ stub HidP_UnsetUsages diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2933c2ff7ef..9eedf12b694 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -642,6 +642,16 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, return rc; } +NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, char *value_buf, USHORT value_len, + PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + FIXME( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u stub!\n", + report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); + + return HIDP_STATUS_NOT_IMPLEMENTED; +} NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index fb497f3282f..8c970673ec1 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -201,6 +201,9 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength ); NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);

1 0

Zhiyi Zhang : gdi32: Partially implement HALFTONE stretch mode.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 04b4d0f380943bed5328c2957b50d975ecb55635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b4d0f380943bed5328c295… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 15 11:40:42 2021 +0800 gdi32: Partially implement HALFTONE stretch mode. COLORONCOLOR(STRETCH_DELETESCANS) was used in place of HALFTONE. COLORONCOLOR mode may delete rows of pixels without trying to preserve information so it will cause Wine to render poorly when the destination rectangle is small. According to tests, HALFTONE mode uses box filter when doing integer downscaling and nearest neighbor interpolation when doing upscaling in both horizontally and vertically. In other cases, HALFTONE mode uses a lanczos3 like algorithm to interpolate pixels. There are also other heuristics involved. For example, shrinking a 2x2 image to 1x1 may not use box filter depending on image data. Since this algorithm is undocumented, it's difficult to reverse engineer the original algorithm and produce identical results. Instead, this patch uses a naive implementation of bilinear interpolation to implement HALFTONE mode and it produces good quality images. For 8-bit and lower color depth images, nulldrv_StretchBlt should resize the images first and then converts color depth. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46375 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 7 + dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/primitives.c | 629 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/cursoricon.c | 18 +- 4 files changed, 640 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04b4d0f380943bed5328…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Don't call CertFreeCertificateContext on cleanup.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 2191c0f4b5439f750dfe46e58f3e3cf38da1dde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2191c0f4b5439f750dfe46e5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 15 19:05:43 2021 +0200 ntoskrnl.exe/tests: Don't call CertFreeCertificateContext on cleanup. It seems to crash the test on w864. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ff73e8eae18..4b744d813d8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,15 +235,11 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertFreeCertificateContext(ctx->root_cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertFreeCertificateContext(ctx->publisher_cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError());

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_MESSAGE_SELECT.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 0e2a998a33fd2a21295bbc29b6080a763ec5f859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e2a998a33fd2a21295bbc29… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:48 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_MESSAGE_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fc320ea0247..2fa1471ae3b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4508,29 +4508,28 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, /*********************************************************************** - * WSAAsyncSelect (WS2_32.101) + * WSAAsyncSelect (ws2_32.@) */ -INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent) +int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) { - int ret; + struct afd_message_select_params params; + IO_STATUS_BLOCK io; + NTSTATUS status; - TRACE("%04lx, hWnd %p, uMsg %08x, event %08x\n", s, hWnd, uMsg, lEvent); + TRACE( "socket %#lx, window %p, message %#x, mask %#x\n", s, window, message, mask ); - SERVER_START_REQ( set_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->mask = lEvent; - req->event = 0; - req->window = wine_server_user_handle( hWnd ); - req->msg = uMsg; - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (!ret) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; + params.handle = wine_server_obj_handle( (HANDLE)s ); + params.window = wine_server_user_handle( window ); + params.message = message; + params.mask = afd_poll_flag_from_win32( mask ); + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, + &params, sizeof(params), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; } + /*********************************************************************** * WSACreateEvent (WS2_32.31) *

1 0

Zebediah Figura : server: Do not poll sockets for POLLPRI unless we are selecting for AFD_POLL_OOB.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 2daf76432e3d993972cbb4257883d2e1139496fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2daf76432e3d993972cbb425… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:44 2021 -0500 server: Do not poll sockets for POLLPRI unless we are selecting for AFD_POLL_OOB. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1d992d8f9e4..e1b30507514 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1063,11 +1063,20 @@ static int sock_get_poll_events( struct fd *fd ) { if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI; } - else if (!sock->rd_shutdown && (mask & AFD_POLL_READ)) - ev |= POLLIN | POLLPRI; - /* We use POLLIN with 0 bytes recv() as hangup indication for stream sockets. */ - else if (sock->state == SOCK_CONNECTED && (mask & AFD_POLL_HUP) && !(sock->reported_events & AFD_POLL_READ)) - ev |= POLLIN; + else + { + if (!sock->rd_shutdown) + { + if (mask & AFD_POLL_READ) + ev |= POLLIN; + if (mask & AFD_POLL_OOB) + ev |= POLLPRI; + } + + /* We use POLLIN with 0 bytes recv() as hangup indication for stream sockets. */ + if (sock->state == SOCK_CONNECTED && (mask & AFD_POLL_HUP) && !(sock->reported_events & AFD_POLL_READ)) + ev |= POLLIN; + } if (async_queued( &sock->write_q )) {

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_GET_EVENTS in WSAEnumNetworkEvents().
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: a916887b94579e94abe35ffa7f56d1bb9996711b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a916887b94579e94abe35ffa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 10:39:45 2021 -0500 ws2_32: Use IOCTL_AFD_GET_EVENTS in WSAEnumNetworkEvents(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 82 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69dec158e5a..fc320ea0247 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3826,6 +3826,33 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return ret; } + +static unsigned int afd_poll_flag_to_win32( unsigned int flags ) +{ + static const unsigned int map[] = + { + FD_READ, /* READ */ + FD_OOB, /* OOB */ + FD_WRITE, /* WRITE */ + FD_CLOSE, /* HUP */ + FD_CLOSE, /* RESET */ + 0, /* CLOSE */ + FD_CONNECT, /* CONNECT */ + FD_ACCEPT, /* ACCEPT */ + FD_CONNECT, /* CONNECT_ERR */ + }; + + unsigned int i, ret = 0; + + for (i = 0; i < ARRAY_SIZE(map); ++i) + { + if (flags & (1 << i)) ret |= map[i]; + } + + return ret; +} + + /*********************************************************************** * WSAPoll */ @@ -4347,36 +4374,47 @@ SOCKET WINAPI WS_socket(int af, int type, int protocol) /*********************************************************************** - * WSAEnumNetworkEvents (WS2_32.36) + * WSAEnumNetworkEvents (ws2_32.@) */ -int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent) +int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret_events ) { - int ret; - int i; - int errors[FD_MAX_EVENTS]; + struct afd_get_events_params params; + IO_STATUS_BLOCK io; + NTSTATUS status; - TRACE("%04lx, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent ); + TRACE( "socket %#lx, event %p, events %p\n", s, event, ret_events ); - SERVER_START_REQ( get_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->service = TRUE; - req->c_event = wine_server_obj_handle( hEvent ); - wine_server_set_reply( req, errors, sizeof(errors) ); - if (!(ret = wine_server_call(req))) lpEvent->lNetworkEvents = reply->pmask & reply->mask; - } - SERVER_END_REQ; - if (!ret) + ResetEvent( event ); + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, + NULL, 0, &params, sizeof(params) ); + if (!status) { - for (i = 0; i < FD_MAX_EVENTS; i++) + ret_events->lNetworkEvents = afd_poll_flag_to_win32( params.flags ); + + if (ret_events->lNetworkEvents & FD_READ) + ret_events->iErrorCode[FD_READ_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_READ] ); + + if (ret_events->lNetworkEvents & FD_WRITE) + ret_events->iErrorCode[FD_WRITE_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_WRITE] ); + + if (ret_events->lNetworkEvents & FD_OOB) + ret_events->iErrorCode[FD_OOB_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_OOB] ); + + if (ret_events->lNetworkEvents & FD_ACCEPT) + ret_events->iErrorCode[FD_ACCEPT_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_ACCEPT] ); + + if (ret_events->lNetworkEvents & FD_CONNECT) + ret_events->iErrorCode[FD_CONNECT_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_CONNECT_ERR] ); + + if (ret_events->lNetworkEvents & FD_CLOSE) { - if (lpEvent->lNetworkEvents & (1 << i)) - lpEvent->iErrorCode[i] = errors[i]; + if (!(ret_events->iErrorCode[FD_CLOSE_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_HUP] ))) + ret_events->iErrorCode[FD_CLOSE_BIT] = NtStatusToWSAError( params.status[AFD_POLL_BIT_RESET] ); } - return 0; } - SetLastError(WSAEINVAL); - return SOCKET_ERROR; + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; }

1 0

Nikolay Sivov : mf/session: Reset per-node end of stream flags when stopped.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: f0ebd661891e1fbf535730c7123b77055e532814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0ebd661891e1fbf535730c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 15 12:00:13 2021 +0300 mf/session: Reset per-node end of stream flags when stopped. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a7f58e0fb29..21afbcfc5d8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -946,12 +946,17 @@ static void session_pause(struct media_session *session) static void session_clear_end_of_presentation(struct media_session *session) { struct media_source *source; + struct topo_node *node; session->presentation.flags &= ~SESSION_FLAG_END_OF_PRESENTATION; LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { source->flags &= ~SOURCE_FLAG_END_OF_PRESENTATION; } + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + node->flags &= ~TOPO_NODE_END_OF_STREAM; + } } static void session_set_stopped(struct media_session *session, HRESULT status)

1 0

Giovanni Mascellani : mf/session: Reset END_OF_PRESENTATION flags when stopped.
by Alexandre Julliard June 15, 2021

June 15, 2021

Module: wine Branch: master Commit: 6a68e345f8e9f1bad455f68f6e0a5c33239d12e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a68e345f8e9f1bad455f68f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 15 12:00:12 2021 +0300 mf/session: Reset END_OF_PRESENTATION flags when stopped. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a7f81e694c2..a7f58e0fb29 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -943,6 +943,17 @@ static void session_pause(struct media_session *session) session_set_paused(session, hr); } +static void session_clear_end_of_presentation(struct media_session *session) +{ + struct media_source *source; + + session->presentation.flags &= ~SESSION_FLAG_END_OF_PRESENTATION; + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + source->flags &= ~SOURCE_FLAG_END_OF_PRESENTATION; + } +} + static void session_set_stopped(struct media_session *session, HRESULT status) { MediaEventType event_type; @@ -957,6 +968,7 @@ static void session_set_stopped(struct media_session *session, HRESULT status) IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event); } + session_clear_end_of_presentation(session); session_command_complete(session); }

1 0