[PATCH v36 4/9] server: Return the desktop object info in get_thread_desktop.

[Rémi Bernon]

From: Rémi Bernon

---
 server/file.h       |  1 +
 server/mapping.c    |  7 +++++++
 server/protocol.def | 11 ++++++++++-
 server/trace.c      |  8 ++++++++
 server/winstation.c | 14 ++++++++++++++
 tools/make_requests |  1 +
 6 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/server/file.h b/server/file.h
index abfc2f0a2ce..89f91c52993 100644
--- a/server/file.h
+++ b/server/file.h
@@ -194,6 +194,7 @@ extern void set_session_mapping( struct mapping *mapping );

extern const volatile void *alloc_shared_object(void);
 extern void free_shared_object( const volatile void *object_shm );
+extern obj_locator_t get_shared_object_locator( const volatile void *object_shm );

#define SHARED_WRITE_BEGIN( object_shm, type )                          \
     do {                                                                \
diff --git a/server/mapping.c b/server/mapping.c
index f77de343f4f..92eb0c9f076 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -1407,6 +1407,13 @@ void free_shared_object( const volatile void *object_shm )
     list_add_tail( &session.free_objects, &object->entry );
 }

+obj_locator_t get_shared_object_locator( const volatile void *object_shm )
+{
+    struct session_object *object = CONTAINING_RECORD( object_shm, struct session_object, obj.shm );
+    obj_locator_t locator = {.offset = object->offset, .id = object->obj.id};
+    return locator;
+}
+
 struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name,
                                         unsigned int attr, const struct security_descriptor *sd )
 {
diff --git a/server/protocol.def b/server/protocol.def
index 09260e071f8..9a452416f0a 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -908,6 +908,12 @@ typedef volatile struct
     object_shm_t         shm;              /* object shared data */
 } shared_object_t;

+typedef struct
+{
+    object_id_t          id;               /* object unique id, object data is valid if != 0 */
+    mem_size_t           offset;           /* offset of the object in session shared memory */
+} obj_locator_t;
+
 /****************************************************************/
 /* Request declarations */

@@ -2819,13 +2825,16 @@ enum coords_relative
 @REQ(get_thread_desktop)
     thread_id_t  tid;             /* thread id */
 @REPLY
-    obj_handle_t handle;          /* handle to the desktop */
+    obj_handle_t   handle;        /* handle to the desktop */
+    obj_locator_t  locator;       /* locator for the shared session object */
 @END

/* Set the thread current desktop */
 @REQ(set_thread_desktop)
     obj_handle_t handle;          /* handle to the desktop */
+@REPLY
+    obj_locator_t  locator;       /* locator for the shared session object */
 @END

diff --git a/server/trace.c b/server/trace.c
index d76d13152aa..c9d120adecf 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -467,6 +467,14 @@ static void dump_hw_input( const char *prefix, const hw_input_t *input )
     }
 }

+static void dump_obj_locator( const char *prefix, const obj_locator_t *locator )
+{
+    fprintf( stderr, "%s{", prefix );
+    dump_uint64( "id=", &locator->id );
+    dump_uint64( ",offset=", &locator->offset );
+    fprintf( stderr, "}" );
+}
+
 static void dump_luid( const char *prefix, const struct luid *luid )
 {
     fprintf( stderr, "%s%d.%u", prefix, luid->high_part, luid->low_part );
diff --git a/server/winstation.c b/server/winstation.c
index 3b7e86feddc..43231238fad 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -740,10 +740,21 @@ DECL_HANDLER(close_desktop)
 /* get the thread current desktop */
 DECL_HANDLER(get_thread_desktop)
 {
+    struct desktop *desktop;
     struct thread *thread;

+    reply->locator.id = 0;
+
     if (!(thread = get_thread_from_id( req->tid ))) return;
     reply->handle = thread->desktop;
+
+    if (!(desktop = get_thread_desktop( thread, 0 ))) clear_error();
+    else
+    {
+        if (desktop->shared) reply->locator = get_shared_object_locator( desktop->shared );
+        release_object( desktop );
+    }
+
     release_object( thread );
 }

@@ -754,6 +765,8 @@ DECL_HANDLER(set_thread_desktop)
     struct desktop *old_desktop, *new_desktop;
     struct winstation *winstation;

+    reply->locator.id = 0;
+
     if (!(winstation = get_process_winstation( current->process, 0 /* FIXME: access rights? */ )))
         return;

@@ -786,6 +799,7 @@ DECL_HANDLER(set_thread_desktop)
             if (old_desktop) remove_desktop_thread( old_desktop, current );
             add_desktop_thread( new_desktop, current );
         }
+        reply->locator = get_shared_object_locator( new_desktop->shared );
     }

if (!current->process->desktop)
diff --git a/tools/make_requests b/tools/make_requests
index b20b53096ca..36254faec40 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -53,6 +53,7 @@ my %formats =
     "generic_map_t" => [  16,  4,  "&dump_generic_map" ],
     "ioctl_code_t"  => [  4,   4,  "&dump_ioctl_code" ],
     "hw_input_t"    => [  40,  8,  "&dump_hw_input" ],
+    "obj_locator_t" => [  16,  8,  "&dump_obj_locator" ],
     # varargs-only structures
     "apc_call_t"               => [  64,  8 ],
     "context_t"                => [  1728,  8 ],