Rémi Bernon : server: Move the desktop flags to the shared memory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d0d94195a683a8c42c14283ad4dabe836161356a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d0d94195a683a8c42c14283ad4dabe8...

Author: Rémi Bernon 
Date:   Fri Jun 21 22:27:44 2024 +0200

server: Move the desktop flags to the shared memory.

---

include/wine/server_protocol.h |  3 ++-
 server/protocol.def            |  1 +
 server/user.h                  |  1 -
 server/winstation.c            | 25 ++++++++++++++++++-------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 2598ecc1817..89a2dcb778f 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -893,6 +893,7 @@ struct shared_cursor

typedef volatile struct
 {
+    unsigned int         flags;
     struct shared_cursor cursor;
     unsigned char        keystate[256];
 } desktop_shm_t;
@@ -6591,7 +6592,7 @@ union generic_reply

/* ### protocol_version begin ### */

-#define SERVER_PROTOCOL_VERSION 821
+#define SERVER_PROTOCOL_VERSION 822

/* ### protocol_version end ### */

diff --git a/server/protocol.def b/server/protocol.def
index 21e35204ed0..39c8de7ef69 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -909,6 +909,7 @@ struct shared_cursor

typedef volatile struct
 {
+    unsigned int         flags;            /* desktop flags */
     struct shared_cursor cursor;           /* global cursor information */
     unsigned char        keystate[256];    /* asynchronous key state */
 } desktop_shm_t;
diff --git a/server/user.h b/server/user.h
index 4633c7dae7f..6f10f296200 100644
--- a/server/user.h
+++ b/server/user.h
@@ -67,7 +67,6 @@ struct key_repeat
 struct desktop
 {
     struct object        obj;              /* object header */
-    unsigned int         flags;            /* desktop flags */
     struct winstation   *winstation;       /* winstation this desktop belongs to */
     timeout_t            input_time;       /* last time this desktop had the input */
     struct list          entry;            /* entry in winstation list of desktops */
diff --git a/server/winstation.c b/server/winstation.c
index 75b604ae1c3..76a23b197a4 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -274,13 +274,11 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned
         {
             /* initialize it if it didn't already exist */

-            desktop->flags = flags;
-
             /* inherit DF_WINE_*_DESKTOP flags if none of them are specified */
             if (!(flags & (DF_WINE_ROOT_DESKTOP | DF_WINE_VIRTUAL_DESKTOP))
                 && (current_desktop = get_thread_desktop( current, 0 )))
             {
-                desktop->flags |= current_desktop->flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP);
+                flags |= current_desktop->shared->flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP);
                 release_object( current_desktop );
             }

@@ -308,6 +306,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned

SHARED_WRITE_BEGIN( desktop->shared, desktop_shm_t )
             {
+                shared->flags = flags;
                 shared->cursor.x = 0;
                 shared->cursor.y = 0;
                 shared->cursor.last_change = 0;
@@ -321,7 +320,12 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned
         }
         else
         {
-            desktop->flags |= flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP);
+            SHARED_WRITE_BEGIN( desktop->shared, desktop_shm_t )
+            {
+                shared->flags |= flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP);
+            }
+            SHARED_WRITE_END;
+
             clear_error();
         }
     }
@@ -333,7 +337,7 @@ static void desktop_dump( struct object *obj, int verbose )
     struct desktop *desktop = (struct desktop *)obj;

fprintf( stderr, "Desktop flags=%x winstation=%p top_win=%p hooks=%p\n",
-             desktop->flags, desktop->winstation, desktop->top_window, desktop->global_hooks );
+             desktop->shared->flags, desktop->winstation, desktop->top_window, desktop->global_hooks );
 }

static int desktop_link_name( struct object *obj, struct object_name *name, struct object *parent )
@@ -839,8 +843,15 @@ DECL_HANDLER(set_user_object_info)
     {
         struct desktop *desktop = (struct desktop *)obj;
         reply->is_desktop = 1;
-        reply->old_obj_flags = desktop->flags;
-        if (req->flags & SET_USER_OBJECT_SET_FLAGS) desktop->flags = req->obj_flags;
+        reply->old_obj_flags = desktop->shared->flags;
+        if (req->flags & SET_USER_OBJECT_SET_FLAGS)
+        {
+            SHARED_WRITE_BEGIN( desktop->shared, desktop_shm_t )
+            {
+                shared->flags = req->obj_flags;
+            }
+            SHARED_WRITE_END;
+        }
     }
     else if (obj->ops == &winstation_ops)
     {