marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Add semi-stub for DisconnectEx. 

Signed-off-by: Michael Müller <michael@fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Michael Müller 2016-04-20 16:03:57 +02:00 committed by Alexandre Julliard
parent 0625dd8bf6
commit 59ffe4e321
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/ws2_32/socket.c
View File

@ -3552,6 +3552,24 @@ connection_success:
return TRUE;
}
/***********************************************************************
* DisconnectEx
*/
static BOOL WINAPI WS2_DisconnectEx( SOCKET s, LPOVERLAPPED ov, DWORD flags, DWORD reserved )
{
TRACE( "socket %04lx, ov %p, flags 0x%x, reserved 0x%x\n", s, ov, flags, reserved );
if (flags & TF_REUSE_SOCKET)
FIXME( "Reusing socket not supported yet\n" );
if (ov)
{
ov->Internal = STATUS_PENDING;
ov->InternalHigh = 0;
}
return !WS_shutdown( s, SD_BOTH );
}
/***********************************************************************
* getpeername (WS2_32.5)
@ -4767,7 +4785,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
}
else if ( IsEqualGUID(&disconnectex_guid, in_buff) )
{
FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n");
*(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx;
break;
}
else if ( IsEqualGUID(&acceptex_guid, in_buff) )
{

4
dlls/ws2_32/tests/sock.c
View File

@ -7828,7 +7828,7 @@ static void test_DisconnectEx(void)
&pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL);
if (iret)
{
skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError());
win_skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError());
closesocket(connector);
return;
}
@ -7859,7 +7859,7 @@ static void test_DisconnectEx(void)
memset(&overlapped, 0, sizeof(overlapped));
bret = pDisconnectEx(connector, &overlapped, 0, 0);
ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n");
ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError());
todo_wine ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError());
iret = connect(connector, (struct sockaddr *)&address, addrlen);
ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError());