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

Timestamp:

Mar 20, 2000, 9:31:30 PM (25 years ago)

Author:

sandervl

Message:

relay bugfixes

File:

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

trunk/src/wsock32/relaywin.cpp

@@ -78 +78 @@
                  ULONG ulMsg,
                  ULONG ulRequestType,
+                 ULONG socket,
                  BOOL  fSingleRequestPerWindow,
                  PVOID pvUserData1,
@@ -96 +97 @@
                 arrHwndMsgPair[ulCounter].ulMsg         = ulMsg;
                 arrHwndMsgPair[ulCounter].ulRequestType = ulRequestType;
+                arrHwndMsgPair[ulCounter].socket        = socket;
                 arrHwndMsgPair[ulCounter].pvUserData1   = pvUserData1;
                 arrHwndMsgPair[ulCounter].pvUserData2   = pvUserData2;
@@ -130 +132 @@
   arrHwndMsgPair[ulID-1].ulMsg = 0;
   arrHwndMsgPair[ulID-1].ulRequestType = 0;
+  arrHwndMsgPair[ulID-1].socket = 0;
   arrHwndMsgPair[ulID-1].pvUserData1 = 0;
   arrHwndMsgPair[ulID-1].pvUserData2 = 0;
@@ -151 +154 @@
  *****************************************************************************/
 
-ULONG RelayFreeByHwnd(HWND hwnd)
+ULONG RelayFreeByHwnd(ULONG socket, HWND hwnd)
 {
   ULONG ulCounter;
@@ -158 +161 @@
   for(ulCounter = 0; ulCounter < MAX_ASYNC_SOCKETS; ulCounter++)
   {
-        if ( arrHwndMsgPair[ulCounter].hwnd == hwnd )  // same window?
+        if (arrHwndMsgPair[ulCounter].hwnd == hwnd &&
+            arrHwndMsgPair[ulCounter].socket == socket)  // same window && socket?
         {
                 arrHwndMsgPair[ulCounter].hwnd  = 0; // free slot
                 arrHwndMsgPair[ulCounter].ulMsg = 0;
                 arrHwndMsgPair[ulCounter].ulRequestType = 0;
+                arrHwndMsgPair[ulCounter].socket = 0;
                 arrHwndMsgPair[ulCounter].pvUserData1 = 0;
                 arrHwndMsgPair[ulCounter].pvUserData2 = 0;
@@ -244 +249 @@
       case ASYNCREQUEST_SELECT:
       {
-        dprintf(("WSOCK32:RelayWindowProc, AsyncSelect notification %x %x (%d,%d) time %x\n", pHM->hwnd, pHM->ulMsg, mp1, mp2, WinQueryMsgTime(hab)));
+        dprintf(("WSOCK32:RelayWindowProc, AsyncSelect notification %x %x (%x,%x) time %x\n", pHM->hwnd, pHM->ulMsg, mp1, mp2, WinQueryMsgTime(hab)));
+        if(SHORT2FROMMP(mp2) == WSAECONNREFUSED) {
+                mp2 = (MPARAM)((WSAENOTCONN << 16) | 0x10);
+        }
         break;
       }