Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 17:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[win32k]

Browse source 
- Create DIB section palettes with the number of colors mapped from the logical palette
- Validate logical palette access, set to black for invalid indices
- gdi32:palette test now succeeds

svn path=/trunk/; revision=44768
This commit is contained in:
Gregor Schneider 2009-12-27 13:02:19 +00:00
parent edd63ea0b7
commit 5e86753986
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -1358,6 +1358,7 @@ DIB_CreateDIBSection(
RGBQUAD *lpRGB;
HANDLE hSecure;
DWORD dsBitfields[3] = {0};
ULONG ColorCount;
DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n",
bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount,
@ -1439,9 +1440,18 @@ DIB_CreateDIBSection(
hSecure = (HANDLE)0x1; // HACK OF UNIMPLEMENTED KERNEL STUFF !!!!
if (usage == DIB_PAL_COLORS)
{
lpRGB = DIB_MapPaletteColors(dc, bmi);
}
else
{
lpRGB = bmi->bmiColors;
}
ColorCount = bi->biClrUsed;
if (ColorCount == 0)
{
ColorCount = 1 << bi->biBitCount;
}
/* Set dsBitfields values */
if (usage == DIB_PAL_COLORS || bi->biBitCount <= 8)
@ -1528,12 +1538,16 @@ DIB_CreateDIBSection(
bmp->biClrImportant = bi->biClrImportant;
if (bi->biClrUsed != 0)
bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(bi->biClrUsed, lpRGB);
{
bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(ColorCount, lpRGB);
}
else
{
bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL,
dsBitfields[0],
dsBitfields[1],
dsBitfields[2]);
}
// Clean up in case of errors
if (!res || !bmp || !bm.bmBits)
@ -1671,9 +1685,18 @@ DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
for (i = 0; i < nNumColors; i++)
{
lpRGB[i].rgbRed = palGDI->IndexedColors[*lpIndex].peRed;
lpRGB[i].rgbGreen = palGDI->IndexedColors[*lpIndex].peGreen;
lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue;
if (*lpIndex < palGDI->NumColors)
{
lpRGB[i].rgbRed = palGDI->IndexedColors[*lpIndex].peRed;
lpRGB[i].rgbGreen = palGDI->IndexedColors[*lpIndex].peGreen;
lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue;
}
else
{
lpRGB[i].rgbRed = 0;
lpRGB[i].rgbGreen = 0;
lpRGB[i].rgbBlue = 0;
}
lpRGB[i].rgbReserved = 0;
lpIndex++;
}