Changeset 1942 for trunk/src/wsock32/new/relaywin.cpp

Timestamp:

Dec 2, 1999, 5:01:45 PM (26 years ago)

Author:

achimha

Message:

async relay window proc fixes

File:

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

trunk/src/wsock32/new/relaywin.cpp

@@ -1 @@
-/* $Id: relaywin.cpp,v 1.4 1999-12-02 15:22:05 achimha Exp $ */
+/* $Id: relaywin.cpp,v 1.5 1999-12-02 16:01:45 achimha Exp $ */
 
 /*
@@ -204 +204 @@
   {
     /* check request type for special handling */
-    if (pHM->ulRequestType == ASYNCREQUEST_GETHOSTBYNAME)
+    switch (pHM->ulRequestType)
     {
-      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));
-
+      case ASYNCREQUEST_SELECT:
+      {
+        dprintf(("WSOCK32:RelayWindowProc, AsyncSelect notification\n"));
+      }
+      case 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
+  // I think we should copy the strings after the Whostent into the Win32 buffer
+  //      free(pHM->pvUserData2);
+  //TODO: the size of OS/2 hostent is 4 bytes bigger so the original buffer *might* be too small
+
+      }
     }