reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-04-04 09:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws2_32: Make WS_EnterSingleProtocol return a boolean.

Browse Source
This commit is contained in:
Bruno Jesus 2013-09-16 01:44:03 -03:00 committed by Alexandre Julliard
parent 44ea5334ca
commit 78ca87a00b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/ws2_32/socket.c
View File

@ -1592,15 +1592,14 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR
* buffer. * buffer.
* *
* RETURNS * RETURNS
* 1 if a protocol was entered into the buffer. * TRUE if a protocol was entered into the buffer.
* SOCKET_ERROR otherwise.
* *
* BUGS * BUGS
* - only implemented for IPX, SPX, SPXII, TCP, UDP * - only implemented for IPX, SPX, SPXII, TCP, UDP
* - there is no check that the operating system supports the returned * - there is no check that the operating system supports the returned
* protocols * protocols
*/ */
static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info )
{ {
memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); memset( info, 0, sizeof(WSAPROTOCOL_INFOW) );
info->iProtocol = protocol; info->iProtocol = protocol;
@ -1694,9 +1693,9 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info )
default: default:
FIXME("unknown Protocol <0x%08x>\n", protocol); FIXME("unknown Protocol <0x%08x>\n", protocol);
return SOCKET_ERROR; return FALSE;
} }
return 1; return TRUE;
} }
/***************************************************************************** /*****************************************************************************
@ -1705,14 +1704,14 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info )
* see function WS_EnterSingleProtocolW * see function WS_EnterSingleProtocolW
* *
*/ */
static INT WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info )
{ {
WSAPROTOCOL_INFOW infow; WSAPROTOCOL_INFOW infow;
INT ret; INT ret;
memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); memset( info, 0, sizeof(WSAPROTOCOL_INFOA) );
ret = WS_EnterSingleProtocolW( protocol, &infow ); ret = WS_EnterSingleProtocolW( protocol, &infow );
if (ret != SOCKET_ERROR) if (ret)
{ {
/* convert the structure from W to A */ /* convert the structure from W to A */
memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) );
@ -1758,12 +1757,12 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I
{ {
if (unicode) if (unicode)
{ {
if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ) != SOCKET_ERROR) if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ))
items++; items++;
} }
else else
{ {
if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ) != SOCKET_ERROR) if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ))
items++; items++;
} }
} }