Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-05 11:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[win32k]

Browse source 
- Add support for DIBINDEX, PALETTERGB, PALETTEINDEX macros in SetPixel(V)
- Before it did just take every COLORREF as a RGB color, while it could also mean (dib-)palette indices
- Fixes several gdi32 bitmap winetests (depending on bit depth between 2 and ~500), 2 palette tests and some palette drawing issues
- One problem with palette indices remains in true color bit modes (see bitmap test)

svn path=/trunk/; revision=44712
This commit is contained in:
Gregor Schneider 2009-12-22 16:17:44 +00:00
parent 322a77fc09
commit 9212e559dc
1 changed files with 60 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -16,7 +16,6 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* $Id$ */
#include <w32k.h>
@ -656,6 +655,53 @@ NtGdiSetBitmapDimension(
return Ret;
}
VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
{
PDC pdc = NULL;
RGBQUAD quad;
PALETTEENTRY palEntry;
UINT index;
switch (*Color >> 24)
{
case 0x10: /* DIBINDEX */
if (IntGetDIBColorTable(hDC, LOWORD(*Color), 1, &quad) == 1)
{
*Color = RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue);
}
else
{
/* Out of color table bounds - use black */
*Color = RGB(0, 0, 0);
}
break;
case 0x02: /* PALETTERGB */
pdc = DC_LockDc(hDC);
index = NtGdiGetNearestPaletteIndex(pdc->dclevel.hpal, *Color);
if (IntGetPaletteEntries(pdc->dclevel.hpal, index, 1, &palEntry) == 1)
{
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
}
else
{
DPRINT1("no wai!\n");
}
DC_UnlockDc(pdc);
break;
case 0x01: /* PALETTEINDEX */
pdc = DC_LockDc(hDC);
if (IntGetPaletteEntries(pdc->dclevel.hpal, LOWORD(*Color), 1, &palEntry) == 1)
{
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
}
DC_UnlockDc(pdc);
break;
default:
DPRINT("Unsupported color type %d passed\n", *Color >> 24);
break;
}
}
BOOL APIENTRY
GdiSetPixelV(
HDC hDC,
@ -663,22 +709,28 @@ GdiSetPixelV(
INT Y,
COLORREF Color)
{
HBRUSH hbrush = NtGdiCreateSolidBrush(Color, NULL);
HBRUSH hBrush;
HGDIOBJ OldBrush;
if (hbrush == NULL)
return(FALSE);
if ((Color & 0xFF000000) != 0)
{
IntHandleSpecialColorType(hDC, &Color);
}
OldBrush = NtGdiSelectBrush(hDC, hbrush);
hBrush = NtGdiCreateSolidBrush(Color, NULL);
if (hBrush == NULL)
return FALSE;
OldBrush = NtGdiSelectBrush(hDC, hBrush);
if (OldBrush == NULL)
{
GreDeleteObject(hbrush);
return(FALSE);
GreDeleteObject(hBrush);
return FALSE;
}
NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY);
NtGdiSelectBrush(hDC, OldBrush);
GreDeleteObject(hbrush);
GreDeleteObject(hBrush);
return TRUE;
}