Changeset 7977 for trunk/src/wsock32/wsock32.cpp

Timestamp:

Feb 20, 2002, 4:07:14 PM (24 years ago)

Author:

sandervl

Message:

accept bugfix for changing async request

File:

• trunk/src/wsock32/wsock32.cpp (modified) (6 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.46 2002-02-06 10:33:56 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.47 2002-02-20 15:07:14 sandervl Exp $ */
 
 /*
@@ -376 +376 @@
    //to blocking mode
    if (cmd == FIONBIO) {
-        HWND  hwnd;
-        int   msg;
+        ULONG ulNotifyHandle, ulNotifyData;
+        int   mode;
         ULONG lEvent;
 
-        if(QueryAsyncEvent(s, &hwnd, &msg, &lEvent) == TRUE) {
+        if(QueryAsyncEvent(s, &mode, &ulNotifyHandle, &ulNotifyData, &lEvent) == TRUE) 
+        {
                 if(*argp != 0) {
                         //nothing to do; already non-blocking
@@ -521 +522 @@
                                 int *,            addrlen)
 {
- int   ret, msg;
- HWND  hwnd;
- ULONG lEvent;
+ int   ret, mode;
+ ULONG lEvent, notifyData, notifyHandle;
 
    if(!fWSAInitialized) {
@@ -549 +549 @@
         //if this socket has an active async. select pending, then call WSAAsyncSelect
         //with the same parameters for the new socket (see docs)
-        if(QueryAsyncEvent(s, &hwnd, &msg, &lEvent) == TRUE) {
-                if(WSAAsyncSelect(ret, hwnd, msg, lEvent) == SOCKET_ERROR) {
+        if(QueryAsyncEvent(s, &mode, &notifyHandle, &notifyData, &lEvent) == TRUE) {
+                if(WSAAsyncSelectWorker(s, mode, notifyHandle, notifyData, lEvent) == SOCKET_ERROR) {
                         ret = SOCKET_ERROR;
                 }
@@ -948 +948 @@
   struct ws_linger *yy;
   struct linger     xx;
-  int               ret;
+  int               ret, val;
   ULONG             size;
   char             *safeoptval;
@@ -1159 +1159 @@
                    return SOCKET_ERROR;
                }
-               dprintf(("IPPROTO_IP, IP_HDRINCL 0x%x", *optval));
-               ret = setsockopt(s, IPPROTO_IP, IP_HDRINCL_OS2, (char *)optval, optlen);
+               val = *optval;
+               dprintf(("IPPROTO_IP, IP_HDRINCL 0x%x", val));
+               ret = setsockopt(s, IPPROTO_IP, IP_HDRINCL_OS2, (char *)&val, optlen);
                break;