[ros-diffs] [gschneider] 44654: [win32k] - Simplify GdiExtSelectClipRgn slightly - Add missing line break

[gschneider at svn.reactos.org]

Author: gschneider
Date: Sat Dec 19 14:08:53 2009
New Revision: 44654

URL: http://svn.reactos.org/svn/reactos?rev=44654&view=rev
Log:
[win32k]
- Simplify GdiExtSelectClipRgn slightly
- Add missing line break

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c
    trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c?rev=44654&r1=44653&r2=44654&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Sat Dec 19 14:08:53 2009
@@ -729,7 +729,7 @@
    if(!SBID_IS_VALID(Obj))
    {
       SetLastWin32Error(ERROR_INVALID_PARAMETER);
-      DPRINT1("Trying to set scrollinfo for unknown scrollbar type %d", Obj);
+      DPRINT1("Trying to set scrollinfo for unknown scrollbar type %d\n", Obj);
       RETURN( FALSE);
    }
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c?rev=44654&r1=44653&r2=44654&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Sat Dec 19 14:08:53 2009
@@ -96,10 +96,9 @@
 
 
 int FASTCALL GdiExtSelectClipRgn(PDC dc,
-                              HRGN hrgn,
-                             int fnMode)
-{
-  int retval;
+                                 HRGN hrgn,
+                                 int fnMode)
+{
   //  dc->fs &= ~DC_FLAG_DIRTY_RAO;
 
   if (!hrgn)
@@ -110,7 +109,6 @@
       {
         GreDeleteObject(dc->rosdc.hClipRgn);
         dc->rosdc.hClipRgn = NULL;
-        retval = NULLREGION;
       }
     }
     else
@@ -144,8 +142,7 @@
       NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->rosdc.hClipRgn, hrgn, fnMode);
   }
 
-  retval = CLIPPING_UpdateGCRegion(dc);
-  return retval;
+  return CLIPPING_UpdateGCRegion(dc);
 }