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

[WIN32K]

Browse source 
- Always store alpha-aware cursors in a 32bpp RGB surface.
CORE-8695

svn path=/trunk/; revision=64992
This commit is contained in:
Jérôme Gardou 2014-10-25 18:11:31 +00:00
parent 5211c92255
commit 35e122d62f
2 changed files with 53 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
reactos/win32ss/gdi/eng/mouse.c
View file

@ -263,11 +263,9 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } }; BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } };
EXLATEOBJ exlo; EXLATEOBJ exlo;
EXLATEOBJ_vInitialize(&exlo, EXLATEOBJ_vInitialize(&exlo,
pgp->psurfColor->ppal, &gpalRGB,
ppdev->ppalSurf, ppdev->ppalSurf,
0xFFFFFFFF, 0, 0, 0);
0xFFFFFFFF,
0);
IntEngAlphaBlend(psoDest, IntEngAlphaBlend(psoDest,
&pgp->psurfColor->SurfObj, &pgp->psurfColor->SurfObj,
NULL, NULL,
@ -372,17 +370,43 @@ EngSetPointerShape(
} }
if (psoColor) if (psoColor)
{
if (fl & SPS_ALPHA)
{
/* Always store the alpha cursor in RGB. */
EXLATEOBJ exloSrcRGB;
PEXLATEOBJ pexlo;
pexlo = CONTAINING_RECORD(pxlo, EXLATEOBJ, xlo);
EXLATEOBJ_vInitialize(&exloSrcRGB, pexlo->ppalSrc, &gpalRGB, 0, 0, 0);
hbmColor = EngCreateBitmap(psoColor->sizlBitmap,
WIDTH_BYTES_ALIGN32(sizel.cx, 32),
BMF_32BPP,
BMF_TOPDOWN | BMF_NOZEROINIT,
NULL);
psurfColor = SURFACE_ShareLockSurface(hbmColor);
if (!psurfColor) goto failure;
/* Now copy the given bitmap. */
rectl.bottom = psoColor->sizlBitmap.cy;
IntEngCopyBits(&psurfColor->SurfObj,
psoColor,
NULL,
&exloSrcRGB.xlo,
&rectl,
(POINTL*)&rectl);
EXLATEOBJ_vCleanup(&exloSrcRGB);
}
else
{ {
/* Color bitmap must have the same format as the dest surface */ /* Color bitmap must have the same format as the dest surface */
if (psoColor->iBitmapFormat != pso->iBitmapFormat) if (psoColor->iBitmapFormat != pso->iBitmapFormat)
{
/* It's OK if we have an alpha bitmap */
if(!(fl & SPS_ALPHA))
{ {
DPRINT1("Screen surface and cursor color bitmap format don't match!.\n"); DPRINT1("Screen surface and cursor color bitmap format don't match!.\n");
goto failure; goto failure;
} }
}
/* Create a bitmap to copy the color bitmap to */ /* Create a bitmap to copy the color bitmap to */
hbmColor = EngCreateBitmap(psoColor->sizlBitmap, hbmColor = EngCreateBitmap(psoColor->sizlBitmap,
@ -393,7 +417,7 @@ EngSetPointerShape(
psurfColor = SURFACE_ShareLockSurface(hbmColor); psurfColor = SURFACE_ShareLockSurface(hbmColor);
if (!psurfColor) goto failure; if (!psurfColor) goto failure;
/* Now copy the given bitmap */ /* Now copy the given bitmap. */
rectl.bottom = psoColor->sizlBitmap.cy; rectl.bottom = psoColor->sizlBitmap.cy;
IntEngCopyBits(&psurfColor->SurfObj, IntEngCopyBits(&psurfColor->SurfObj,
psoColor, psoColor,
@ -403,12 +427,16 @@ EngSetPointerShape(
(POINTL*)&rectl); (POINTL*)&rectl);
} }
}
/* Create a mask surface */ /* Create a mask surface */
if (psoMask) if (psoMask)
{ {
EXLATEOBJ exlo; EXLATEOBJ exlo;
PPALETTE ppal; PPALETTE ppal;
lDelta = WIDTH_BYTES_ALIGN32(sizel.cx, BitsPerFormat(pso->iBitmapFormat));
/* Create a bitmap for the mask */ /* Create a bitmap for the mask */
hbmMask = EngCreateBitmap(psoMask->sizlBitmap, hbmMask = EngCreateBitmap(psoMask->sizlBitmap,
lDelta, lDelta,

1
reactos/win32ss/gdi/eng/pdevobj.h
View file

@ -30,7 +30,6 @@ typedef struct _GDIPOINTER /* should stay private to ENG? No, part of PDEVOBJ ak
BOOL Enabled; BOOL Enabled;
SIZEL Size; SIZEL Size;
POINTL HotSpot; POINTL HotSpot;
XLATEOBJ *XlateObject;
SURFACE *psurfColor; SURFACE *psurfColor;
SURFACE *psurfMask; SURFACE *psurfMask;
SURFACE *psurfSave; SURFACE *psurfSave;