Author: gschneider Date: Sun Nov 9 12:38:02 2008 New Revision: 37268
URL: http://svn.reactos.org/svn/reactos?rev=37268&view=rev Log: Fix BitBlt MERGEPAINT operation command.
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/tools/gendib/gendib.c
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Nov 9 12:38:02 2008 @@ -173,7 +173,7 @@ 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);
Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=3... ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Sun Nov 9 12:38:02 2008 @@ -147,7 +147,7 @@ { 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 },
-
gschneider＠svn.reactos.org