Changeset 1968 for trunk/src

Timestamp:

Dec 4, 1999, 7:54:33 PM (26 years ago)

Author:

achimha

Message:

fixed async invocation bugs, added more debug output, cleanup

Location:

trunk/src/wsock32/new

Files:

• relaywin.cpp (modified) (4 diffs)
• wsock32.cpp (modified) (8 diffs)

trunk/src/wsock32/new/relaywin.cpp

@@ -214 +214 @@
   //   WinDefWindowProc()
 
-  pHM = RelayQuery(ulMsg);                          // find registered message
-  if (pHM != NULL)                                  // message pair found
+  /* find registered message */
+  pHM = RelayQuery(ulMsg);
+  /* message pair found */
+  if (pHM != NULL)
   {
     rc = SHORT1FROMMP(mp2);                /* asynchronous operation result */
+
+    dprintf(("WSOCK32: RelayWindowProc, message %d for window %d with "
+             "mp1 = %d and mp2 = %d (rc = %d) received\n",
+             ulMsg, hwnd, mp1, mp2, rc));
 
     /* check request type for special handling */
@@ -270 +276 @@
         if (rc == 0)
         {
+          dprintf(("WSOCK32:RelayWindowProc, hostent buffer: %d\n", pHM->pvUserData1));
           /* we need to convert the hostent structure here */
           Whostent *WinHostent             = (Whostent*)pHM->pvUserData1;
@@ -377 +384 @@
         break;
       }
+
+      default:
+      {
+        dprintf(("WSOCK32:RelayWindowProc, Unknown request type!!!"
+                 "window: %d, msg: %d, mp1 %d, mp2%d\n", pHM->hwnd,
+                 pHM->ulMsg, mp1, mp2));
+        break;
+      }
     }
 
@@ -394 +409 @@
     // @@@PH
     if (pHM->ulRequestType != ASYNCREQUEST_SELECT)
+    {
+      dprintf(("WSOCK32:RelayWindowProc, Free handle %d\n", pHM->ulMsg));
       RelayFree(pHM->ulMsg);
+    }
 
     return FALSE;                                   // OK, message sent
+  } else
+  {
+    dprintf(("WSOCK32:AsyncRelayWindowProc: Handle not found, message ignored\n"));
   }
 

trunk/src/wsock32/new/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.13 1999-12-03 12:59:40 achimha Exp $ */
+/* $Id: wsock32.cpp,v 1.14 1999-12-04 18:54:33 achimha Exp $ */
 
 /*
@@ -1182 +1182 @@
   ulNewID = RelayAlloc(hWnd,
                        wMsg,
+                       ASYNCREQUEST_GETSERVBYNAME,
                        FALSE,
-                       ASYNCREQUEST_GETSERVBYNAME,
                        buf);
 
@@ -1232 +1232 @@
   ulNewID = RelayAlloc(hWnd,
                        wMsg,
+                       ASYNCREQUEST_GETSERVBYPORT,
                        FALSE,
-                       ASYNCREQUEST_GETSERVBYPORT,
                        buf);
 
@@ -1281 +1281 @@
   ulNewID = RelayAlloc(hWnd,
                        wMsg,
+                       ASYNCREQUEST_GETPROTOBYNAME,
                        FALSE,
-                       ASYNCREQUEST_GETPROTOBYNAME,
                        buf);
 
@@ -1329 +1329 @@
   ulNewID = RelayAlloc(hWnd,
                        wMsg,
+                       ASYNCREQUEST_GETPROTOBYNUMBER,
                        FALSE,
-                       ASYNCREQUEST_GETPROTOBYNUMBER,
                        buf);
 
@@ -1377 +1377 @@
   ulNewID = RelayAlloc(hWnd,
                        wMsg,
+                       ASYNCREQUEST_GETHOSTBYNAME,
                        FALSE,
-                       ASYNCREQUEST_GETHOSTBYNAME,
                        (PVOID)buf, (PVOID)buflen);
 
@@ -1427 +1427 @@
   ulNewID = RelayAlloc(hWnd,
                        wMsg,
+                       ASYNCREQUEST_GETHOSTBYADDR,
                        FALSE,
-                       ASYNCREQUEST_GETHOSTBYADDR,
                        buf);
 
@@ -1521 +1521 @@
     ulNewID = RelayAlloc(hWnd,
                          wMsg,
-                         TRUE,
-                         ASYNCREQUEST_SELECT);
+                         ASYNCREQUEST_SELECT,
+                         TRUE);
 
   rc = WSAAsyncSelect(s,