commit 017480d4e29228dd169f14c31815daee991e3e6f
author Alexandre Julliard <julliard@winehq.org> Thu May 03 16:07:30 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu May 03 16:07:30 2007 +0200
tree 412e668e7ca5d64da48266362aafaa2c638fe3ea
parent 451616ee4528c82278c538da9ec5ad439fdcec65

server: Store valid file options in pseudo file descriptors.

server/fd.c

diff --git a/server/fd.c b/server/fd.c
index 4ad4da5..c4a0288 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -1409,7 +1409,7 @@
 }
 
 /* allocate a pseudo fd object, for objects that need to behave like files but don't have a unix fd */
-struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user )
+struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, unsigned int options )
 {
     struct fd *fd = alloc_object( &fd_ops );
 
@@ -1420,6 +1420,7 @@
     fd->inode      = NULL;
     fd->closed     = NULL;
     fd->access     = 0;
+    fd->options    = options;
     fd->sharing    = 0;
     fd->unix_fd    = -1;
     fd->signaled   = 0;

server/file.h

diff --git a/server/file.h b/server/file.h
index 09c90c3..df5988d 100644
--- a/server/file.h
+++ b/server/file.h
@@ -52,7 +52,8 @@
 
 /* file descriptor functions */
 
-extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user );
+extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user,
+                                   unsigned int options );
 extern void set_no_fd_status( struct fd *fd, unsigned int status );
 extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access,
                            unsigned int sharing, unsigned int options );

server/mailslot.c

diff --git a/server/mailslot.c b/server/mailslot.c
index 8bcb723..fd50080 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -359,7 +359,7 @@
         get_error() != STATUS_OBJECT_NAME_EXISTS)
     {
         dev->mailslots = NULL;
-        if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj )) ||
+        if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj, 0 )) ||
             !(dev->mailslots = create_namespace( 7 )))
         {
             release_object( dev );

server/named_pipe.c

diff --git a/server/named_pipe.c b/server/named_pipe.c
index f2c7947..801b4d7 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -480,7 +480,7 @@
         get_error() != STATUS_OBJECT_NAME_EXISTS)
     {
         dev->pipes = NULL;
-        if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj )) ||
+        if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj, 0 )) ||
             !(dev->pipes = create_namespace( 7 )))
         {
             release_object( dev );
@@ -709,7 +709,7 @@
 
     list_add_head( &pipe->servers, &server->entry );
     grab_object( pipe );
-    if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj )))
+    if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj, options )))
     {
         release_object( server );
         server = NULL;