From 4bb1cffee76c531e063e37222d7da37dc3683816 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Tue, 15 Jun 2021 02:21:44 +0200
Subject: [PATCH] fix cursor lock for some dinput games

---
 inc/directinput.h |  1 +
 src/directinput.c | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/inc/directinput.h b/inc/directinput.h
index 9b1d270..0bd822c 100644
--- a/inc/directinput.h
+++ b/inc/directinput.h
@@ -12,6 +12,7 @@ typedef HRESULT(WINAPI* DICREATEDEVICEPROC)(IDirectInputA*, REFGUID, LPDIRECTINP
 typedef HRESULT(WINAPI* DICREATEDEVICEEXPROC)(IDirectInputA*, REFGUID, REFIID, LPDIRECTINPUTDEVICEA*, LPUNKNOWN);
 typedef HRESULT(WINAPI* DIDSETCOOPERATIVELEVELPROC)(IDirectInputDeviceA*, HWND, DWORD);
 typedef HRESULT(WINAPI* DIDGETDEVICEDATAPROC)(IDirectInputDeviceA*, DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD);
+typedef HRESULT(WINAPI* DIDGETDEVICESTATEPROC)(IDirectInputDeviceA*, DWORD, LPVOID);
 
 extern DIRECTINPUTCREATEAPROC real_DirectInputCreateA;
 extern DIRECTINPUTCREATEWPROC real_DirectInputCreateW;
diff --git a/src/directinput.c b/src/directinput.c
index 9837009..19ee426 100644
--- a/src/directinput.c
+++ b/src/directinput.c
@@ -16,6 +16,7 @@ static DICREATEDEVICEPROC real_di_CreateDevice;
 static DICREATEDEVICEEXPROC real_di_CreateDeviceEx;
 static DIDSETCOOPERATIVELEVELPROC real_did_SetCooperativeLevel;
 static DIDGETDEVICEDATAPROC real_did_GetDeviceData;
+static DIDGETDEVICESTATEPROC real_did_GetDeviceState;
 
 static PROC hook_func(PROC* org_func, PROC new_func)
 {
@@ -53,7 +54,32 @@ static HRESULT WINAPI fake_did_GetDeviceData(
 
     if (SUCCEEDED(result) && g_ddraw && !g_ddraw->locked)
     {
-        *pdwInOut = 0;
+        if (pdwInOut)
+        {
+            if (rgdod && *pdwInOut > 0 && cbObjectData > 0)
+            {
+                memset(rgdod, 0, *pdwInOut * cbObjectData);
+            }
+
+            *pdwInOut = 0;
+        }
+    }
+
+    return result;
+}
+
+static HRESULT WINAPI fake_did_GetDeviceState(IDirectInputDeviceA* This, DWORD cbData, LPVOID lpvData)
+{
+    //TRACE("DirectInput GetDeviceState\n");
+
+    HRESULT result = real_did_GetDeviceState(This, cbData, lpvData);
+
+    if (SUCCEEDED(result) && g_ddraw && !g_ddraw->locked)
+    {
+        if (cbData > 0 && lpvData)
+        {
+            memset(lpvData, 0, cbData);
+        }
     }
 
     return result;
@@ -78,6 +104,10 @@ static HRESULT WINAPI fake_di_CreateDevice(
         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;
@@ -103,6 +133,10 @@ static HRESULT WINAPI fake_di_CreateDeviceEx(
         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;