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

replaced UnsafeIntCreateRectRgnIndirect() and UnsafeIntUnionRectWithRgn() with macros to directly call the appropriate function

Browse source 
svn path=/trunk/; revision=9414
This commit is contained in:
Thomas Bluemel 2004-05-16 09:51:27 +00:00
parent 607ca343e7
commit 3538785e6a
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/win32k/eng/transblt.c
View file

@ -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: transblt.c,v 1.18 2004/05/10 17:07:17 weiden Exp $
/* $Id: transblt.c,v 1.19 2004/05/16 09:51:26 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -268,8 +268,10 @@ IntEngTransparentBlt(SURFOBJ *Dest,
if(!Ret)
{
IntLockGDIDriver(SurfGDIDest);
Ret = EngTransparentBlt(Dest, Source, Clip, ColorTranslation, &OutputRect,
SourceRect, iTransColor, Reserved);
IntUnLockGDIDriver(SurfGDIDest);
}
if(Ret)

10
reactos/subsys/win32k/include/intgdi.h
View file

@ -102,12 +102,16 @@ IntGdiGetClipBox(HDC hDC,
LPRECT rc);
HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt);
HRGN FASTCALL UnsafeIntCreateRectRgnIndirect(CONST PRECT rc);
void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn);
INT FASTCALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect);
VOID FASTCALL UnsafeIntUnionRectWithRgn(PROSRGNDATA RgnDest, CONST PRECT Rect);
BOOL FASTCALL UnsafeIntRectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc);
#define UnsafeIntCreateRectRgnIndirect(prc) \
NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom)
#define UnsafeIntUnionRectWithRgn(rgndest, prc) \
REGION_UnionRectWithRegion((prc), (rgndest))
/* DC functions */
BOOL FASTCALL

16
reactos/subsys/win32k/objects/region.c
View file

@ -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: region.c,v 1.52 2004/05/14 16:56:48 navaraf Exp $ */
/* $Id: region.c,v 1.53 2004/05/16 09:51:27 weiden Exp $ */
#include <w32k.h>
#include <win32k/float.h>
@ -1387,7 +1387,7 @@ static void FASTCALL REGION_XorRegion(ROSRGNDATA *dr, ROSRGNDATA *sra,
/*!
* Adds a rectangle to a REGION
*/
static void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
{
ROSRGNDATA region;
@ -1742,12 +1742,6 @@ NtGdiCreateRectRgnIndirect(CONST PRECT rc)
return(UnsafeIntCreateRectRgnIndirect(&SafeRc));
}
HRGN FASTCALL
UnsafeIntCreateRectRgnIndirect(CONST PRECT rc)
{
return(NtGdiCreateRectRgn(rc->left, rc->top, rc->right, rc->bottom));
}
HRGN
STDCALL
NtGdiCreateRoundRectRgn(INT left, INT top, INT right, INT bottom,
@ -2258,12 +2252,6 @@ NtGdiSetRectRgn(HRGN hRgn,
return TRUE;
}
VOID FASTCALL
UnsafeIntUnionRectWithRgn(PROSRGNDATA RgnDest, CONST PRECT Rect)
{
REGION_UnionRectWithRegion(Rect, RgnDest);
}
HRGN STDCALL
NtGdiUnionRectWithRgn(HRGN hDest, CONST PRECT UnsafeRect)
{