From 11593bada5ce7966f8b5cb9cb3c4d4386771eb07 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Tue, 14 Sep 2021 05:00:14 +0200
Subject: [PATCH] fix windowed mode issues in vanilla versions

(cherry picked from commit 96823a8b61d2d058b1da85499fae4926fc93ced8)
---
 src/mouse.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/mouse.c b/src/mouse.c
index 774dd4b..3fc806c 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -118,26 +118,11 @@ LRESULT CALLBACK mouse_hook_proc(int Code, WPARAM wParam, LPARAM lParam)
         }
         break;
     }
-    /* down messages are ignored if we have no cursor lock */
-    case WM_XBUTTONDBLCLK:
-    case WM_XBUTTONDOWN:
-    case WM_XBUTTONUP:
-    case WM_MOUSEWHEEL:
-    case WM_MOUSEHOVER:
-    case WM_LBUTTONDBLCLK:
-    case WM_MBUTTONDBLCLK:
-    case WM_RBUTTONDBLCLK:
-    case WM_LBUTTONDOWN:
-    case WM_RBUTTONDOWN:
-    case WM_MBUTTONDOWN:
-    case WM_MOUSEMOVE:
-    {
-        if (!g_ddraw->devmode && !g_ddraw->locked)
-        {
-            return CallNextHookEx(g_mouse_hook, Code, wParam, lParam);
-        }
-        break;
     }
+
+    if (!g_ddraw->devmode && !g_ddraw->locked)
+    {
+        return CallNextHookEx(g_mouse_hook, Code, wParam, lParam);
     }
 
     fake_GetCursorPos(&((MOUSEHOOKSTRUCT*)lParam)->pt);