From 2d96ec4333425541d9e2085e16cf5a331a942f8a Mon Sep 17 00:00:00 2001
From: Rafal Harabien <rafalh@reactos.org>
Date: Sat, 18 Jun 2011 14:55:03 +0000
Subject: [PATCH] [WIN32K] - Remove commented out lines added in r52332 - clip
 children should not be taken into account here

[SHELL32]
- Use COPYRIGHT_YEAR definition instead of current year

svn path=/trunk/; revision=52343
---
 reactos/CREDITS                                 | 1 +
 reactos/dll/win32/shell32/authors.c             | 4 +++-
 reactos/subsystems/win32/win32k/ntuser/winpos.c | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/reactos/CREDITS b/reactos/CREDITS
index e967d823ad6..51567871763 100644
--- a/reactos/CREDITS
+++ b/reactos/CREDITS
@@ -58,6 +58,7 @@ Paolo Pantaleo <paolopan@freemail.it>
 Peter Ward <dralnix@gmail.com>
 Pierre Schweitzer <pschweitzer@reactos.org>
 Phillip Susi <phreak@iag.net>
+Rafal Harabien <rafalh@reactos.org>
 Rex Jolliff <rex@lvcablemodem.com>
 Richard Campbell <betam4x@gmail.com>
 Robert Bergkvist <fragdance@hotmail.com>
diff --git a/reactos/dll/win32/shell32/authors.c b/reactos/dll/win32/shell32/authors.c
index 1f59bcd06a7..3101d764863 100644
--- a/reactos/dll/win32/shell32/authors.c
+++ b/reactos/dll/win32/shell32/authors.c
@@ -1 +1,3 @@
-const char * const SHELL_Authors[] = { "Copyright 1993-2011 WINE team", "Copyright 1998-2011 ReactOS Team", 0 };
+#include <reactos/version.h>
+
+const char * const SHELL_Authors[] = { "Copyright 1993-" COPYRIGHT_YEAR " WINE team", "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team", 0 };
diff --git a/reactos/subsystems/win32/win32k/ntuser/winpos.c b/reactos/subsystems/win32/win32k/ntuser/winpos.c
index be51ce033cc..eff6d368886 100644
--- a/reactos/subsystems/win32/win32k/ntuser/winpos.c
+++ b/reactos/subsystems/win32/win32k/ntuser/winpos.c
@@ -1037,8 +1037,7 @@ co_WinPosSetWindowPos(
                              SWP_HIDEWINDOW | SWP_FRAMECHANGED)) !=
             (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER))
       {
-         VisBefore = VIS_ComputeVisibleRegion(Window, FALSE,
-                                              FALSE, //(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE,
+         VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, FALSE,
                                               (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE);
          VisRgn = NULL;
 
@@ -1129,8 +1128,7 @@ co_WinPosSetWindowPos(
    if (!(WinPos.flags & SWP_NOREDRAW))
    {
       /* Determine the new visible region */
-      VisAfter = VIS_ComputeVisibleRegion(Window, FALSE,
-                                          FALSE,//(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE,
+      VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE,
                                           (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE);
       VisRgn = NULL;