From 52b43f7ae9ef81eeb936870564964c670b60a501 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sat, 23 Sep 2006 15:54:11 +0000 Subject: [PATCH] IntGdiCreateSolidBrush Remove the if table I did. Remove Color = Color & 0xffffff to Color = Color that gave same result and pass equal many wine test. we still have some werid xlate bugs some where, for set/get pixel. I should have remove Color & 0xffffff in frist place. but the code did look right. svn path=/trunk/; revision=24235 --- .../subsystems/win32/win32k/objects/brush.c | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/reactos/subsystems/win32/win32k/objects/brush.c b/reactos/subsystems/win32/win32k/objects/brush.c index 11c28689b83..c004116305d 100644 --- a/reactos/subsystems/win32/win32k/objects/brush.c +++ b/reactos/subsystems/win32/win32k/objects/brush.c @@ -416,26 +416,7 @@ IntGdiCreateSolidBrush( BrushObject->flAttrs |= GDIBRUSH_IS_SOLID; - if (((Color>>24) & 0xff)==0x10) - { - if (Color == 0x10ff0002) - Color = 0xFF; - else if ((Color & 0xff) !=0) - Color = Color & 0xFFFFFF; - else if ((Color & 0xff) ==0x00) - Color = ((Color>>16) & 0x0000ff) | ((Color<<16) & 0xff0000) | (Color & 0x00ff00); - else if ((Color & 0xff) ==0x01) - Color = ((Color>>16) & 0x0000ff) | ((Color<<16) & 0xff0000) | (Color & 0x00ff00); - } - - - if (((Color>>24) & 0xff)==0xff) - { - Color = ((Color>>16) & 0x0000ff) | ((Color<<16) & 0xff0000) | (Color & 0x00ff00); - } - - - BrushObject->BrushAttr.lbColor = Color & 0xFFFFFF; + BrushObject->BrushAttr.lbColor = Color; /* FIXME: Fill in the rest of fields!!! */ BRUSHOBJ_UnlockBrush(BrushObject);