https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0b5b47352d35258697e6a0da28670d1dec91cf0
commit a0b5b47352d35258697e6a0da28670d1dec91cf0 Author: Serge Gautherie <[email protected]> AuthorDate: Sun Apr 1 18:51:54 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <[email protected]> CommitDate: Sun Apr 1 18:51:54 2018 +0200 [WIN32SS:FRAMEBUF] Improve/Fix DrvSetPointerShape(), from r7864 (#457) - 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 --- win32ss/drivers/displays/framebuf/pointer.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/win32ss/drivers/displays/framebuf/pointer.c b/win32ss/drivers/displays/framebuf/pointer.c index e3a6ed6888..f4ff377c9c 100644 --- a/win32ss/drivers/displays/framebuf/pointer.c +++ b/win32ss/drivers/displays/framebuf/pointer.c @@ -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.
