From e7cc4ad2efd4aff71fce1c22de22794829df81c2 Mon Sep 17 00:00:00 2001 From: Ulrich Czekalla Date: Sun, 11 May 2003 02:52:04 +0000 Subject: [PATCH] Return value of ExtSelectClipRgn should consider visible region. --- objects/clipping.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/objects/clipping.c b/objects/clipping.c index 6866cd96ccc..de3d4776760 100644 --- a/objects/clipping.c +++ b/objects/clipping.c @@ -70,6 +70,7 @@ INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn ) INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) { INT retval; + RECT rect; DC * dc = DC_GetDCUpdate( hdc ); if (!dc) return ERROR; @@ -88,7 +89,6 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) { if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); dc->hClipRgn = 0; - retval = SIMPLEREGION; /* Clip region == whole DC */ } else { @@ -107,14 +107,15 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) } if(fnMode == RGN_COPY) - retval = CombineRgn( dc->hClipRgn, hrgn, 0, fnMode ); + CombineRgn( dc->hClipRgn, hrgn, 0, fnMode ); else - retval = CombineRgn( dc->hClipRgn, dc->hClipRgn, hrgn, fnMode); + CombineRgn( dc->hClipRgn, dc->hClipRgn, hrgn, fnMode); } CLIPPING_UpdateGCRegion( dc ); GDI_ReleaseObj( hdc ); - return retval; + + return GetClipBox(hdc, &rect); } /***********************************************************************