Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 13:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS:FRAMEBUF] Improve/Fix DrvSetPointerShape(), from r7864 (#457)

Browse source 
- Fix a copypasta.
- Remove dead code.

Thanks to mudhead, who spotted most of these.

NB:
This EXPERIMENTAL_MOUSE_CURSOR_SUPPORT code isn't compiled by default since r7865.

CORE-14511
This commit is contained in:
Serge Gautherie 2018-04-01 18:51:54 +02:00 committed by Hermès BÉLUSCA - MAÏTO
parent f745a97bfe
commit a0b5b47352
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
win32ss/drivers/displays/framebuf/pointer.c
View file

@ -220,11 +220,11 @@ DrvSetPointerShape(
/* FIXME: Is this really needed? */
TempSurfObj = EngLockSurface(ppdev->PointerColorSurface);
EngFreeMem(TempSurfObj->pvBits);
TempSurfObj->pvBits = 0;
TempSurfObj->pvBits = NULL;
EngUnlockSurface(TempSurfObj);
EngDeleteSurface(ppdev->PointerColorSurface);
ppdev->PointerMaskSurface = NULL;
ppdev->PointerColorSurface = NULL;
}
if (ppdev->PointerMaskSurface != NULL)
@ -232,7 +232,7 @@ DrvSetPointerShape(
/* FIXME: Is this really needed? */
TempSurfObj = EngLockSurface(ppdev->PointerMaskSurface);
EngFreeMem(TempSurfObj->pvBits);
TempSurfObj->pvBits = 0;
TempSurfObj->pvBits = NULL;
EngUnlockSurface(TempSurfObj);
EngDeleteSurface(ppdev->PointerMaskSurface);
@ -276,12 +276,7 @@ DrvSetPointerShape(
ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits);
}
else
{
ppdev->PointerColorSurface = NULL;
}
if (psoMask != NULL)
{
SIZEL Size;
PBYTE Bits;
@ -294,10 +289,6 @@ DrvSetPointerShape(
ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits);
}
else
{
ppdev->PointerMaskSurface = NULL;
}
/*
* Create surface for saving the pixels under the cursor.