[ros-diffs] [tkreuzer] 65931: [WIN32K] "unfix" ROP_TO_ROP4, it was correct before, but the used ROP in NtGdiInvertRgn was not correct. Fixes display of shortcuts.

Author: tkreuzer
Date: Thu Jan  1 15:14:45 2015
New Revision: 65931

URL: http://svn.reactos.org/svn/reactos?rev=65931&view=rev
Log:
[WIN32K]
"unfix" ROP_TO_ROP4, it was correct before, but the used ROP in NtGdiInvertRgn
was not correct. Fixes display of shortcuts.

Modified:
    trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
    trunk/reactos/win32ss/gdi/ntgdi/intgdi.h

Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c	[iso-8859-1] Thu Jan  1 15:14:45 2015
@@ -1319,7 +1319,7 @@
                               prgn,
                               NULL, // pbo
                               NULL, // pptlBrush,
-                              ROP_TO_ROP4(DSTINVERT));
+                              ROP4_DSTINVERT);
 
     /* Unlock the region and DC and return the result */
     REGION_UnlockRgn(prgn);

Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h	[iso-8859-1] Thu Jan  1 15:14:45 2015
@@ -3,7 +3,7 @@
 #define ROP_USES_SOURCE(Rop)  (((((Rop) & 0xCC0000) >> 2) != ((Rop) &
0x330000)) || ((((Rop) & 0xCC000000) >> 2) != ((Rop) & 0x33000000)))
 #define ROP_USES_MASK(Rop)    (((Rop) & 0xFF000000) != (((Rop) & 0xff0000)
<< 8))
 #define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop))
-#define ROP_TO_ROP4(Rop) (((Rop) >> 8) & 0xFF00) | ((Rop) >> 16)
+#define ROP_TO_ROP4(Rop) ((Rop) >> 16)
 
 /* Brush functions */