Bugfix: DISPLAY_SetCursor should not use USER-internals, as it is also

windows/x11drv/mouse.c

@@ -33,7 +33,6 @@ static BOOL X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
     Pixmap pixmapBits, pixmapMask, pixmapAll;
     XColor fg, bg;
     Cursor cursor = None;
-    BOOL DesktopWinExists = FALSE;
 
     if (!ptr)  /* Create an empty cursor */
     {
@@ -144,45 +143,45 @@ static BOOL X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
     if (X11DRV_MOUSE_XCursor != None) XFreeCursor( display, X11DRV_MOUSE_XCursor );
     X11DRV_MOUSE_XCursor = cursor;
 
-    if (WIN_GetDesktop() != NULL)
-    {
-		DesktopWinExists = TRUE;
-		WIN_ReleaseDesktop();
-	}
-    if (X11DRV_GetXRootWindow() != DefaultRootWindow(display) || !DesktopWinExists)
+    return TRUE;
+}
+
+/***********************************************************************
+ *		X11DRV_MOUSE_SetCursor
+ */
+void X11DRV_MOUSE_SetCursor( CURSORICONINFO *lpCursor )
+{
+    BOOL success;
+
+    EnterCriticalSection( &X11DRV_CritSection );
+    success = CALL_LARGE_STACK( X11DRV_MOUSE_DoSetCursor, lpCursor );
+    LeaveCriticalSection( &X11DRV_CritSection );
+    if ( !success ) return;
+
+    if (X11DRV_GetXRootWindow() != DefaultRootWindow(display))
     {
-        /* Set the cursor on the desktop window */
-        XDefineCursor( display, X11DRV_GetXRootWindow(), cursor );
+        /* If in desktop mode, set the cursor on the desktop window */
+
+        XDefineCursor( display, X11DRV_GetXRootWindow(), X11DRV_MOUSE_XCursor );
     }
     else
     {
-        /* FIXME: this won't work correctly with native USER !*/
+        /* Else, set the same cursor for all top-level windows */
+
+        /* FIXME: we should not reference USER internals here, but native USER 
+                  works only in desktop mode anyway, so this should not matter */
 
-        /* Set the same cursor for all top-level windows */
         HWND hwnd = GetWindow( GetDesktopWindow(), GW_CHILD );
         while(hwnd)
         {
             WND *tmpWnd = WIN_FindWndPtr(hwnd);
             Window win = X11DRV_WND_FindXWindow(tmpWnd );
             if (win && win!=DefaultRootWindow(display))
-                XDefineCursor( display, win, cursor );
+                XDefineCursor( display, win, X11DRV_MOUSE_XCursor );
             hwnd = GetWindow( hwnd, GW_HWNDNEXT );
             WIN_ReleaseWndPtr(tmpWnd);
         }
     }
-    return TRUE;
-}
-
-/***********************************************************************
- *		X11DRV_MOUSE_SetCursor
- */
-void X11DRV_MOUSE_SetCursor( CURSORICONINFO *lpCursor )
-{
-    WIN_LockWnds();
-    EnterCriticalSection( &X11DRV_CritSection );
-    CALL_LARGE_STACK( X11DRV_MOUSE_DoSetCursor, lpCursor );
-    LeaveCriticalSection( &X11DRV_CritSection );
-    WIN_UnlockWnds();
 }
 
 /***********************************************************************