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 
- Set the number of mapped colors depending on the usage parameter
- Use pure PALETTERGB color values when no palette is selected
- Fixes true color issue mentioned in r44712

svn path=/trunk/; revision=44769
This commit is contained in:
Gregor Schneider 2009-12-27 15:08:41 +00:00
parent 5e86753986
commit 8600c8e72b
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -667,7 +667,7 @@ VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
case 0x10: /* DIBINDEX */
if (IntGetDIBColorTable(hDC, LOWORD(*Color), 1, &quad) == 1)
{
*Color = RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue);
*Color = RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue);
}
else
{
@ -677,10 +677,16 @@ VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
break;
case 0x02: /* PALETTERGB */
pdc = DC_LockDc(hDC);
index = NtGdiGetNearestPaletteIndex(pdc->dclevel.hpal, *Color);
if (IntGetPaletteEntries(pdc->dclevel.hpal, index, 1, &palEntry) == 1)
if (pdc->dclevel.hpal != NtGdiGetStockObject(DEFAULT_PALETTE))
{
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
index = NtGdiGetNearestPaletteIndex(pdc->dclevel.hpal, *Color);
IntGetPaletteEntries(pdc->dclevel.hpal, index, 1, &palEntry);
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
}
else
{
/* Use the pure color */
*Color = *Color & 0x00FFFFFF;
}
DC_UnlockDc(pdc);
break;
@ -688,7 +694,7 @@ VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
pdc = DC_LockDc(hDC);
if (IntGetPaletteEntries(pdc->dclevel.hpal, LOWORD(*Color), 1, &palEntry) == 1)
{
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
}
DC_UnlockDc(pdc);
break;

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

@ -1442,14 +1442,15 @@ DIB_CreateDIBSection(
if (usage == DIB_PAL_COLORS)
{
lpRGB = DIB_MapPaletteColors(dc, bmi);
ColorCount = bi->biClrUsed;
if (ColorCount == 0)
{
ColorCount = 1 << bi->biBitCount;
}
}
else
{
lpRGB = bmi->bmiColors;
}
ColorCount = bi->biClrUsed;
if (ColorCount == 0)
{
ColorCount = 1 << bi->biBitCount;
}