From 6fec87f961d89e3d24efabccde53fbc4537ca1fe Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Tue, 13 Jan 2004 17:13:48 +0000 Subject: [PATCH] Removed some nonsense code that has no effect. svn path=/trunk/; revision=7605 --- reactos/subsys/win32k/ntuser/painting.c | 6 +---- reactos/subsys/win32k/ntuser/windc.c | 31 +------------------------ 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c index 09d5c810033..81dde71dc92 100644 --- a/reactos/subsys/win32k/ntuser/painting.c +++ b/reactos/subsys/win32k/ntuser/painting.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: painting.c,v 1.60 2004/01/12 21:24:20 navaraf Exp $ + * $Id: painting.c,v 1.61 2004/01/13 17:13:48 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -421,15 +421,11 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags, if (Window->UpdateRegion != NULL) { - RECT TempRect; - - UnsafeIntGetRgnBox(Window->UpdateRegion, &TempRect); NtGdiCombineRgn(hRgnTemp, Child->UpdateRegion, 0, RGN_COPY); NtGdiCombineRgn(hRgnTemp, hRgnTemp, Child->NCUpdateRegion, RGN_OR); NtGdiOffsetRgn(hRgnTemp, Child->WindowRect.left - Window->WindowRect.left, Child->WindowRect.top - Window->WindowRect.top); - UnsafeIntGetRgnBox(hRgnTemp, &TempRect); if (NtGdiCombineRgn(Window->UpdateRegion, Window->UpdateRegion, hRgnTemp, RGN_DIFF) == NULLREGION) { diff --git a/reactos/subsys/win32k/ntuser/windc.c b/reactos/subsys/win32k/ntuser/windc.c index 864f47927ac..38330055ff8 100644 --- a/reactos/subsys/win32k/ntuser/windc.c +++ b/reactos/subsys/win32k/ntuser/windc.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: windc.c,v 1.49 2004/01/12 00:07:34 navaraf Exp $ +/* $Id: windc.c,v 1.50 2004/01/13 17:13:48 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -61,9 +61,7 @@ HRGN STDCALL DceGetVisRgn(HWND hWnd, ULONG Flags, HWND hWndChild, ULONG CFlags) { PWINDOW_OBJECT Window; - PWINDOW_OBJECT Child; HRGN VisRgn; - HRGN VisChild; Window = IntGetWindowObject(hWnd); @@ -76,33 +74,6 @@ DceGetVisRgn(HWND hWnd, ULONG Flags, HWND hWndChild, ULONG CFlags) 0 == (Flags & DCX_WINDOW), 0 != (Flags & DCX_CLIPCHILDREN), 0 != (Flags & DCX_CLIPSIBLINGS)); - if (NULL != hWndChild && 0 != (CFlags & DCX_CLIPCHILDREN)) - { - NtGdiOffsetRgn(VisRgn, - Window->WindowRect.left, - Window->WindowRect.top); - /* We need to filter out the child windows of hWndChild */ - Child = IntGetWindowObject(hWndChild); - if (NULL != Child) - { - if (Child->FirstChild) - { - /* Compute the visible region of the child */ - VisChild = VIS_ComputeVisibleRegion(PsGetWin32Thread()->Desktop, - Child, FALSE, TRUE, FALSE); - NtGdiOffsetRgn(VisChild, - Child->WindowRect.left, - Child->WindowRect.top); - - /* Clip the childs children */ - NtGdiCombineRgn(VisRgn, VisRgn, VisChild, RGN_DIFF); - } - IntReleaseWindowObject(Child); - } - NtGdiOffsetRgn(VisRgn, - -Window->WindowRect.left, - -Window->WindowRect.top); - } IntReleaseWindowObject(Window);