commit 07439cd2d0a7edf15d8324a9f79f0f21da28ca58
author Alexandre Julliard <julliard@winehq.org> Sat May 25 22:16:12 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat May 25 22:16:12 2002 +0000
tree 7af9ce4edb7711b51d10c67b8bdc4d29c26732e3
parent 6a96749209871156367d3b0a88b780c91569cba9

Removed dependencies on the internals of the region object.
Do not store the region type in the object, it's trivial to determine
from the rectangle count.
Rewrote a few routines to not depend on internal clipping or region
functions.

dlls/ttydrv/wnd.c

diff --git a/dlls/ttydrv/wnd.c b/dlls/ttydrv/wnd.c
index 949f751..ac65fe7 100644
--- a/dlls/ttydrv/wnd.c
+++ b/dlls/ttydrv/wnd.c
@@ -22,7 +22,6 @@
 
 #include "gdi.h"
 #include "ttydrv.h"
-#include "region.h"
 #include "win.h"
 #include "winpos.h"
 #include "wine/debug.h"
@@ -203,6 +202,7 @@
     WND *pWnd;
     int i;
     HWND *list = WIN_ListChildren( parent );
+    HRGN hrgn = 0;
 
     if (!list) return;
     for (i = 0; list[i]; i++)
@@ -217,15 +217,14 @@
             rect.bottom = pWnd->rectWindow.bottom + y;
             if( IntersectRect( &rect, &rect, lpRect ))
             {
-                if(!REGION_UnionRectWithRgn( hrgnClip, &rect ))
-                {
-                    WIN_ReleaseWndPtr( pWnd );
-                    break;
-                }
+                if (!hrgn) hrgn = CreateRectRgnIndirect( &rect );
+                else SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom );
+                CombineRgn( hrgnClip, hrgnClip, hrgn, RGN_OR );
             }
         }
         WIN_ReleaseWndPtr( pWnd );
     }
+    if (hrgn) DeleteObject( hrgn );
     HeapFree( GetProcessHeap(), 0, list );
 }