wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity
458dd1fbce
wine-staging/patches/dinput-Events/0001-dinput-Ensure-X11-input-events-are-handled-even-with.patch
Sebastian Lackner 6b720c8cd2 dinput-Events: Mark test failures with todo_wine.
2015-10-05 01:11:06 +02:00

181 lines
6.7 KiB
Diff
Raw Blame History

From 0bf1b2a338baca121228b1739a2398f34a5fbd86 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 18 Dec 2014 01:04:34 +0100
Subject: dinput: Ensure X11 input events are handled even without explicit
message loop. (try 3)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This commit basically reverts b22ff8018aca7c365e505f1db7732f7050ae259b.
Michael Müller did a full analysis of this problem, which reveals that the issue
is caused by the way user32 and winex11 works. Wine establishes separate X server
connections for each thread, so each thread needs to call
USER_Driver->pMsgWaitForMultipleObjectsEx from time to time to ensure that events
are properly forwarded to the wineserver. On Windows all this isn't necessary
because the kernel itself is responsible for generating window events, and there
is no need to pass them from the application to the kernel.
A proper fix would mean to rewrite winex11 to always handle X11 events
asynchronously, and without explicit need for a message loop. Since such a rewrite
is rather unlikely and will not happen during the near future, adding a workaround
till a better solution is found. This workaround will have no disadvantage, except
that this isn't a complete fix. Please note that not only hooks are affected by
this issue, also *RawInput* functions show the same issue - which is the reason why
native dinput will still not work (already tested).
Since games use very different code in order to query for input events, we have to
call __wine_check_for_events from multiple locations in the code. See:
* https://bugs.wine-staging.com/show_bug.cgi?id=42
* https://bugs.wine-staging.com/show_bug.cgi?id=149
---
dlls/dinput/device.c | 5 +++--
dlls/dinput/keyboard.c | 2 ++
dlls/dinput/mouse.c | 2 ++
dlls/dinput/tests/mouse.c | 2 ++
dlls/user32/input.c | 14 ++++++++++----
dlls/user32/user32.spec | 1 +
include/winuser.h | 1 +
7 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index ab43029..60678be 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1631,8 +1631,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface)
IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
if (!This->acquired) return DIERR_NOTACQUIRED;
- /* Because wine devices do not need to be polled, just return DI_NOEFFECT */
- return DI_NOEFFECT;
+
+ __wine_check_for_events( QS_ALLINPUT );
+ return DI_OK;
}
HRESULT WINAPI IDirectInputDevice2AImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index f3ac30e..4b4ccf4 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -335,6 +335,8 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac
if (len != This->base.data_format.user_df->dwDataSize )
return DIERR_INVALIDPARAM;
+ __wine_check_for_events( QS_ALLINPUT );
+
EnterCriticalSection(&This->base.crit);
if (TRACE_ON(dinput)) {
diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index 132efce..44e1d57 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -552,6 +552,8 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface,
if(This->base.acquired == 0) return DIERR_NOTACQUIRED;
+ __wine_check_for_events( QS_ALLINPUT );
+
TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr);
_dump_mouse_state(&This->m_state);
diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c
index 1a5f4bc..711abcf 100644
--- a/dlls/dinput/tests/mouse.c
+++ b/dlls/dinput/tests/mouse.c
@@ -160,6 +160,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd)
IDirectInputDevice_Acquire(pMouse);
cnt = 1;
hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0);
+ todo_wine
ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
/* Check for buffer owerflow */
@@ -171,6 +172,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd)
ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
cnt = 1;
hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0);
+ todo_wine
ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
if (pMouse) IUnknown_Release(pMouse);
diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index 40e35a9..0ce64fc 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -354,12 +354,18 @@ HWND WINAPI GetCapture(void)
}
-static void check_for_events( UINT flags )
+/***********************************************************************
+ * __wine_check_for_events (USER32.@)
+ *
+ * Internal function to check for pending X11 events.
+ */
+void CDECL __wine_check_for_events( UINT flags )
{
if (USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ) == WAIT_TIMEOUT)
flush_window_surfaces( TRUE );
}
+
/**********************************************************************
* GetAsyncKeyState (USER32.@)
*
@@ -375,7 +381,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key )
if (key < 0 || key >= 256) return 0;
- check_for_events( QS_INPUT );
+ __wine_check_for_events( QS_INPUT );
if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1)
{
@@ -430,7 +436,7 @@ DWORD WINAPI GetQueueStatus( UINT flags )
return 0;
}
- check_for_events( flags );
+ __wine_check_for_events( flags );
SERVER_START_REQ( get_queue_status )
{
@@ -450,7 +456,7 @@ BOOL WINAPI GetInputState(void)
{
DWORD ret;
- check_for_events( QS_INPUT );
+ __wine_check_for_events( QS_INPUT );
SERVER_START_REQ( get_queue_status )
{
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index f0e541f..e1f165f 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -789,5 +789,6 @@
# All functions must be prefixed with '__wine_' (for internal functions)
# or 'wine_' (for user-visible functions) to avoid namespace conflicts.
#
+@ cdecl __wine_check_for_events(long)
@ cdecl __wine_send_input(long ptr)
@ cdecl __wine_set_pixel_format(long long)
diff --git a/include/winuser.h b/include/winuser.h
index 06ca054..5d32474 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4061,6 +4061,7 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list);
WORD WINAPI SYSTEM_KillSystemTimer( WORD );
#ifdef __WINESRC__
+WINUSERAPI VOID CDECL __wine_check_for_events( UINT flags );
WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input );
#endif
--
2.6.0
Reference in New Issue View Git Blame Copy Permalink