Changeset 6195 for trunk/src

Timestamp:

Jul 7, 2001, 12:43:42 PM (24 years ago)

Author:

achimha

Message:

moved WSAEventSelect to Winsock 1.1

Location:

trunk/src/ws2_32

Files:

• socket.cpp (modified) (3 diffs)
• ws2_32.def (modified) (3 diffs)

trunk/src/ws2_32/socket.cpp

@@ -35 +35 @@
 BOOL WINAPI WSASetEvent(WSAEVENT hEvent)
 {
-    TRACE("WSASetEvent");
+    TRACE("WSASetEvent event=0x%x\n", hEvent);
     return SetEvent(hEvent);
 }
@@ -43 +43 @@
  *
  */
-BOOL WINAPI WSACloseEvent(WSAEVENT event)
+BOOL WINAPI WSACloseEvent(WSAEVENT hEvent)
 {
-    TRACE ("WSACloseEvent event=0x%x\n", event);
+    TRACE ("WSACloseEvent event=0x%x\n", hEvent);
 
     return CloseHandle(event);
@@ -98 +98 @@
 }
 
-/***********************************************************************
- *              WSAEventSelect (WS2_32.39)
- */
-int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent)
-{
-    TRACE("WS2_32: WSAEventSelect %08x, hEvent %08x, event %08x\n", s, hEvent, (unsigned)lEvent );
-#ifdef DEBUG
-    // log all event bits that are set
-    char tmpbuf[300];
-    strcpy(tmpbuf, "");
-    if (lEvent & FD_READ)
-        strcat(tmpbuf, " FD_READ");
-    if (lEvent & FD_WRITE)
-        strcat(tmpbuf, " FD_WRITE");
-    if (lEvent & FD_OOB)
-        strcat(tmpbuf, " FD_OOB");    
-    if (lEvent & FD_ACCEPT)
-        strcat(tmpbuf, " FD_ACCEPT");
-    if (lEvent & FD_CONNECT)
-        strcat(tmpbuf, " FD_CONNECT");
-    if (lEvent & FD_CLOSE)
-        strcat(tmpbuf, " FD_CLOSE");
-    if (lEvent & FD_QOS)
-        strcat(tmpbuf, " FD_QOS");
-    if (lEvent & FD_GROUP_QOS)
-        strcat(tmpbuf, " FD_GROUP_QOS");
-    if (lEvent & FD_ROUTING_INTERFACE_CHANGE)
-        strcat(tmpbuf, " FD_ROUTING_INTERFACE_CHANGE");
-    if (lEvent & FD_ADDRESS_LIST_CHANGE)
-        strcat(tmpbuf, " FD_ADDRESS_LIST_CHANGE");
-    dprintf(("event bits:%s", tmpbuf));
-#endif
-    SetLastError(WSAEINVAL);
-    return SOCKET_ERROR;
-}
-

trunk/src/ws2_32/ws2_32.def

@@ -1 @@
-; $Id: ws2_32.def,v 1.5 2001-05-19 11:15:38 sandervl Exp $
+; $Id: ws2_32.def,v 1.6 2001-07-07 10:43:42 achimha Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -46 +46 @@
   shutdown                                         = WSOCK32.22
   socket                                           = WSOCK32.23
+  WSAEventSelect                                   = WSOCK32.3001
          
 EXPORTS
@@ -88 +89 @@
 ; WSAEnumProtocolsA                                @37
 ; WSAEnumProtocolsW                                @38
-  WSAEventSelect = _WSAEventSelect@12              @39
+  WSAEventSelect                                   @39
 ; WSAGetOverlappedResult                           @40
 ; WSAGetQOSByName                                  @41