Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WS2_32] - Use size of struct instead of size of pointer. Don't copy szProtocol, because it's set later. CID 14129 and 54.

Browse source 
svn path=/trunk/; revision=54615
This commit is contained in:
Rafal Harabien 2011-12-08 19:21:01 +00:00
parent 5eb7f4cb10
commit 1805dc67b0
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/win32/ws2_32/misc/ns.c
View file

@ -401,7 +401,7 @@ WSAStringToAddressA(IN LPSTR AddressString,
memcpy(lpProtoInfoW,
lpProtocolInfo,
sizeof(LPWSAPROTOCOL_INFOA));
FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol));
MultiByteToWideChar(CP_ACP,
0,
@ -427,7 +427,7 @@ WSAStringToAddressA(IN LPSTR AddressString,
lpProtoInfoW);
WSASetLastError(ret);
return ret;
return ret;
}
@ -459,9 +459,9 @@ WSAStringToAddressW(IN LPWSTR AddressString,
/* Set right adress family */
if (lpProtocolInfo!=NULL)
sockaddr->sin_family = lpProtocolInfo->iAddressFamily;
else sockaddr->sin_family = AddressFamily;
sockaddr->sin_family = lpProtocolInfo->iAddressFamily;
else
sockaddr->sin_family = AddressFamily;
/* Report size */
if (AddressFamily == AF_INET)
@ -513,7 +513,7 @@ WSAStringToAddressW(IN LPWSTR AddressString,
WSASetLastError(res);
if (!res) return 0;
return SOCKET_ERROR;
return SOCKET_ERROR;
}
void check_hostent(struct hostent **he)
@ -923,15 +923,14 @@ gethostbyname(IN CONST CHAR FAR* name)
if(name == NULL)
{
ret = gethostname(p->Hostent->h_name, MAX_HOSTNAME_LEN);
if(ret)
{
WSASetLastError( WSAHOST_NOT_FOUND ); //WSANO_DATA ??
return NULL;
}
return p->Hostent;
}
if(ret)
{
WSASetLastError( WSAHOST_NOT_FOUND ); //WSANO_DATA ??
return NULL;
}
/* Is it an IPv6 address? */
found = strstr(name, ":");
if( found != NULL )