Changeset 3139 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

WSAAsyncSelect fix

Location:

trunk/src/wsock32

Files:

• dbglocal.cpp (added)
• dbglocal.h (added)
• initterm.cpp (added)
• makefile (modified) (2 diffs)
• relaywin.cpp (modified) (10 diffs)
• wsock32.cpp (modified) (7 diffs)
• wsock32.h (modified) (2 diffs)

trunk/src/wsock32/makefile

@@ -1 @@
-# $Id: makefile,v 1.20 2000-03-06 23:39:20 bird Exp $
+# $Id: makefile,v 1.21 2000-03-17 16:06:42 sandervl Exp $
 
 #
@@ -28 +28 @@
 $(OBJDIR)\relaywin.obj \
 $(OBJDIR)\wsock32rsrc.obj \
-$(PDWIN32_LIB)/dllentry.obj
+$(OBJDIR)\initterm.obj \
+#$(OBJDIR)\async.obj \
+#$(OBJDIR)\asyncthread.obj \
+$(OBJDIR)\dbglocal.obj
 
 

trunk/src/wsock32/relaywin.cpp

@@ -42 +42 @@
 #include <win32api.h>
 #include "wsock32.h"
+#include <vmutex.h>
+
+#define DBG_LOCALLOG    DBG_relaywin
+#include "dbglocal.h"
 
 ODINDEBUGCHANNEL(WSOCK32-RELAYWIN)
@@ -56 +60 @@
 static char*       ODIN_WSOCK_RELAY_CLASS = "ODIN_WSOCK_RELAY";
 static HWND        hwndRelay              = NULLHANDLE;
-
+static HAB         hab;
+static VMutex      relayMutex;
 
 /*****************************************************************************
@@ -80 +85 @@
   ULONG ulCounter;
 
-  for (ulCounter = 0;
-       ulCounter < MAX_ASYNC_SOCKETS;
-       ulCounter++)
-    if ( (arrHwndMsgPair[ulCounter].hwnd == 0) ||    // slot free?
-         ( (fSingleRequestPerWindow == TRUE) &&      // more than one request
-                                                     // per window ?
+  relayMutex.enter();
+  for(ulCounter = 0; ulCounter < MAX_ASYNC_SOCKETS; ulCounter++)
+  {
+        if ( (arrHwndMsgPair[ulCounter].hwnd == 0) ||    // slot free?
+           ( (fSingleRequestPerWindow == TRUE) &&      // more than one request per window?
            (arrHwndMsgPair[ulCounter].hwnd == hwnd) ) ) // same window?
-    {
-      // occupy slot
-      arrHwndMsgPair[ulCounter].hwnd          = hwnd;
-      arrHwndMsgPair[ulCounter].ulMsg         = ulMsg;
-      arrHwndMsgPair[ulCounter].ulRequestType = ulRequestType;
-      arrHwndMsgPair[ulCounter].pvUserData1   = pvUserData1;
-      arrHwndMsgPair[ulCounter].pvUserData2   = pvUserData2;
-      arrHwndMsgPair[ulCounter].pvUserData3   = pvUserData3;
-      return ulCounter + 1; // return "id"
-    }
-
+        {
+                // occupy slot
+                arrHwndMsgPair[ulCounter].hwnd          = hwnd;
+                arrHwndMsgPair[ulCounter].ulMsg         = ulMsg;
+                arrHwndMsgPair[ulCounter].ulRequestType = ulRequestType;
+                arrHwndMsgPair[ulCounter].pvUserData1   = pvUserData1;
+                arrHwndMsgPair[ulCounter].pvUserData2   = pvUserData2;
+                arrHwndMsgPair[ulCounter].pvUserData3   = pvUserData3;
+                relayMutex.leave();
+                return ulCounter + 1; // return "id"
+        }
+  }
+  relayMutex.leave();
   return -1; // not found
 }
@@ -120 +126 @@
     return -1; // error
 
+  relayMutex.enter();
   arrHwndMsgPair[ulID-1].hwnd = 0; // mark free
   arrHwndMsgPair[ulID-1].ulMsg = 0;
@@ -126 +133 @@
   arrHwndMsgPair[ulID-1].pvUserData2 = 0;
   arrHwndMsgPair[ulID-1].pvUserData3 = 0;
+  relayMutex.leave();
 
   return 0; // OK
@@ -147 +155 @@
   ULONG ulCounter;
 
-  for (ulCounter = 0;
-       ulCounter < MAX_ASYNC_SOCKETS;
-       ulCounter++)
-    if ( arrHwndMsgPair[ulCounter].hwnd == hwnd )  // same window?
-    {
-      arrHwndMsgPair[ulCounter].hwnd  = 0; // free slot
-      return 0; // OK
-    }
-
+  relayMutex.enter();
+  for(ulCounter = 0; ulCounter < MAX_ASYNC_SOCKETS; ulCounter++)
+  {
+        if ( arrHwndMsgPair[ulCounter].hwnd == hwnd )  // same window?
+        {
+                arrHwndMsgPair[ulCounter].hwnd  = 0; // free slot
+                arrHwndMsgPair[ulCounter].ulMsg = 0;
+                arrHwndMsgPair[ulCounter].ulRequestType = 0;
+                arrHwndMsgPair[ulCounter].pvUserData1 = 0;
+                arrHwndMsgPair[ulCounter].pvUserData2 = 0;
+                arrHwndMsgPair[ulCounter].pvUserData3 = 0;
+                relayMutex.leave();
+                return 0; // OK
+        }
+  }
+  relayMutex.leave();
+  dprintf(("RelayFreeByHwnd: window %x not found!", hwnd));
   return -1; // not found
 }
@@ -216 +232 @@
     rc = SHORT1FROMMP(mp2);                /* asynchronous operation result */
 
