Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 20:28:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSAFD]

Browse source 
- Update lpcbBytesReturned when FIONREAD is called
- Fix the value inside lpErrno when XxxSocketInformation() fails
- Pass the unrecognized IOCTLs to the winsock helper (no behavior change for this yet because wshtcpip's WSHIoctl is unimplemented)

svn path=/trunk/; revision=48522
This commit is contained in:
Cameron Gutman 2010-08-12 13:13:19 +00:00
parent 11f2175562
commit 17e0e75eb5
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
reactos/dll/win32/msafd/misc/dllmain.c
View file

@ -1910,6 +1910,7 @@ WSPIoctl(IN SOCKET Handle,
OUT LPINT lpErrno)
{
PSOCKET_INFORMATION Socket = NULL;
BOOLEAN NeedsCompletion;
/* Get the Socket Structure associate to this Socket*/
Socket = GetSocketStructure(Handle);
@ -1918,6 +1919,8 @@ WSPIoctl(IN SOCKET Handle,
*lpErrno = WSAENOTSOCK;
return SOCKET_ERROR;
}
*lpcbBytesReturned = 0;
switch( dwIoControlCode )
{
@ -1928,17 +1931,44 @@ WSPIoctl(IN SOCKET Handle,
return SOCKET_ERROR;
}
Socket->SharedData.NonBlocking = *((PULONG)lpvInBuffer) ? 1 : 0;
return SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL);
*lpErrno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL);
if (*lpErrno != NO_ERROR)
return SOCKET_ERROR;
else
return NO_ERROR;
case FIONREAD:
if( cbOutBuffer < sizeof(INT) || IS_INTRESOURCE(lpvOutBuffer) )
{
*lpErrno = WSAEFAULT;
return SOCKET_ERROR;
}
return GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL);
*lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL);
if (*lpErrno != NO_ERROR)
{
*lpcbBytesReturned = sizeof(ULONG);
return SOCKET_ERROR;
}
else
return NO_ERROR;
default:
*lpErrno = WSAEINVAL;
return SOCKET_ERROR;
*lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext,
Handle,
Socket->TdiAddressHandle,
Socket->TdiConnectionHandle,
dwIoControlCode,
lpvInBuffer,
cbInBuffer,
lpvOutBuffer,
cbOutBuffer,
lpcbBytesReturned,
lpOverlapped,
lpCompletionRoutine,
(LPBOOL)&NeedsCompletion);
if (*lpErrno != NO_ERROR)
return SOCKET_ERROR;
else
return NO_ERROR;
}
}