Fix BitBlt MERGEPAINT operation command.

svn path=/trunk/; revision=37268
This commit is contained in:
Gregor Schneider 2008-11-09 18:38:02 +00:00
parent c5a57ba3d6
commit 8a50f7448d
2 changed files with 2 additions and 2 deletions

View file

@ -173,7 +173,7 @@ DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern)
case ROP3_TO_ROP4(PATINVERT): return(Dest ^ Pattern);
case ROP3_TO_ROP4(SRCINVERT): return(Dest ^ Source);
case ROP3_TO_ROP4(SRCAND): return(Dest & Source);
case ROP3_TO_ROP4(MERGEPAINT): return(Dest & (~Source));
case ROP3_TO_ROP4(MERGEPAINT): return(Dest | (~Source));
case ROP3_TO_ROP4(SRCPAINT): return(Dest | Source);
case ROP3_TO_ROP4(MERGECOPY): return(Source & Pattern);
case ROP3_TO_ROP4(SRCCOPY): return(Source);

View file

@ -147,7 +147,7 @@ FindRopInfo(unsigned RopCode)
{ ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 },
{ ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 },
{ ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 },
{ ROPCODE_MERGEPAINT, "MERGEPAINT", "D & (~S)", 1, 1, 0 },
{ ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 },
{ ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 },
{ ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 },
{ ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 },