[ros-diffs] [rharabien] 52343: [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

[rharabien at svn.reactos.org]

Author: rharabien
Date: Sat Jun 18 14:55:03 2011
New Revision: 52343

URL: http://svn.reactos.org/svn/reactos?rev=52343&view=rev
Log:
[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

Modified:
    trunk/reactos/CREDITS
    trunk/reactos/dll/win32/shell32/authors.c
    trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c

Modified: trunk/reactos/CREDITS
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=52343&r1=52342&r2=52343&view=diff
==============================================================================
--- trunk/reactos/CREDITS [iso-8859-1] (original)
+++ trunk/reactos/CREDITS [iso-8859-1] Sat Jun 18 14:55:03 2011
@@ -58,6 +58,7 @@
 Peter Ward <dralnix at gmail.com>
 Pierre Schweitzer <pschweitzer at reactos.org>
 Phillip Susi <phreak at iag.net>
+Rafal Harabien <rafalh at reactos.org>
 Rex Jolliff <rex at lvcablemodem.com>
 Richard Campbell <betam4x at gmail.com>
 Robert Bergkvist <fragdance at hotmail.com>

Modified: trunk/reactos/dll/win32/shell32/authors.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/authors.c?rev=52343&r1=52342&r2=52343&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/authors.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/authors.c [iso-8859-1] Sat Jun 18 14:55:03 2011
@@ -1,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 };

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c?rev=52343&r1=52342&r2=52343&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Jun 18 14:55:03 2011
@@ -1037,8 +1037,7 @@
                              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 @@
    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;