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

ws2_32: Use a symbolic name instead of hand-made value.

oldstable
Dmitry Timoshkov 2006-10-02 00:15:59 +09:00 committed by Alexandre Julliard
parent 01d9eac0be
commit 888c930f2d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ws2_32/socket.c
View File

@ -2258,7 +2258,7 @@ INT WINAPI WSAIoctl(SOCKET s,
break;
default:
WARN("\tunsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode);
FIXME("unsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode);
release_sock_fd( s, fd );
WSASetLastError(WSAEOPNOTSUPP);
return SOCKET_ERROR;
@ -2318,7 +2318,7 @@ int WINAPI WS_ioctlsocket(SOCKET s, long cmd, u_long *argp)
newcmd=SIOCATMARK;
break;
case WS__IOW('f',125,u_long):
case WS_FIOASYNC:
WARN("Warning: WS1.1 shouldn't be using async I/O\n");
SetLastError(WSAEINVAL);
return SOCKET_ERROR;

10
include/winsock.h
View File

@ -750,10 +750,20 @@ typedef struct WS(WSAData)
#ifndef USE_WS_PREFIX
#define FIONREAD _IOR('f', 127, u_long)
#define FIONBIO _IOW('f', 126, u_long)
#define FIOASYNC _IOW('f', 125, u_long)
#define SIOCSHIWAT _IOW('s', 0, u_long)
#define SIOCGHIWAT _IOR('s', 1, u_long)
#define SIOCSLOWAT _IOW('s', 2, u_long)
#define SIOCGLOWAT _IOR('s', 3, u_long)
#define SIOCATMARK _IOR('s', 7, u_long)
#else
#define WS_FIONREAD WS__IOR('f', 127, u_long)
#define WS_FIONBIO WS__IOW('f', 126, u_long)
#define WS_FIOASYNC WS__IOW('f', 125, u_long)
#define WS_SIOCSHIWAT WS__IOW('s', 0, u_long)
#define WS_SIOCGHIWAT WS__IOR('s', 1, u_long)
#define WS_SIOCSLOWAT WS__IOW('s', 2, u_long)
#define WS_SIOCGLOWAT WS__IOR('s', 3, u_long)
#define WS_SIOCATMARK WS__IOR('s', 7, u_long)
#endif