Zebediah Figura : ws2_32: Use IOCTL_AFD_EVENT_SELECT.
Alexandre Julliard
julliard at winehq.org
Mon Jun 14 16:00:36 CDT 2021
Module: wine
Branch: master
Commit: 6e4f03d745e4453f02ee0d3356d289a5c58a7e1b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4f03d745e4453f02ee0d3356d289a5c58a7e1b
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Jun 14 00:41:50 2021 -0500
ws2_32: Use IOCTL_AFD_EVENT_SELECT.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ws2_32/socket.c | 55 ++++++++++++++++++++++++++++++++++++----------------
1 file changed, 38 insertions(+), 17 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index f4e3a6c9e43..69dec158e5a 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4379,30 +4379,51 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp
return SOCKET_ERROR;
}
-/***********************************************************************
- * WSAEventSelect (WS2_32.39)
- */
-int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent)
+
+static unsigned int afd_poll_flag_from_win32( unsigned int flags )
{
- int ret;
+ static const unsigned int map[] =
+ {
+ AFD_POLL_READ,
+ AFD_POLL_WRITE,
+ AFD_POLL_OOB,
+ AFD_POLL_ACCEPT,
+ AFD_POLL_CONNECT | AFD_POLL_CONNECT_ERR,
+ AFD_POLL_RESET | AFD_POLL_HUP,
+ };
- TRACE("%04lx, hEvent %p, event %08x\n", s, hEvent, lEvent);
+ unsigned int i, ret = 0;
- SERVER_START_REQ( set_socket_event )
+ for (i = 0; i < ARRAY_SIZE(map); ++i)
{
- req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) );
- req->mask = lEvent;
- req->event = wine_server_obj_handle( hEvent );
- req->window = 0;
- req->msg = 0;
- ret = wine_server_call( req );
+ if (flags & (1 << i)) ret |= map[i];
}
- SERVER_END_REQ;
- if (!ret) return 0;
- SetLastError(WSAEINVAL);
- return SOCKET_ERROR;
+
+ return ret;
}
+
+/***********************************************************************
+ * WSAEventSelect (ws2_32.@)
+ */
+int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask )
+{
+ struct afd_event_select_params params;
+ IO_STATUS_BLOCK io;
+ NTSTATUS status;
+
+ TRACE( "socket %#lx, event %p, mask %#x\n", s, event, mask );
+
+ params.event = event;
+ params.mask = afd_poll_flag_from_win32( mask );
+
+ status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT,
+ ¶ms, sizeof(params), NULL, 0 );
+ SetLastError( NtStatusToWSAError( status ) );
+ return status ? -1 : 0;
+}
+
+
/**********************************************************************
* WSAGetOverlappedResult (WS2_32.40)
*/
More information about the wine-cvs
mailing list