[PATCH 1/2] server: Assume the internal clip message to be WM_WINE_CLIPCURSOR.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/cursoricon.c       | 1 -
 include/wine/server_protocol.h | 1 -
 server/protocol.def            | 1 -
 server/queue.c                 | 9 ++-------
 server/user.h                  | 1 -
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c
index bf4b1c3ac23..584a2cffca7 100644
--- a/dlls/win32u/cursoricon.c
+++ b/dlls/win32u/cursoricon.c
@@ -174,7 +174,6 @@ BOOL WINAPI NtUserClipCursor( const RECT *rect )

SERVER_START_REQ( set_cursor )
     {
-        req->clip_msg = WM_WINE_CLIPCURSOR;
         if (rect)
         {
             req->flags       = SET_CURSOR_CLIP;
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 45a50106408..a424f6fcee8 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -5333,7 +5333,6 @@ struct set_cursor_request
     int            x;
     int            y;
     rectangle_t    clip;
-    unsigned int   clip_msg;
     char __pad_52[4];
 };
 struct set_cursor_reply
diff --git a/server/protocol.def b/server/protocol.def
index 95ddb1d5011..800319e8901 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3699,7 +3699,6 @@ struct handle_info
     int            x;             /* cursor position */
     int            y;
     rectangle_t    clip;          /* cursor clip rectangle */
-    unsigned int   clip_msg;      /* message to post on cursor clip changes */
 @REPLY
     user_handle_t  prev_handle;   /* previous handle */
     int            prev_count;    /* previous show count */
diff --git a/server/queue.c b/server/queue.c
index 7320dddc6b7..586f0c99696 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -34,6 +34,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winternl.h"
+#include "ntuser.h"

#include "handle.h"
 #include "file.h"
@@ -467,8 +468,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect
     }
     else desktop->cursor.clip = top_rect;

-    if (desktop->cursor.clip_msg && send_clip_msg)
-        post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 );
+    if (send_clip_msg) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, rect != NULL, 0 );

/* warp the mouse to be inside the clip rect */
     x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left );
@@ -3294,11 +3294,6 @@ DECL_HANDLER(set_cursor)
     if (req->flags & (SET_CURSOR_CLIP | SET_CURSOR_NOCLIP))
     {
         struct desktop *desktop = input->desktop;
-
-        /* only the desktop owner can set the message */
-        if (req->clip_msg && get_top_window_owner(desktop) == current->process)
-            desktop->cursor.clip_msg = req->clip_msg;
-
         set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip, 0 );
     }

diff --git a/server/user.h b/server/user.h
index 280da454d07..530e91c0c09 100644
--- a/server/user.h
+++ b/server/user.h
@@ -57,7 +57,6 @@ struct global_cursor
     int                  x;                /* cursor position */
     int                  y;
     rectangle_t          clip;             /* cursor clip rectangle */
-    unsigned int         clip_msg;         /* message to post for cursor clip changes */
     unsigned int         last_change;      /* time of last position change */
     user_handle_t        win;              /* window that contains the cursor */
 };