Changeset 1908 for trunk/src

Timestamp:

Dec 1, 1999, 2:13:57 AM (26 years ago)

Author:

phaller

Message:

Fix: relay window implemented

Location:

trunk/src/wsock32/new

Files:

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

trunk/src/wsock32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.4 1999-11-29 22:31:50 phaller Exp $
+# $Id: makefile,v 1.5 1999-12-01 01:10:54 phaller Exp $
 
 #
@@ -21 +21 @@
 TARGET = wsock32
 
-OBJS =  wsock32.obj initterm.obj unknown.obj
+OBJS =  wsock32.obj initterm.obj unknown.obj relaywin.obj
 
 all: $(TARGET).dll $(TARGET).lib
@@ -43 +43 @@
 unknown.obj: unknown.cpp
 initterm.obj: initterm.cpp
+relaywin.obj: relaywin.cpp
 
 

trunk/src/wsock32/new/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.5 1999-11-29 22:23:07 phaller Exp $ */
+/* $Id: wsock32.cpp,v 1.6 1999-12-01 01:10:55 phaller Exp $ */
 
 /*
@@ -46 +46 @@
 
 #include "wsock32.h"
+#include "relaywin.h"
 
 
@@ -590 +591 @@
               int *,fromlen)
 {
-  
+
   return(recvfrom(s,
                 buf,
@@ -795 +796 @@
   xx = gethostbyaddr((char *)addr,len,type);
   //PH: we assume PMWSOCK sets WSASetLastError correctly!
-  
+
   if(xx == NULL)
      return (WHOSTENT *)NULL;
@@ -834 +835 @@
   xx = gethostbyname((char *)name);
   //PH: we assume PMWSOCK sets WSASetLastError correctly!
-  
+
   if(xx == NULL)
     return (WHOSTENT *)NULL;
@@ -1341 +1342 @@
               long,lEvent)
 {
-  int rc;
-  int iError;
-  HWND hwndOS2;
-  
+  int   rc;
+  int   iError;
+  HWND  hwndOS2 = Win32ToOS2Handle(hWnd);
+  ULONG ulNewID;
+
+  static HWND hwndRelay; // handle to our relay window
+
+  if (hwndRelay == NULL) // already initialized ?
+    hwndRelay = RelayInitialize(hwndOS2);
+
   /* @@@PH: our source window doesn't seem to have an anchor block.
             Docs suggest we've missed to call WinInitialize on the
             caller thread.
-            
+
             Cause however is the Open32 handle is (of course!) invalid
             in plain PM Window Manager! -> use DAPWSOCK
-            
+
             Unfortunately, DAPWSOCK calls WinQueryAnchorBlock(hOpen32), too.
             So, we're stuck until I resolve hWnd to it's valid PM
             counterpart.
+
+            new problem: we've ultimately got to use PostMessageA instead
+            anything else. => create invisible msg relay window:
+            - hMsg = registerMessage(hWnd, wMsg)
+            - call WSAAsyncSelect with object window handle
+            - overwrite hWnd relay for "same handles"
    */
-  
-  hwndOS2 = Win32ToOS2Handle(hWnd);
-  
+
+  // add event to list or remove any list entry in case of WSAAsyncSelect(hwnd,0,0)
+  if ( (wMsg == 0) && (lEvent == 0) )
+  {
+    // remove entry from list
+    RelayFreeByHwnd(hWnd);
+  }
+  else
+    // add entry to list
+    ulNewID = RelayAlloc(hWnd, wMsg);
+
   rc = WSAAsyncSelect(s,
-                      hwndOS2,
-                      wMsg,
+                      hwndRelay,
+                      ulNewID,
                       lEvent);