commit c3ac57dd8628b3f687fff294d65ab4556489d1d6
author Alexandre Julliard <julliard@winehq.org> Fri Jul 08 14:23:27 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jul 08 14:23:27 2005 +0000
tree 577388070e46bb1c3a1f9cdb65e09f2a0e4e4fc7
parent 6fd3c47c4f0af172323f7b6a8383722b2eb674f1

Explicitly pass the winstation to the atom functions so that they can
be used even when current is not set.

server/class.c

diff --git a/server/class.c b/server/class.c
index 5f034d9..929e4ff 100644
--- a/server/class.c
+++ b/server/class.c
@@ -33,6 +33,7 @@
 #include "object.h"
 #include "process.h"
 #include "user.h"
+#include "winuser.h"
 
 struct window_class
 {
@@ -156,6 +157,7 @@
 DECL_HANDLER(create_class)
 {
     struct window_class *class;
+    struct winstation *winstation;
 
     if (!req->local && req->atom == DESKTOP_ATOM)
     {
@@ -175,11 +177,19 @@
         set_error( STATUS_INVALID_PARAMETER );
         return;
     }
-    if (!grab_global_atom( req->atom )) return;
 
+    if (!(winstation = get_process_winstation( current->process, WINSTA_ACCESSGLOBALATOMS )))
+        return;
+
+    if (!grab_global_atom( winstation, req->atom ))
+    {
+        release_object( winstation );
+        return;
+    }
     if (!(class = create_class( current->process, req->extra, req->local )))
     {
-        release_global_atom( req->atom );
+        release_global_atom( winstation, req->atom );
+        release_object( winstation );
         return;
     }
     class->atom       = req->atom;
@@ -187,6 +197,7 @@
     class->style      = req->style;
     class->win_extra  = req->win_extra;
     class->client_ptr = req->client_ptr;
+    release_object( winstation );
 }
 
 /* destroy a window class */
@@ -249,9 +260,16 @@
 
     if (req->flags & SET_CLASS_ATOM)
     {
-        if (!grab_global_atom( req->atom )) return;
-        release_global_atom( class->atom );
+        struct winstation *winstation = get_process_winstation( current->process,
+                                                                WINSTA_ACCESSGLOBALATOMS );
+        if (!grab_global_atom( winstation, req->atom ))
+        {
+            release_object( winstation );
+            return;
+        }
+        release_global_atom( winstation, class->atom );
         class->atom = req->atom;
+        release_object( winstation );
     }
     if (req->flags & SET_CLASS_STYLE) class->style = req->style;
     if (req->flags & SET_CLASS_WINEXTRA) class->win_extra = req->win_extra;