From b06db1f05ed6a06cf407a19cd20ab2bac4d23ee6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Fri, 6 Aug 2010 14:55:44 +0000 Subject: [PATCH 1/1] [WIN32K, GENDIB] - Did you know that we should ignore alpha channel of pattern in ROPs? You didn't, I didn't, now we do. [WIN32K] - Use BGR palette as default for 24 and 32 bpp bitmaps. svn path=/branches/reactos-yarotows/; revision=48470 --- subsystems/win32/win32k/dib/dib.c | 3 +++ subsystems/win32/win32k/objects/palette.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/subsystems/win32/win32k/dib/dib.c b/subsystems/win32/win32k/dib/dib.c index 30591d3d27d..5036043321d 100644 --- a/subsystems/win32/win32k/dib/dib.c +++ b/subsystems/win32/win32k/dib/dib.c @@ -151,6 +151,9 @@ static const ULONG ExpandDest[16] = 0xF0F0F0F0 /* 1111 */, }; + /* Ignore alpha channel in Pattern */ + Pattern &= 0x00ffffff ; + /* Optimized code for the various named rop codes. */ switch (Rop) { diff --git a/subsystems/win32/win32k/objects/palette.c b/subsystems/win32/win32k/objects/palette.c index 90870864727..78964576bfa 100644 --- a/subsystems/win32/win32k/objects/palette.c +++ b/subsystems/win32/win32k/objects/palette.c @@ -124,8 +124,8 @@ HPALETTE FASTCALL PALETTE_Init(VOID) appalSurfaceDefault[BMF_4BPP] = gppalDefault; appalSurfaceDefault[BMF_8BPP] = gppalDefault; appalSurfaceDefault[BMF_16BPP] = &gpalRGB565; - appalSurfaceDefault[BMF_24BPP] = &gpalRGB; - appalSurfaceDefault[BMF_32BPP] = &gpalRGB; + appalSurfaceDefault[BMF_24BPP] = &gpalBGR; + appalSurfaceDefault[BMF_32BPP] = &gpalBGR; appalSurfaceDefault[BMF_4RLE] = gppalDefault; appalSurfaceDefault[BMF_8RLE] = gppalDefault; appalSurfaceDefault[BMF_JPEG] = &gpalRGB; -- 2.17.1