1
0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00

some more tweak for GetClipper and GetPalette

This commit is contained in:
FunkyFr3sh 2021-05-26 19:48:48 +02:00
parent ba04253dfe
commit e910351120

View File

@ -773,8 +773,10 @@ HRESULT dds_GetCaps(IDirectDrawSurfaceImpl *This, LPDDSCAPS lpDDSCaps)
HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER FAR* lpClipper) HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER FAR* lpClipper)
{ {
if (lpClipper) if (!lpClipper)
*lpClipper = (LPDIRECTDRAWCLIPPER)This->clipper; return DDERR_INVALIDPARAMS;
*lpClipper = (LPDIRECTDRAWCLIPPER)This->clipper;
if (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) HRESULT dds_GetPalette(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWPALETTE FAR *lplpDDPalette)
{ {
if (lplpDDPalette) if (!lplpDDPalette)
*lplpDDPalette = (LPDIRECTDRAWPALETTE)This->palette; return DDERR_INVALIDPARAMS;
*lplpDDPalette = (LPDIRECTDRAWPALETTE)This->palette;
if (This->palette) if (This->palette)
{ {