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

[WIN32K]

Browse source 
- in 1bpp bitmaps, 0 means white. Take that into in SetDIBits
  - fix a fixme in XLATEOBJ implementation
  - remove useless field from ROS_DCINFO
Fixes fox audio player GUI :-) Enjoy!

svn path=/trunk/; revision=50949
This commit is contained in:
Jérôme Gardou 2011-03-02 00:15:57 +00:00
parent c77754b87d
commit 5e5532d3ef
4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsystems/win32/win32k/eng/xlate.c
View file

@ -418,9 +418,9 @@ EXLATEOBJ_vInitialize(
else if (ppalSrc->flFlags & PAL_BITFIELDS) else if (ppalSrc->flFlags & PAL_BITFIELDS)
{ {
PALETTE_vGetBitMasks(ppalSrc, &pexlo->ulRedMask); PALETTE_vGetBitMasks(ppalSrc, &pexlo->ulRedMask);
pexlo->ulRedShift = CalculateShift(0xFF, pexlo->ulRedMask); pexlo->ulRedShift = CalculateShift(RGB(0xFF,0,0), pexlo->ulRedMask);
pexlo->ulGreenShift = CalculateShift(0xFF00, pexlo->ulGreenMask); pexlo->ulGreenShift = CalculateShift(RGB(0,0xFF,0), pexlo->ulGreenMask);
pexlo->ulBlueShift = CalculateShift(0xFF0000, pexlo->ulBlueMask); pexlo->ulBlueShift = CalculateShift(RGB(0,0,0xFF), pexlo->ulBlueMask);
pexlo->aulXlate[0] = EXLATEOBJ_iXlateShiftAndMask(pexlo, crSrcBackColor); pexlo->aulXlate[0] = EXLATEOBJ_iXlateShiftAndMask(pexlo, crSrcBackColor);
} }
@ -480,18 +480,12 @@ EXLATEOBJ_vInitialize(
} }
else else
{ {
// FIXME: use PALETTE_ulGetNearest
EXLATEOBJ exloTmp = *pexlo;
exloTmp.xlo.pulXlate = exloTmp.aulXlate;
pexlo->xlo.flXlate |= XO_TABLE;
for (i = 0; i < pexlo->xlo.cEntries; i++) for (i = 0; i < pexlo->xlo.cEntries; i++)
{ {
ulColor = RGB(ppalSrc->IndexedColors[i].peRed, ulColor = RGB(ppalSrc->IndexedColors[i].peRed,
ppalSrc->IndexedColors[i].peGreen, ppalSrc->IndexedColors[i].peGreen,
ppalSrc->IndexedColors[i].peBlue); ppalSrc->IndexedColors[i].peBlue);
pexlo->xlo.pulXlate[i] = pexlo->xlo.pulXlate[i] = PALETTE_ulGetNearestBitFieldsIndex(ppalDst, ulColor);
EXLATEOBJ_iXlateShiftAndMask(&exloTmp, ulColor);
} }
} }
} }

3
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -55,9 +55,6 @@ typedef struct _ROS_DC_INFO
HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */
CLIPOBJ *CombinedClip; CLIPOBJ *CombinedClip;
UNICODE_STRING DriverName;
} ROS_DC_INFO; } ROS_DC_INFO;
typedef struct _DCLEVEL typedef struct _DCLEVEL

1
reactos/subsystems/win32/win32k/include/palette.h
View file

@ -81,6 +81,7 @@ INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color);
INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer);
ULONG NTAPI PALETTE_ulGetNearestPaletteIndex(PALETTE* ppal, ULONG iColor); ULONG NTAPI PALETTE_ulGetNearestPaletteIndex(PALETTE* ppal, ULONG iColor);
ULONG NTAPI PALETTE_ulGetNearestIndex(PALETTE* ppal, ULONG iColor); ULONG NTAPI PALETTE_ulGetNearestIndex(PALETTE* ppal, ULONG iColor);
ULONG NTAPI PALETTE_ulGetNearestBitFieldsIndex(PALETTE* ppal, ULONG ulColor);
VOID NTAPI PALETTE_vGetBitMasks(PPALETTE ppal, PULONG pulColors); VOID NTAPI PALETTE_vGetBitMasks(PPALETTE ppal, PULONG pulColors);
PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID);

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

@ -295,7 +295,8 @@ IntSetDIBits(
ptSrc.x = 0; ptSrc.x = 0;
ptSrc.y = 0; ptSrc.y = 0;
EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, psurfDst->ppal, 0, 0, 0); /* 1bpp bitmaps have 0 for white, 1 for black */
EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, psurfDst->ppal, 0xFFFFFF, 0, 0);
result = IntEngCopyBits(&psurfDst->SurfObj, result = IntEngCopyBits(&psurfDst->SurfObj,
&psurfSrc->SurfObj, &psurfSrc->SurfObj,