diff --git a/debian/changelog b/debian/changelog index 3bf5f0c4..f4064c1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low * Various improvements to patchupdate.py. * Disabled patchset for reg.exe cleanup (partially accepted upstream). * Added patch to mark DllCanUnloadNow and DllGetClassObject as private (by Amine Khaldi, wine-patched/pull/3). + * Added patch to skip Wine specific __wine_check_for_events calls in ReactOS (by Amine Khaldi, wine-patched/pull/4). -- Sebastian Lackner Mon, 23 Feb 2015 18:24:51 +0100 wine-staging (1.7.37) unstable; urgency=low diff --git a/patches/dinput-Events/0002-dinput-Skip-Wine-specific-__wine_check_for_events-ca.patch b/patches/dinput-Events/0002-dinput-Skip-Wine-specific-__wine_check_for_events-ca.patch new file mode 100644 index 00000000..755cc016 --- /dev/null +++ b/patches/dinput-Events/0002-dinput-Skip-Wine-specific-__wine_check_for_events-ca.patch @@ -0,0 +1,41 @@ +From 215ba93b9260286b916c1c73f73750f9279645e8 Mon Sep 17 00:00:00 2001 +From: Amine Khaldi +Date: Mon, 23 Feb 2015 20:14:03 +0100 +Subject: dinput: Skip Wine specific __wine_check_for_events calls in ReactOS. + +--- + dlls/dinput/keyboard.c | 2 ++ + dlls/dinput/mouse.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c +index 9e78257..3019552 100644 +--- a/dlls/dinput/keyboard.c ++++ b/dlls/dinput/keyboard.c +@@ -335,7 +335,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac + if (len != This->base.data_format.user_df->dwDataSize ) + return DIERR_INVALIDPARAM; + ++#ifndef __REACTOS__ + __wine_check_for_events( QS_ALLINPUT ); ++#endif + + EnterCriticalSection(&This->base.crit); + +diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c +index 44e1d57..8249513 100644 +--- a/dlls/dinput/mouse.c ++++ b/dlls/dinput/mouse.c +@@ -552,7 +552,9 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, + + if(This->base.acquired == 0) return DIERR_NOTACQUIRED; + ++#ifndef __REACTOS__ + __wine_check_for_events( QS_ALLINPUT ); ++#endif + + TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr); + _dump_mouse_state(&This->m_state); +-- +2.3.0 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fff38599..1865ed6b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -1472,8 +1472,10 @@ fi # | if test "$enable_dinput_Events" -eq 1; then patch_apply dinput-Events/0001-dinput-Ensure-X11-input-events-are-handled-even-with.patch + patch_apply dinput-Events/0002-dinput-Skip-Wine-specific-__wine_check_for_events-ca.patch ( echo '+ { "Sebastian Lackner", "dinput: Ensure X11 input events are handled even without explicit message loop.", 2 },'; + echo '+ { "Amine Khaldi", "dinput: Skip Wine specific __wine_check_for_events calls in ReactOS.", 1 },'; ) >> "$patchlist" fi