-    dprintf(("WSOCK32: RelayWindowProc, message %x for window %x with "
-             "mp1 = %d and mp2 = %d (rc = %d) received\n",
-             ulMsg, hwnd, mp1, mp2, rc));
+//    dprintf(("WSOCK32: RelayWindowProc, message %x for window %x with "
+//             "mp1 = %d and mp2 = %d (rc = %d) (time = %x) received\n",
+//             ulMsg, hwnd, mp1, mp2, rc, WinQueryMsgTime(hab)));
 
     /* check request type for special handling */
@@ -228 +244 @@
       case ASYNCREQUEST_SELECT:
       {
-        dprintf(("WSOCK32:RelayWindowProc, AsyncSelect notification\n"));
+        dprintf(("WSOCK32:RelayWindowProc, AsyncSelect notification %x %x (%d,%d) time %x\n", pHM->hwnd, pHM->ulMsg, mp1, mp2, WinQueryMsgTime(hab)));
         break;
       }
@@ -390 +406 @@
 
 
-    dprintf(("WSOCK32:RelayWinProc, Posting hwnd=%08xh, msg=%08xh, w=%08xh, l=%08xh\n",
-             pHM->hwnd,
-             pHM->ulMsg,
-             mp1,
-             mp2));
+//    dprintf(("WSOCK32:RelayWinProc, Posting hwnd=%08xh, msg=%08xh, w=%08xh, l=%08xh\n",
+//             pHM->hwnd,
+//             pHM->ulMsg,
+//             mp1,
+//             mp2));
 
     PostMessageA(pHM->hwnd,
@@ -439 +455 @@
 {
   BOOL       fSuccess;
-  HAB        hab;
   HWND       hwnd;
 

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);
 }

trunk/src/wsock32/wsock32.h

@@ -1 @@
-/* $Id: wsock32.h,v 1.9 1999-12-07 20:25:48 achimha Exp $ */
+/* $Id: wsock32.h,v 1.10 2000-03-17 16:06:42 sandervl Exp $ */
 
 /* WSOCK32.H--definitions & conversions for Odin's wsock32.dll.
@@ -85 +85 @@
 
 
+extern BOOL fWSAInitialized;
+
+void WIN32API OS2WSASetLastError(int iError);
+
+int  WIN32API OS2WSAGetLastError(void);
+
+BOOL WIN32API OS2WSAIsBlocking(void);
+
 #endif  /* _WINSOCK32CONST_ */