Changeset 1940 for trunk/src

Timestamp:

Dec 2, 1999, 4:22:05 PM (26 years ago)

Author:

achimha

Message:

async wsock fixes

Location:

trunk/src/wsock32/new

Files:

• relaywin.cpp (modified) (6 diffs)
• relaywin.h (modified) (3 diffs)
• wsock32.cpp (modified) (5 diffs)

trunk/src/wsock32/new/relaywin.cpp

@@ -1 @@
-/* $Id: relaywin.cpp,v 1.3 1999-12-02 07:47:26 phaller Exp $ */
+/* $Id: relaywin.cpp,v 1.4 1999-12-02 15:22:05 achimha Exp $ */
 
 /*
@@ -38 +38 @@
 #include "relaywin.h"
 
+#include <pmwsock.h>
+#include <os2sel.h>
+#include <wprocess.h>
+#include <heapstring.h>
+#include <win32wnd.h>
+#include "wsock32.h"
+
 ODINDEBUGCHANNEL(WSOCK32-RELAYWIN)
 
@@ -53 +60 @@
 
 // prototype for PostMessageA
-//BOOL _Stdcall PostMessageA(HWND,UINT,WPARAM,LPARAM);
 BOOL __stdcall PostMessageA(HWND,UINT,ULONG,ULONG);
 
@@ -69 +75 @@
  *****************************************************************************/
 
-ULONG RelayAlloc(HWND hwnd, ULONG ulMsg)
+ULONG RelayAlloc(HWND hwnd, ULONG ulMsg, ULONG ulRequestType,
+                 PVOID pvUserData1, PVOID pvUserData2)
 {
   ULONG ulCounter;
@@ -82 +89 @@
       arrHwndMsgPair[ulCounter].hwnd  = hwnd;
       arrHwndMsgPair[ulCounter].ulMsg = ulMsg;
+      arrHwndMsgPair[ulCounter].ulRequestType = ulRequestType;
+      arrHwndMsgPair[ulCounter].pvUserData1 = pvUserData1;
+      arrHwndMsgPair[ulCounter].pvUserData2 = pvUserData2;
       return ulCounter; // return "id"
     }
@@ -190 +200 @@
   //   WinDefWindowProc()
   
-  //@@@PH: 1999/11/31 PROBLEM
-  // hwnd and ulMsg passed in have been converted by our USER32 code
-  // here, we ultimatively need to translate it back.
-  // under the debugger, things WORK now !:)
-  
   pHM = RelayQuery(ulMsg);                          // find registered message
   if (pHM != NULL)                                  // message pair found
   {
+    /* check request type for special handling */
+    if (pHM->ulRequestType == ASYNCREQUEST_GETHOSTBYNAME)
+    {
+      dprintf(("WSOCK32:RelayWindowProc, Converting hostent for WSAAyncGetHostByName\n"));
+      /* we need to convert the hostent structure here */
+      Whostent *WinHostent = (Whostent*)pHM->pvUserData1;
+      hostent *OS2Hostent = (hostent*)pHM->pvUserData2;
+      WinHostent->h_name = OS2Hostent->h_name;
+      WinHostent->h_aliases = OS2Hostent->h_aliases;
+      WinHostent->h_addrtype = (short)OS2Hostent->h_addrtype;
+      WinHostent->h_length = (short)OS2Hostent->h_length;
+      WinHostent->h_addr_list = OS2Hostent->h_addr_list;
+      /* free our temporary OS2 hostent buffer */
+//TODO: how can we free this? we will end up with a memory leak :(
+// this memory block not only contains the hostent structure but also the strings it points to
+//      free(pHM->pvUserData2);
+
+dprintf(("Size of Window hostent: %d, OS/2 hostent: %d, mp1: %d, mp2 %d\n", sizeof(Whostent), sizeof(hostent), mp1, mp2));
+
+    }
+
+    dprintf(("WSOCK32:RelayWinProc, Posting %d to %d\n", pHM->ulMsg, pHM->hwnd));
     PostMessageA(pHM->hwnd,
                  pHM->ulMsg,

trunk/src/wsock32/new/relaywin.h

@@ -1 @@
-/* $Id: relaywin.h,v 1.2 1999-12-02 07:47:26 phaller Exp $ */
+/* $Id: relaywin.h,v 1.3 1999-12-02 15:22:05 achimha Exp $ */
 
 /*
@@ -36 +36 @@
  *****************************************************************************/
 
+/* these are the request types so we can interpret the messages and convert the results */
+#define ASYNCREQUEST_SELECT 0
+#define ASYNCREQUEST_GETHOSTBYNAME 1
+
 typedef struct tagHwndMsgPair
 {
   HWND  hwnd;  /* target window            */
   ULONG ulMsg; /* the message code to send */
+  ULONG ulRequestType; /* the type of request that this belongs to */
+  PVOID pvUserData1; /* request specific data field */
+  PVOID pvUserData2; /* request specific data field */
 } HWNDMSGPAIR, *PHWNDMSGPAIR;
 
@@ -46 +53 @@
  *****************************************************************************/
 
-ULONG        RelayAlloc     (HWND  hwnd, ULONG ulMsg);
+ULONG RelayAlloc(HWND hwnd, ULONG ulMsg, ULONG ulRequestType,
+                 PVOID pvUserData1 = 0, PVOID pvUserData2 = 0);
 ULONG        RelayFree      (ULONG ulID);
 ULONG        RelayFreeByHwnd(HWND  hwnd);

trunk/src/wsock32/new/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.8 1999-12-02 07:58:54 phaller Exp $ */
+/* $Id: wsock32.cpp,v 1.9 1999-12-02 15:22:05 achimha Exp $ */
 
 /*
@@ -63 +63 @@
 static WSOCKTHREADDATA wstdFallthru; // for emergency only
 
+static HWND hwndRelay; // handle to our relay window
 
 /*****************************************************************************
@@ -1268 +1269 @@
               int,buflen)
 {
-  return(WSAAsyncGetHostByName(hWnd,
-                               wMsg,
-                               name,
-                               buf,
-                               buflen));
+  int   rc;
+  HWND  hwndOS2 = Win32ToOS2Handle(hWnd);
+  ULONG ulNewID;
+  char *OS2Hostent = (char*)malloc(MAXGETHOSTSTRUCT);
+
+  if (hwndRelay == NULL) // already initialized ?
+    hwndRelay = RelayInitialize(hwndOS2);
+
+  // TODO: Is this the original behaviour?
+  if ((name == NULL) || (buf == NULL))
+  {
+    // remove entry from list
+    RelayFreeByHwnd(hWnd);
+  }
+  else
+    // add entry to list, we need to store both our temp buffer and the apps buffer
+    ulNewID = RelayAlloc(hWnd, wMsg, ASYNCREQUEST_GETHOSTBYNAME, buf, OS2Hostent);
+
+  // call pmwsock function, will fill our temp buffer
+  rc = WSAAsyncGetHostByName(hwndRelay,
+                             ulNewID,
+                             name,
+                             OS2Hostent,
+                             buflen);
+
+  return rc;
 }
 
@@ -1349 +1371 @@
   ULONG ulNewID;
 
-  static HWND hwndRelay; // handle to our relay window
-
   if (hwndRelay == NULL) // already initialized ?
     hwndRelay = RelayInitialize(hwndOS2);
@@ -1380 +1400 @@
   else
     // add entry to list
-    ulNewID = RelayAlloc(hWnd, wMsg);
+    ulNewID = RelayAlloc(hWnd, wMsg, ASYNCREQUEST_SELECT);
 
   rc = WSAAsyncSelect(s,