Alexandre Julliard : winex11: Refuse to clip cursor to a 1x1 window if we don't have XInput2 support.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 897fdfd423bbc0093b19775577ea4910de4d1a33
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=897fdfd423bbc0093b19775577...

Author: Alexandre Julliard 
Date:   Tue Apr 26 14:40:59 2011 +0200

winex11: Refuse to clip cursor to a 1x1 window if we don't have XInput2 support.

---

dlls/winex11.drv/mouse.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 1e783d2..c4e0b59 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -410,7 +410,20 @@ static BOOL grab_clipping_window( const RECT *clip )
     if (!clip_window) return TRUE;

/* create a clip message window unless we are already clipping */
-    if (!data->clip_hwnd && !(msg_hwnd = create_clipping_msg_window())) return TRUE;
+    if (!data->clip_hwnd)
+    {
+        if (!(msg_hwnd = create_clipping_msg_window())) return TRUE;
+        enable_xinput2();
+    }
+
+    /* don't clip to 1x1 rectangle if we don't have XInput */
+    if (data->xi2_state != xi_enabled && clip->right - clip->left == 1 && clip->bottom - clip->top == 1)
+    {
+        WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) );
+        if (msg_hwnd) DestroyWindow( msg_hwnd );
+        ClipCursor( NULL );
+        return TRUE;
+    }

TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) );

@@ -428,13 +441,13 @@ static BOOL grab_clipping_window( const RECT *clip )

if (!clipping_cursor)
     {
+        disable_xinput2();
         if (msg_hwnd) DestroyWindow( msg_hwnd );
         return FALSE;
     }
     if (msg_hwnd)
     {
         data->clip_hwnd = msg_hwnd;
-        enable_xinput2();
         sync_window_cursor( clip_window );
         clip_rect = *clip;
         SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd );