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

Timestamp:

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

Author:

sandervl

Message:

WSAAsyncSelect fix

File:

• trunk/src/wsock32/relaywin.cpp (modified) (10 diffs)

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;