Changeset 3548 for trunk/src

Timestamp:

May 18, 2000, 11:09:04 AM (25 years ago)

Author:

sandervl

Message:

async select clear fix

Location:

trunk/src/wsock32

Files:

• asyncthread.cpp (modified) (3 diffs)
• asyncthread.h (modified) (2 diffs)
• wsock32.cpp (modified) (2 diffs)

trunk/src/wsock32/asyncthread.cpp

@@ -1 @@
-/* $Id: asyncthread.cpp,v 1.4 2000-04-15 09:23:36 sandervl Exp $ */
+/* $Id: asyncthread.cpp,v 1.5 2000-05-18 09:09:03 sandervl Exp $ */
 
 /*
@@ -176 +176 @@
    pThreadInfo = threadList;
    while(pThreadInfo) {
-        if(pThreadInfo->u.asyncselect.s == s) {
+        if(pThreadInfo->u.asyncselect.s == s && !pThreadInfo->fRemoved) {
                 return pThreadInfo;
         }
@@ -196 +196 @@
         pThreadInfo->hwnd                  = hwnd;
         pThreadInfo->msg                   = msg;
+        if(lEvent == 0) {
+                //make sure this thread isn't used anymore
+                pThreadInfo->fRemoved = TRUE;
+        }
         //cancel pending select in async select thread (if any)
         so_cancel(s);

trunk/src/wsock32/asyncthread.h

@@ -1 @@
-/* $Id: asyncthread.h,v 1.3 2000-03-24 19:28:04 sandervl Exp $ */
+/* $Id: asyncthread.h,v 1.4 2000-05-18 09:09:04 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
         BOOL            fActive;
         BOOL            fCancelled;
+        BOOL            fConnected;
+        BOOL            fRemoved;  //async select
         AsyncRequestType request;
         LHANDLE         hAsyncTaskHandle;

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.31 2000-05-09 19:01:23 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.32 2000-05-18 09:09:04 sandervl Exp $ */
 
 /*
@@ -322 +322 @@
                         return NO_ERROR;
                 }
-                else {
+                else 
+                if(lEvent != 0) {
                         dprintf(("Trying to set socket to blocking mode while async select active -> return error!"));
                         WSASetLastError(WSAEINVAL);