Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed returning uninitialized variable in NtGdiSelectVisRgn() and NtGdiExtSelectClipRgn()

Browse source 
svn path=/trunk/; revision=9498
This commit is contained in:
Thomas Bluemel 2004-05-26 18:49:06 +00:00
parent 8158fc02d0
commit 6248b04e6f
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/subsys/win32k/objects/cliprgn.c
View file

@ -16,10 +16,10 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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> #include <w32k.h>
VOID FASTCALL int FASTCALL
CLIPPING_UpdateGCRegion(DC* Dc) CLIPPING_UpdateGCRegion(DC* Dc)
{ {
PROSRGNDATA CombinedRegion; PROSRGNDATA CombinedRegion;
@ -46,7 +46,7 @@ CLIPPING_UpdateGCRegion(DC* Dc)
ASSERT(Dc->CombinedClip != NULL); ASSERT(Dc->CombinedClip != NULL);
RGNDATA_UnlockRgn(Dc->w.hGCClipRgn); 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) HRGN WINAPI SaveVisRgn(HDC hdc)
@ -128,6 +128,7 @@ int STDCALL NtGdiExtSelectClipRgn(HDC hDC,
{ {
NtGdiDeleteObject(dc->w.hClipRgn); NtGdiDeleteObject(dc->w.hClipRgn);
dc->w.hClipRgn = NULL; dc->w.hClipRgn = NULL;
retval = NULLREGION;
} }
} }
else else
@ -162,7 +163,7 @@ int STDCALL NtGdiExtSelectClipRgn(HDC hDC,
NtGdiCombineRgn(dc->w.hClipRgn, dc->w.hClipRgn, hrgn, fnMode); NtGdiCombineRgn(dc->w.hClipRgn, dc->w.hClipRgn, hrgn, fnMode);
} }
CLIPPING_UpdateGCRegion(dc); retval = CLIPPING_UpdateGCRegion(dc);
DC_UnlockDc( hDC ); DC_UnlockDc( hDC );
return retval; return retval;

8
reactos/subsys/win32k/objects/dc.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * DC.C - Device context functions
* *
@ -1949,6 +1949,12 @@ NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj)
case GDI_OBJECT_TYPE_REGION: case GDI_OBJECT_TYPE_REGION:
DC_UnlockDc (hDC); DC_UnlockDc (hDC);
/*
* The return value is one of the following values:
* SIMPLEREGION
* COMPLEXREGION
* NULLREGION
*/
return (HGDIOBJ) NtGdiSelectClipRgn(hDC, (HRGN) hGDIObj); return (HGDIOBJ) NtGdiSelectClipRgn(hDC, (HRGN) hGDIObj);
default: default: