[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

diff --git a/win32ss/drivers/displays/framebuf/pointer.c b/win32ss/drivers/displays/framebuf/pointer.c
index e3a6ed6..f4ff377 100644 (file)
--- 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);
       /* FIXME: Is this really needed? */
       TempSurfObj = EngLockSurface(ppdev->PointerColorSurface);
       EngFreeMem(TempSurfObj->pvBits);

-      TempSurfObj->pvBits = 0;
+      TempSurfObj->pvBits = NULL;

       EngUnlockSurface(TempSurfObj);
 
       EngDeleteSurface(ppdev->PointerColorSurface);
       EngUnlockSurface(TempSurfObj);
 
       EngDeleteSurface(ppdev->PointerColorSurface);

-      ppdev->PointerMaskSurface = NULL;
+      ppdev->PointerColorSurface = NULL;

    }
 
    if (ppdev->PointerMaskSurface != NULL)
    }
 
    if (ppdev->PointerMaskSurface != NULL)


@@ -232,7 +232,7 @@ DrvSetPointerShape(
       /* FIXME: Is this really needed? */
       TempSurfObj = EngLockSurface(ppdev->PointerMaskSurface);
       EngFreeMem(TempSurfObj->pvBits);
       /* FIXME: Is this really needed? */
       TempSurfObj = EngLockSurface(ppdev->PointerMaskSurface);
       EngFreeMem(TempSurfObj->pvBits);

-      TempSurfObj->pvBits = 0;
+      TempSurfObj->pvBits = NULL;

       EngUnlockSurface(TempSurfObj);
 
       EngDeleteSurface(ppdev->PointerMaskSurface);
       EngUnlockSurface(TempSurfObj);
 
       EngDeleteSurface(ppdev->PointerMaskSurface);


@@ -276,12 +276,7 @@ DrvSetPointerShape(
       ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
          psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits);
    }
       ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
          psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits);
    }

-   else
-   {
-      ppdev->PointerColorSurface = NULL;
-   }

 
 

-   if (psoMask != NULL)

    {
       SIZEL Size;
       PBYTE Bits;
    {
       SIZEL Size;
       PBYTE Bits;


@@ -294,10 +289,6 @@ DrvSetPointerShape(
       ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
          psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits);
    }
       ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
          psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits);
    }

-   else
-   {
-      ppdev->PointerMaskSurface = NULL;
-   }

 
    /*
     * Create surface for saving the pixels under the cursor.
 
    /*
     * Create surface for saving the pixels under the cursor.