[xorg-commit-diffs] xc/programs/Xserver/hw/xwin winmultiwindowwindow.c, 1.1.4.1.2.21, 1.1.4.1.2.22

[Kensuke Matsuzaki]

Committed by: zakki

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv7011

Modified Files:
      Tag: CYGWIN
	winmultiwindowwindow.c 
Log Message:
Reapply the path that fix multi-window mode crashes when there were multiple instances of XWin.exe.


Index: winmultiwindowwindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v
retrieving revision 1.1.4.1.2.21
retrieving revision 1.1.4.1.2.22
diff -u -d -r1.1.4.1.2.21 -r1.1.4.1.2.22
--- a/winmultiwindowwindow.c	26 Mar 2004 03:21:41 -0000	1.1.4.1.2.21
+++ b/winmultiwindowwindow.c	8 Apr 2004 02:53:18 -0000	1.1.4.1.2.22
@@ -766,6 +766,8 @@
   WindowPtr pWinSib = NULL;
   XID vlist[2];
   static Bool fRestacking = FALSE; /* Avoid recusive calls to this function */
+  DWORD dwCurrentProcessID = GetCurrentProcessId ();
+  DWORD dwWindowProcessID = 0;
 
 #if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
   ErrorF ("winReorderWindowsMultiWindow\n");
@@ -787,7 +789,10 @@
 	hwnd;
 	hwnd = GetNextWindow (hwnd, GW_HWNDNEXT) )
     {
+      GetWindowThreadProcessId (hwnd, &dwWindowProcessID);
+
       if ( GetProp (hwnd, WIN_WINDOW_PROP)
+	   && (dwWindowProcessID == dwCurrentProcessID)
 	   && !IsIconic (hwnd) ) /* ignore minimized windows */
 	{
 	  pWinSib = pWin;