Changeset 7041 for trunk/src/wsock32/asyncapi.cpp

Timestamp:

Oct 13, 2001, 8:51:08 PM (24 years ago)

Author:

sandervl

Message:

several updates + fixes

File:

• trunk/src/wsock32/asyncapi.cpp (modified) (7 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.15 2001-07-08 15:44:27 achimha Exp $ */
+/* $Id: asyncapi.cpp,v 1.16 2001-10-13 18:51:07 sandervl Exp $ */
 
 /*
@@ -415 +415 @@
     {
         dprintf(("AsyncSelectNotifyEvent: notifying event semaphore, socket: 0x%x, HEVENT: 0x%x, event: 0x%x", pThreadParm->u.asyncselect.s, pThreadParm->notifyHandle, event));
+        pThreadParm->u.asyncselect.lLastEvent |= event;
         SetEvent(pThreadParm->notifyHandle);
     }
@@ -442 +443 @@
 
         //break if user cancelled request
-        if(pThreadParm->u.asyncselect.lEvents == 0) {
+        if(pThreadParm->u.asyncselect.lEvents == 0 || pThreadParm->fCancelled) {
                 break;
         }
@@ -700 +701 @@
    pThreadParm->u.asyncselect.lEvents        = lEventMask;
    pThreadParm->u.asyncselect.lEventsPending = lEventMask;
+   pThreadParm->u.asyncselect.lLastEvent     = 0;
    pThreadParm->u.asyncselect.s              = s;
    pThreadParm->u.asyncselect.asyncSem       = new VSemaphore;
@@ -734 +736 @@
            lpEvent->iErrorCode[i] = 0;
         }
-
-        lpEvent->lNetworkEvents = pThreadInfo->u.asyncselect.lEventsPending;
-
-        // TODO is this correct? API says they're cleared
-        pThreadInfo->u.asyncselect.lEventsPending = 0;
-   } else
+        lpEvent->lNetworkEvents = InterlockedExchange((LPLONG)&pThreadInfo->u.asyncselect.lLastEvent, 0);
+   } 
+   else
    {
       asyncThreadMutex.leave();
@@ -747 +746 @@
       return SOCKET_ERROR;
    }
+   asyncThreadMutex.leave();
 
    // reset event semaphore if present
@@ -755 +755 @@
    }
 
-   asyncThreadMutex.leave();
-
    WSASetLastError(NO_ERROR);
    return NO_ERROR;