Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix a region leak

Browse source 
- unlock bitmap

svn path=/trunk/; revision=26921
This commit is contained in:
Timo Kreuzer 2007-05-27 13:21:44 +00:00
parent 6e719efbe9
commit e4925bf539
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/subsystems/win32/win32k/objects/region.c
View file

@ -2531,16 +2531,18 @@ NtGdiPaintRgn(HDC hDC,
if( !dc )
return FALSE;
if(!(tmpVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0))){
DC_UnlockDc( dc );
return FALSE;
if(!(tmpVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0)))
{
DC_UnlockDc( dc );
return FALSE;
}
/* ei enable later
// Transform region into device co-ords
if(!REGION_LPTODP(hDC, tmpVisRgn, hRgn) || NtGdiOffsetRgn(tmpVisRgn, dc->w.DCOrgX, dc->w.DCOrgY) == ERROR) {
if(!REGION_LPTODP(hDC, tmpVisRgn, hRgn) || NtGdiOffsetRgn(tmpVisRgn, dc->w.DCOrgX, dc->w.DCOrgY) == ERROR)
{
NtGdiDeleteObject( tmpVisRgn );
DC_UnlockDc( dc );
DC_UnlockDc( dc );
return FALSE;
}
*/
@ -2552,12 +2554,14 @@ NtGdiPaintRgn(HDC hDC,
visrgn = RGNDATA_LockRgn(hRgn);
if (visrgn == NULL)
{
DC_UnlockDc( dc );
NtGdiDeleteObject( tmpVisRgn );
DC_UnlockDc( dc );
return FALSE;
}
ClipRegion = IntEngCreateClipRegion (
visrgn->rdh.nCount, (PRECTL)visrgn->Buffer, (PRECTL)&visrgn->rdh.rcBound );
ClipRegion = IntEngCreateClipRegion(visrgn->rdh.nCount,
(PRECTL)visrgn->Buffer,
(PRECTL)&visrgn->rdh.rcBound );
ASSERT( ClipRegion );
pBrush = BRUSHOBJ_LockBrush(dc->w.hBrush);
ASSERT(pBrush);
@ -2569,13 +2573,15 @@ NtGdiPaintRgn(HDC hDC,
/* FIXME - Handle BitmapObj == NULL !!!! */
bRet = IntEngPaint(&BitmapObj->SurfObj,
ClipRegion,
&BrushInst.BrushObject,
&BrushOrigin,
0xFFFF);//FIXME:don't know what to put here
ClipRegion,
&BrushInst.BrushObject,
&BrushOrigin,
0xFFFF);//FIXME:don't know what to put here
BITMAPOBJ_UnlockBitmap(BitmapObj);
BRUSHOBJ_UnlockBrush(pBrush);
RGNDATA_UnlockRgn( visrgn );
NtGdiDeleteObject( tmpVisRgn );
// Fill the region
DC_UnlockDc( dc );