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

[WIN32K]

Browse source 
Fix ROP2 value coming from user mode before using it.

svn path=/trunk/; revision=66225
This commit is contained in:
Timo Kreuzer 2015-02-11 21:32:54 +00:00
parent cc61579cf1
commit a9a2c6971f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/gdi/ntgdi/bitblt.c
View file

@ -1150,7 +1150,7 @@ IntGdiFillRgn(
&prgnClip->rdh.rcBound );
/* Get the FG rop and create a MIX based on the BK mode */
rop2Fg = pdc->pdcattr->jROP2;
rop2Fg = FIXUP_ROP2(pdc->pdcattr->jROP2);
mix = rop2Fg | (pdc->pdcattr->jBkMode == OPAQUE ? rop2Fg : R2_NOP) << 8;
/* Prepare DC for blit */

3
reactos/win32ss/gdi/ntgdi/intgdi.h
View file

@ -5,6 +5,9 @@
#define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop))
#define ROP_TO_ROP4(Rop) ((Rop) >> 16)
/* The range of valid ROP2 values is 1 .. 16 */
#define FIXUP_ROP2(rop2) ((((rop2) - 1) & 0xF) + 1)
/* Brush functions */
extern HDC hSystemBM;