From 6248b04e6f0813a62ecedb03c07c65cf96197ff5 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Wed, 26 May 2004 18:49:06 +0000
Subject: [PATCH] fixed returning uninitialized variable in NtGdiSelectVisRgn()
 and NtGdiExtSelectClipRgn()

svn path=/trunk/; revision=9498
---
 reactos/subsys/win32k/objects/cliprgn.c |  9 +++++----
 reactos/subsys/win32k/objects/dc.c      | 10 ++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/reactos/subsys/win32k/objects/cliprgn.c b/reactos/subsys/win32k/objects/cliprgn.c
index 5a565624555..71b819e50d6 100644
--- a/reactos/subsys/win32k/objects/cliprgn.c
+++ b/reactos/subsys/win32k/objects/cliprgn.c
@@ -16,10 +16,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cliprgn.c,v 1.39 2004/05/15 20:19:20 weiden Exp $ */
+/* $Id: cliprgn.c,v 1.40 2004/05/26 18:49:06 weiden Exp $ */
 #include <w32k.h>
 
-VOID FASTCALL
+int FASTCALL
 CLIPPING_UpdateGCRegion(DC* Dc)
 {
    PROSRGNDATA CombinedRegion;
@@ -46,7 +46,7 @@ CLIPPING_UpdateGCRegion(DC* Dc)
    ASSERT(Dc->CombinedClip != NULL);
 
    RGNDATA_UnlockRgn(Dc->w.hGCClipRgn);
-   NtGdiOffsetRgn(Dc->w.hGCClipRgn, -Dc->w.DCOrgX, -Dc->w.DCOrgY);
+   return NtGdiOffsetRgn(Dc->w.hGCClipRgn, -Dc->w.DCOrgX, -Dc->w.DCOrgY);
 }
 
 HRGN WINAPI SaveVisRgn(HDC hdc)
@@ -128,6 +128,7 @@ int STDCALL NtGdiExtSelectClipRgn(HDC  hDC,
       {
         NtGdiDeleteObject(dc->w.hClipRgn);
         dc->w.hClipRgn = NULL;
+        retval = NULLREGION;
       }
     }
     else
@@ -162,7 +163,7 @@ int STDCALL NtGdiExtSelectClipRgn(HDC  hDC,
       NtGdiCombineRgn(dc->w.hClipRgn, dc->w.hClipRgn, hrgn, fnMode);
   }
 
-  CLIPPING_UpdateGCRegion(dc);
+  retval = CLIPPING_UpdateGCRegion(dc);
   DC_UnlockDc( hDC );
 
   return retval;
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 360f3f6d63f..eea26dd4325 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.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: dc.c,v 1.135 2004/05/14 16:55:18 navaraf Exp $
+/* $Id: dc.c,v 1.136 2004/05/26 18:49:06 weiden Exp $
  *
  * DC.C - Device context functions
  *
@@ -1756,7 +1756,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
   USHORT Mode;
 
   if(!hDC || !hGDIObj) return NULL;
-
+  
   dc = DC_LockDc(hDC);
   if (NULL == dc)
     {
@@ -1949,6 +1949,12 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
 
     case GDI_OBJECT_TYPE_REGION:
       DC_UnlockDc (hDC);
+      /*
+       * The return value is one of the following values:
+       *  SIMPLEREGION
+       *  COMPLEXREGION
+       *  NULLREGION
+       */
       return (HGDIOBJ) NtGdiSelectClipRgn(hDC, (HRGN) hGDIObj);
 
     default: