Changeset 3205 for trunk/src/wsock32/new/wsock32.cpp

Timestamp:

Mar 23, 2000, 8:21:56 PM (25 years ago)

Author:

sandervl

Message:

wsock32\new update

File:

• trunk/src/wsock32/new/wsock32.cpp (modified) (10 diffs)

trunk/src/wsock32/new/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.16 2000-03-22 20:01:08 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.17 2000-03-23 19:21:54 sandervl Exp $ */
 
 /*
@@ -94 +94 @@
         goto tryagain;
     }
-    else {
+    if(iData == NULL) {
         dprintf(("WINSOCK_GetIData: couldn't find struct for thread %x", tid));
         DebugInt3();// should never happen!!!!!!!
@@ -145 +145 @@
 //******************************************************************************
 //******************************************************************************
-ODINPROCEDURE1(WSASetLastError,
-               int,iError)
+void WIN32API WSASetLastError(int iError)
 {
   // according to the docs, WSASetLastError() is just a call-through
   // to SetLastError()
+  if(iError) {
+        dprintf(("WSASetLastError %x", iError));
+  }
   SetLastError(iError);
 }
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION0(int,WSAGetLastError)
+int WIN32API WSAGetLastError()
 {
   return GetLastError();
@@ -232 +234 @@
 
    //Close WSAAsyncSelect thread if one was created for this socket
-   EnableAsyncEvent(s, 0L);
+   WSAAsyncSelect(s, 0, 0, 0);
    
    if(ret == SOCKET_ERROR) {
@@ -291 +293 @@
         return SOCKET_ERROR;
    } 
+   // clear high word (not used in OS/2's tcpip stack)
+   cmd = LOUSHORT(cmd);
+
    if(cmd != FIONBIO && cmd != FIONREAD && cmd != SIOCATMARK) {
         WSASetLastError(WSAEINVAL);
@@ -317 +322 @@
         }
    }
-   // clear high word (not used in OS/2's tcpip stack)
-   ret = ioctl(s, LOUSHORT(cmd), (char *)argp, sizeof(int));
+   ret = ioctl(s, cmd, (char *)argp, sizeof(int));
 
    // Map EOPNOTSUPP to EINVAL
@@ -878 +882 @@
                 break;
         default: 
+                dprintf(("setsockopt: unknown option %x", optname));
                 WSASetLastError(WSAENOPROTOOPT);
                 return SOCKET_ERROR;
@@ -892 +897 @@
         } 
         else {
+                dprintf(("setsockopt: unknown option %x", optname));
                 WSASetLastError(WSAENOPROTOOPT);
                 return SOCKET_ERROR;
@@ -974 +980 @@
                 break;
         default: 
+                dprintf(("getsockopt: unknown option %x", optname));
                 WSASetLastError(WSAENOPROTOOPT);
                 return SOCKET_ERROR;
@@ -988 +995 @@
         } 
         else {
+                dprintf(("getsockopt: unknown option %x", optname));
                 WSASetLastError(WSAENOPROTOOPT);
                 return SOCKET_ERROR;