[DINPUT] Sync with Wine Staging 1.7.55. CORE-10536

[reactos.git] / reactos / dll / directx / wine / dinput / mouse.c

diff --git a/reactos/dll/directx/wine/dinput/mouse.c b/reactos/dll/directx/wine/dinput/mouse.c
index d73a94a..bcf9e13 100644 (file)
--- a/reactos/dll/directx/wine/dinput/mouse.c
+++ b/reactos/dll/directx/wine/dinput/mouse.c
@@ -66,10 +66,7 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W
 {
     return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base);
 }
-static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysMouseImpl *This)
-{
-    return &This->base.IDirectInputDevice8A_iface;
-}
+
 static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This)
 {
     return &This->base.IDirectInputDevice8W_iface;
@@ -533,13 +530,15 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
 static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr)
 {
     SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface);
+    TRACE("(%p)->(%u,%p)\n", This, len, ptr);
 
     if(This->base.acquired == 0) return DIERR_NOTACQUIRED;
 
-    TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr);
-    _dump_mouse_state(&This->m_state);
+    check_dinput_events();
 
     EnterCriticalSection(&This->base.crit);
+    _dump_mouse_state(&This->m_state);
+
     /* Copy the current mouse state */
     fill_DataFormat(ptr, len, &This->m_state, &This->base.data_format);