Changeset 1940 for trunk/src/wsock32/new/wsock32.cpp

Timestamp:

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

Author:

achimha

Message:

async wsock fixes

File:

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

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,