commit 5daae3dfa9bc4403b26e742cc5446e3081e9bbd6
author Vitaliy Margolen <wine-patch@kievinfo.com> Fri Dec 02 16:01:17 2005 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 02 16:01:17 2005 +0100
tree e5fe8c22f50e81967956aeb892c4e8453dffdf12
parent f676bc8d85bdf890caece85e030099bde4ebc139

Move semaphore objects into directory name space.

server/semaphore.c

diff --git a/server/semaphore.c b/server/semaphore.c
index bff60c5..e8d9cbb 100644
--- a/server/semaphore.c
+++ b/server/semaphore.c
@@ -63,8 +63,8 @@
 };
 
 
-static struct semaphore *create_semaphore( const struct unicode_str *name, unsigned int attr,
-                                           unsigned int initial, unsigned int max )
+static struct semaphore *create_semaphore( struct directory *root, const struct unicode_str *name,
+                                           unsigned int attr, unsigned int initial, unsigned int max )
 {
     struct semaphore *sem;
 
@@ -73,7 +73,7 @@
         set_error( STATUS_INVALID_PARAMETER );
         return NULL;
     }
-    if ((sem = create_named_object( sync_namespace, &semaphore_ops, name, attr )))
+    if ((sem = create_named_object_dir( root, name, attr, &semaphore_ops )))
     {
         if (get_error() != STATUS_OBJECT_NAME_EXISTS)
         {
@@ -150,24 +150,36 @@
 {
     struct semaphore *sem;
     struct unicode_str name;
+    struct directory *root = NULL;
 
     reply->handle = 0;
     get_req_unicode_str( &name );
-    if ((sem = create_semaphore( &name, req->attributes, req->initial, req->max )))
+    if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))
+        return;
+
+    if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max )))
     {
         reply->handle = alloc_handle( current->process, sem, req->access,
                                       req->attributes & OBJ_INHERIT );
         release_object( sem );
     }
+
+    if (root) release_object( root );
 }
 
 /* open a handle to a semaphore */
 DECL_HANDLER(open_semaphore)
 {
     struct unicode_str name;
+    struct directory *root = NULL;
 
     get_req_unicode_str( &name );
-    reply->handle = open_object( sync_namespace, &name, &semaphore_ops, req->access, req->attributes );
+    if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))
+        return;
+
+    reply->handle = open_object_dir( root, &name, req->attributes, &semaphore_ops, req->access );
+
+    if (root) release_object( root );
 }
 
 /* release a semaphore */