projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with trunk (r48545)
[reactos.git]
/
dll
/
win32
/
ws2_32
/
misc
/
dllmain.c
diff --git
a/dll/win32/ws2_32/misc/dllmain.c
b/dll/win32/ws2_32/misc/dllmain.c
index
b71f80e
..
6eeb37e
100644
(file)
--- a/
dll/win32/ws2_32/misc/dllmain.c
+++ b/
dll/win32/ws2_32/misc/dllmain.c
@@
-459,7
+459,7
@@
select(IN INT nfds,
DereferenceProviderByPointer(Provider);
DereferenceProviderByPointer(Provider);
- if (
Errno != NO
_ERROR)
+ if (
Count == SOCKET
_ERROR)
{
WSASetLastError(Errno);
return SOCKET_ERROR;
{
WSASetLastError(Errno);
return SOCKET_ERROR;
@@
-586,13
+586,15
@@
ioctlsocket(IN SOCKET s,
IN LONG cmd,
IN OUT ULONG FAR* argp)
{
IN LONG cmd,
IN OUT ULONG FAR* argp)
{
+ ULONG tmp;
+
return WSAIoctl(s,
cmd,
argp,
sizeof(ULONG),
argp,
sizeof(ULONG),
return WSAIoctl(s,
cmd,
argp,
sizeof(ULONG),
argp,
sizeof(ULONG),
-
arg
p,
+
&tm
p,
0,
0);
}
0,
0);
}
@@
-642,7
+644,7
@@
WSAAccept(IN SOCKET s,
if (Socket == INVALID_SOCKET)
WSASetLastError(Errno);
if (Socket == INVALID_SOCKET)
WSASetLastError(Errno);
- if ( addr )
+ if ( addr
&& addrlen
)
{
#if DBG
LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr;
{
#if DBG
LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr;