From 4afc71566094f2dc49557b1413da676f6ab250c6 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Fri, 25 Jun 2021 14:36:26 +0200
Subject: [PATCH] make sure cursor is hidden in all dinput games

---
 src/directinput.c | 56 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/directinput.c b/src/directinput.c
index e79435e..6989730 100644
--- a/src/directinput.c
+++ b/src/directinput.c
@@ -95,7 +95,7 @@ static HRESULT WINAPI fake_di_CreateDevice(
 
     HRESULT result = real_di_CreateDevice(This, rguid, lplpDIDevice, pUnkOuter);
 
-    if (SUCCEEDED(result) && !real_did_SetCooperativeLevel)
+    if (SUCCEEDED(result))
     {
         if (rguid && IsEqualGUID(&GUID_SysMouse, rguid) && g_ddraw)
         {
@@ -107,17 +107,20 @@ static HRESULT WINAPI fake_di_CreateDevice(
             InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, -1);
         }
 
-        real_did_SetCooperativeLevel =
-            (DIDSETCOOPERATIVELEVELPROC)hook_func(
-                (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel, (PROC)fake_did_SetCooperativeLevel);
+        if (!real_did_SetCooperativeLevel)
+        {
+            real_did_SetCooperativeLevel =
+                (DIDSETCOOPERATIVELEVELPROC)hook_func(
+                    (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel, (PROC)fake_did_SetCooperativeLevel);
 
-        real_did_GetDeviceData =
-            (DIDGETDEVICEDATAPROC)hook_func(
-                (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData, (PROC)fake_did_GetDeviceData);
+            real_did_GetDeviceData =
+                (DIDGETDEVICEDATAPROC)hook_func(
+                    (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData, (PROC)fake_did_GetDeviceData);
 
-        real_did_GetDeviceState =
-            (DIDGETDEVICESTATEPROC)hook_func(
-                (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState, (PROC)fake_did_GetDeviceState);
+            real_did_GetDeviceState =
+                (DIDGETDEVICESTATEPROC)hook_func(
+                    (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState, (PROC)fake_did_GetDeviceState);
+        }
     }
 
     return result;
@@ -134,19 +137,32 @@ static HRESULT WINAPI fake_di_CreateDeviceEx(
 
     HRESULT result = real_di_CreateDeviceEx(This, rguid, riid, lplpDIDevice, pUnkOuter);
 
-    if (SUCCEEDED(result) && !real_did_SetCooperativeLevel)
+    if (SUCCEEDED(result))
     {
-        real_did_SetCooperativeLevel =
-            (DIDSETCOOPERATIVELEVELPROC)hook_func(
-                (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel, (PROC)fake_did_SetCooperativeLevel);
+        if (rguid && IsEqualGUID(&GUID_SysMouse, rguid) && g_ddraw)
+        {
+            if (g_ddraw->locked || g_ddraw->devmode)
+            {
+                while (real_ShowCursor(FALSE) >= 0);
+            }
 
-        real_did_GetDeviceData =
-            (DIDGETDEVICEDATAPROC)hook_func(
-                (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData, (PROC)fake_did_GetDeviceData);
+            InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, -1);
+        }
 
-        real_did_GetDeviceState =
-            (DIDGETDEVICESTATEPROC)hook_func(
-                (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState, (PROC)fake_did_GetDeviceState);
+        if (!real_did_SetCooperativeLevel)
+        {
+            real_did_SetCooperativeLevel =
+                (DIDSETCOOPERATIVELEVELPROC)hook_func(
+                    (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel, (PROC)fake_did_SetCooperativeLevel);
+
+            real_did_GetDeviceData =
+                (DIDGETDEVICEDATAPROC)hook_func(
+                    (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData, (PROC)fake_did_GetDeviceData);
+
+            real_did_GetDeviceState =
+                (DIDGETDEVICESTATEPROC)hook_func(
+                    (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState, (PROC)fake_did_GetDeviceState);
+        }
     }
 
     return result;