commit 684b65cd522fff5cc8d17e63a377432c08a47ebc
author Alexandre Julliard <julliard@winehq.org> Fri Apr 16 04:31:35 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Apr 16 04:31:35 2004 +0000
tree 228f321bd2bf0af04623f50266ace22e48e2da30
parent 5d617e8f798cecaa0d29f77549497e064b73ce25

Added support for FILE_DIRECTORY_FILE and FILE_NON_DIRECTORY_FILE open
options.

server/file.c

diff --git a/server/file.c b/server/file.c
index 509a7c0..a748766 100644
--- a/server/file.c
+++ b/server/file.c
@@ -167,8 +167,7 @@
     /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */
     if (!(file->fd = alloc_fd( &file_fd_ops, &file->obj )) ||
         !(file->fd = open_fd( file->fd, name, flags | O_NONBLOCK | O_LARGEFILE,
-                              &mode, access, sharing,
-                              (options & FILE_DELETE_ON_CLOSE) ? name : "" )))
+                              &mode, access, sharing, options )))
     {
         free( name );
         release_object( file );
@@ -176,13 +175,6 @@
     }
     free( name );
 
-    /* refuse to open a directory */
-    if (S_ISDIR(mode) && !(options & FILE_OPEN_FOR_BACKUP_INTENT))
-    {
-        set_error( STATUS_ACCESS_DENIED );
-        release_object( file );
-        return NULL;
-    }
     /* check for serial port */
     if (S_ISCHR(mode) && is_serial_fd( file->fd ))
     {