winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window().

We don't want to clip in the desktop process, but we still need it to call ungrab_clipping_window() if the process that was previously clipping didn't. This can happen for example when fullscreen clipping is enabled, but the corresponding window isn't explicitly destroyed before process exit.

winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window().
76bbf106 · Henri Verbeet · Alexandre Julliard · e54c49d9 · 76bbf106
Commit 76bbf106 authored Apr 25, 2013 by Henri Verbeet Committed by Alexandre Julliard Apr 25, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mouse.c dlls/winex11.drv/mouse.c +3 -3

No files found.
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -362,6 +362,9 @@ static BOOL grab_clipping_window( const RECT *clip )
    Window clip_window;
    HWND msg_hwnd = 0;

+    if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId())
+        return TRUE;  /* don't clip in the desktop process */
+
    if (!data) return FALSE;
    if (!(clip_window = init_clip_window())) return TRUE;

@@ -1378,9 +1381,6 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip )
 {
    if (!clip) clip = &virtual_screen_rect;

-    if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId())
-        return TRUE;  /* don't clip in the desktop process */
-
    if (grab_pointer)
    {
        HWND foreground = GetForegroundWindow();