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

Dmitry Timoshkov dmitry at codeweavers.com
Sun Oct 1 10:15:59 CDT 2006


Hello,

Changelog:
    ws2_32: Use a symbolic name instead of hand-made value, add more
    symbolic names for socket IOCTL commands.

diff -up cvs/hq/wine/dlls/ws2_32/socket.c wine/dlls/ws2_32/socket.c
--- cvs/hq/wine/dlls/ws2_32/socket.c	2006-09-11 12:14:39.000000000 +0900
+++ wine/dlls/ws2_32/socket.c	2006-10-02 00:06:31.000000000 +0900
@@ -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
         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;
diff -up cvs/hq/wine/include/winsock.h wine/include/winsock.h
--- cvs/hq/wine/include/winsock.h	2006-09-26 15:23:07.000000000 +0900
+++ wine/include/winsock.h	2006-10-02 00:03:55.000000000 +0900
@@ -749,10 +749,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
 





More information about the wine-patches mailing list