[WIN32K]

"unfix" ROP_TO_ROP4, it was correct before, but the used ROP in NtGdiInvertRgn was not correct. Fixes display of shortcuts.

svn path=/trunk/; revision=65931

diff --git a/reactos/win32ss/gdi/ntgdi/bitblt.c b/reactos/win32ss/gdi/ntgdi/bitblt.c
index df8c753..32063b3 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/bitblt.c
+++ b/reactos/win32ss/gdi/ntgdi/bitblt.c
@@ -1319,7 +1319,7 @@ NtGdiInvertRgn(
                               prgn,
                               NULL, // pbo
                               NULL, // pptlBrush,
-                              ROP_TO_ROP4(DSTINVERT));
+                              ROP4_DSTINVERT);
 
     /* Unlock the region and DC and return the result */
     REGION_UnlockRgn(prgn);

diff --git a/reactos/win32ss/gdi/ntgdi/intgdi.h b/reactos/win32ss/gdi/ntgdi/intgdi.h
index 81ae460..9ca7e7c 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/intgdi.h
+++ b/reactos/win32ss/gdi/ntgdi/intgdi.h
@@ -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 */