From 63033840d9d0f57e163645420e9c911904f84bcc Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Sun, 26 May 2024 09:29:14 +0200
Subject: [PATCH] improve error checks

---
 src/ddclipper.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/ddclipper.c b/src/ddclipper.c
index 72a87e1..d4ab56d 100644
--- a/src/ddclipper.c
+++ b/src/ddclipper.c
@@ -69,11 +69,14 @@ HRESULT ddc_SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWOR
     if (This->hwnd)
         return DDERR_CLIPPERISUSINGHWND;
 
-    if (This->region)
-        DeleteObject(This->region);
-
-    if (lpClipList && lpClipList->rdh.nCount >= 1)
+    if (lpClipList)
     {
+        if (!lpClipList->rdh.nCount)
+            return DDERR_INVALIDCLIPLIST;
+
+        if (This->region)
+            DeleteObject(This->region);
+
         RECT* rc = (RECT*)lpClipList->Buffer;
 
         This->region = CreateRectRgnIndirect(&rc[0]);
@@ -88,7 +91,7 @@ HRESULT ddc_SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWOR
             if (!region)
                 return DDERR_INVALIDCLIPLIST;
 
-            if (CombineRgn(This->region, region, This->region, RGN_OR) == ERROR)
+            if (CombineRgn(This->region, region, This->region, RGN_XOR) == ERROR)
             {
                 DeleteObject(region);
                 DeleteObject(This->region);
@@ -102,6 +105,9 @@ HRESULT ddc_SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWOR
     }
     else
     {
+        if (This->region)
+            DeleteObject(This->region);
+
         This->region = NULL;
     }