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

Timestamp:

Mar 17, 2000, 5:07:53 PM (25 years ago)

Author:

sandervl

Message:

WSAAsyncSelect fix

File:

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

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.19 2000-03-14 14:59:43 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.20 2000-03-17 16:06:42 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
 #include "wsock32.h"
 #include "relaywin.h"
+#define DBG_LOCALLOG    DBG_wsock32
+#include "dbglocal.h"
 
 
@@ -67 +69 @@
 static HWND hwndRelay = NULL; // handle to our relay window
 
+BOOL fWSAInitialized = FALSE;
 
 /*****************************************************************************
@@ -1070 +1073 @@
               LPWSADATA,lpWSAData)
 {
+  fWSAInitialized = TRUE;
   return(WSAStartup(wVersionRequired,
                     lpWSAData));
@@ -1089 +1093 @@
 ODINFUNCTION0(int,OS2WSACleanup)
 {
+  fWSAInitialized = FALSE;
   return(WSACleanup());
 }
@@ -1538 +1543 @@
                          wMsg,
                          ASYNCREQUEST_SELECT,
-                         TRUE);
+                         FALSE); //SvL: allow multiple selects -> pmwsock should fail if it not allowed
+//                         TRUE);
 
   rc = WSAAsyncSelect(s,
@@ -1545 +1551 @@
                       lEvent);
 
-//  iError = WSAGetLastError();
-//  dprintf(("res=%d, err=%d\n",
-//           rc,
-//           iError));
+  // if an error occurs, free the allocated relay entry
+  if (rc == SOCKET_ERROR)
+    RelayFree(ulNewID);
+
   return (rc);
 }