From 4326703c71bd2fd2be8c70315eb569b2ea362747 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Thu, 29 Sep 2022 20:41:14 +0200 Subject: [PATCH] disable clipper functions (needs more testing) --- src/IDirectDraw/IDirectDrawClipper.c | 14 ++++++++------ src/ddsurface.c | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/IDirectDraw/IDirectDrawClipper.c b/src/IDirectDraw/IDirectDrawClipper.c index 77792f5..1de1471 100644 --- a/src/IDirectDraw/IDirectDrawClipper.c +++ b/src/IDirectDraw/IDirectDrawClipper.c @@ -45,16 +45,17 @@ HRESULT __stdcall IDirectDrawClipper__GetClipList( LPDWORD lpdwSiz) { TRACE( - "-> %s(This=%p, lpRect=%p, lpClipList=%p, lpdwSiz=%p)\n", + "NOT_IMPLEMENTED -> %s(This=%p, lpRect=%p, lpClipList=%p, lpdwSiz=%p)\n", __FUNCTION__, This, lpRect, lpClipList, lpdwSiz); - HRESULT ret = ddc_GetClipList(This, lpRect, lpClipList, lpdwSiz); + HRESULT ret = DDERR_NOCLIPLIST; + //HRESULT ret = ddc_GetClipList(This, lpRect, lpClipList, lpdwSiz); - TRACE("<- %s\n", __FUNCTION__); + TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } @@ -84,9 +85,10 @@ HRESULT __stdcall IDirectDrawClipper__IsClipListChanged(IDirectDrawClipperImpl* HRESULT __stdcall IDirectDrawClipper__SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWORD dwFlags) { - TRACE("-> %s(This=%p, lpClipList=%p, dwFlags=%08X)\n", __FUNCTION__, This, lpClipList, dwFlags); - HRESULT ret = ddc_SetClipList(This, lpClipList, dwFlags); - TRACE("<- %s\n", __FUNCTION__); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, lpClipList=%p, dwFlags=%08X)\n", __FUNCTION__, This, lpClipList, dwFlags); + //HRESULT ret = ddc_SetClipList(This, lpClipList, dwFlags); + HRESULT ret = DD_OK; + TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } diff --git a/src/ddsurface.c b/src/ddsurface.c index 6b83240..47b5804 100644 --- a/src/ddsurface.c +++ b/src/ddsurface.c @@ -75,6 +75,7 @@ HRESULT dds_Blt( BOOL is_stretch_blt = src_w != dst_w || src_h != dst_h; + /* Disable this for now (needs more testing) if (This->clipper && !(dwFlags & DDBLT_NO_CLIP) && dst_w > 0 && dst_h > 0) { DWORD size = 0; @@ -111,6 +112,7 @@ HRESULT dds_Blt( } } } + */ if (dst_rect.left < 0) {