From e910351120a908ed7d8b8f869b483ab91b6b4f38 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Wed, 26 May 2021 19:48:48 +0200 Subject: [PATCH] some more tweak for GetClipper and GetPalette --- src/ddsurface.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ddsurface.c b/src/ddsurface.c index 0771c90..3c341a1 100644 --- a/src/ddsurface.c +++ b/src/ddsurface.c @@ -773,8 +773,10 @@ HRESULT dds_GetCaps(IDirectDrawSurfaceImpl *This, LPDDSCAPS lpDDSCaps) HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER FAR* lpClipper) { - if (lpClipper) - *lpClipper = (LPDIRECTDRAWCLIPPER)This->clipper; + if (!lpClipper) + return DDERR_INVALIDPARAMS; + + *lpClipper = (LPDIRECTDRAWCLIPPER)This->clipper; if (This->clipper) { @@ -834,8 +836,10 @@ HRESULT dds_GetDC(IDirectDrawSurfaceImpl *This, HDC FAR *lpHDC) HRESULT dds_GetPalette(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWPALETTE FAR *lplpDDPalette) { - if (lplpDDPalette) - *lplpDDPalette = (LPDIRECTDRAWPALETTE)This->palette; + if (!lplpDDPalette) + return DDERR_INVALIDPARAMS; + + *lplpDDPalette = (LPDIRECTDRAWPALETTE)This->palette; if (This->palette) {