- Let WSPRecv handle WSPRecvFrom on a non-datagram socket (mswsock_new does this)
- Fixes recvfrom on connection-oriented sockets

svn path=/trunk/; revision=52553
This commit is contained in:
Cameron Gutman 2011-07-07 11:40:25 +00:00
parent 14f58265d2
commit 6f052257ab

View file

@ -280,6 +280,20 @@ WSPRecvFrom(SOCKET Handle,
*lpErrno = WSAENOTSOCK;
return SOCKET_ERROR;
}
if (!(Socket->SharedData.ServiceFlags1 & XP1_CONNECTIONLESS))
{
/* Call WSPRecv for a non-datagram socket */
return WSPRecv(Handle,
lpBuffers,
dwBufferCount,
lpNumberOfBytesRead,
ReceiveFlags,
lpOverlapped,
lpCompletionRoutine,
lpThreadId,
lpErrno);
}
Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE,
NULL, 1, FALSE );