-do not initialize in case of error
-don't touch vendor info
svn path=/trunk/; revision=62210
lpWSAData->wHighVersion = MAKEWORD(2,2);
lstrcpyA(lpWSAData->szDescription, "WinSock 2.0");
lstrcpyA(lpWSAData->szSystemStatus, "Running");
lpWSAData->wHighVersion = MAKEWORD(2,2);
lstrcpyA(lpWSAData->szDescription, "WinSock 2.0");
lstrcpyA(lpWSAData->szSystemStatus, "Running");
- lpWSAData->lpVendorInfo = NULL;
if (LOBYTE(wVersionRequested) == 1)
{
if (LOBYTE(wVersionRequested) == 1)
{
/*FIXME: increment internal counter */
/*FIXME: increment internal counter */
+ if (ErrorCode == ERROR_SUCCESS)
+ WSASETINITIALIZED;
p = NtCurrentTeb()->WinSockData;
p = NtCurrentTeb()->WinSockData;
+ if (!p || !WSAINITIALIZED)
{
WSASetLastError( WSANOTINITIALISED );
return NULL;
{
WSASetLastError( WSANOTINITIALISED );
return NULL;
DWORD ReadSize = 0;
PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
DWORD ReadSize = 0;
PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
+ if (!p || !WSAINITIALIZED)
{
WSASetLastError( WSANOTINITIALISED );
return NULL;
{
WSASetLastError( WSANOTINITIALISED );
return NULL;
DWORD ReadSize = 0, ValidData = 0;
PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
DWORD ReadSize = 0, ValidData = 0;
PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
+ if( !p || !WSAINITIALIZED)
{
WSASetLastError( WSANOTINITIALISED );
return NULL;
{
WSASetLastError( WSANOTINITIALISED );
return NULL;
+ if (!p || !WSAINITIALIZED)
{
WSASetLastError(WSAEFAULT);
return INADDR_NONE;
{
WSASetLastError(WSAEFAULT);
return INADDR_NONE;