commit 24001e8ddcf353b80a405f974c93c7599a27761e
author Alexandre Julliard <julliard@winehq.org> Tue Oct 02 14:20:15 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 02 14:20:15 2007 +0200
tree d6e44f9272212b6631323e322ec0d1cc9105c87c
parent 4a5ba4c732394b06b33351685b02c65f1f5b4a64

server: Add a default access mapping function for files, and use it for devices too.

server/file.c

diff --git a/server/file.c b/server/file.c
index a8152da..d65ff44 100644
--- a/server/file.c
+++ b/server/file.c
@@ -65,7 +65,6 @@
 
 static void file_dump( struct object *obj, int verbose );
 static struct fd *file_get_fd( struct object *obj );
-static unsigned int file_map_access( struct object *obj, unsigned int access );
 static void file_destroy( struct object *obj );
 
 static int file_get_poll_events( struct fd *fd );
@@ -82,7 +81,7 @@
     no_satisfied,                 /* satisfied */
     no_signal,                    /* signal */
     file_get_fd,                  /* get_fd */
-    file_map_access,              /* map_access */
+    default_fd_map_access,        /* map_access */
     no_lookup_name,               /* lookup_name */
     no_open_file,                 /* open_file */
     fd_close_handle,              /* close_handle */
@@ -122,7 +121,7 @@
     if ((file = alloc_object( &file_ops )))
     {
         file->mode = st.st_mode;
-        file->access = file_map_access( &file->obj, access );
+        file->access = default_fd_map_access( &file->obj, access );
         if (!(file->fd = create_anonymous_fd( &file_fd_ops, fd, &file->obj,
                                               FILE_SYNCHRONOUS_IO_NONALERT )))
         {
@@ -268,11 +267,6 @@
     return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
 }
 
-static unsigned int file_map_access( struct object *obj, unsigned int access )
-{
-    return generic_file_map_access( access );
-}
-
 static void file_destroy( struct object *obj )
 {
     struct file *file = (struct file *)obj;