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/change.c

diff --git a/server/change.c b/server/change.c
index e996d49..c8966da 100644
--- a/server/change.c
+++ b/server/change.c
@@ -157,7 +157,6 @@
 };
 
 static struct fd *dir_get_fd( struct object *obj );
-static unsigned int dir_map_access( struct object *obj, unsigned int access );
 static void dir_dump( struct object *obj, int verbose );
 static void dir_destroy( struct object *obj );
 
@@ -171,7 +170,7 @@
     no_satisfied,             /* satisfied */
     no_signal,                /* signal */
     dir_get_fd,               /* get_fd */
-    dir_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 */
@@ -289,15 +288,6 @@
     return (struct fd *)grab_object( dir->fd );
 }
 
-static unsigned int dir_map_access( struct object *obj, unsigned int access )
-{
-    if (access & GENERIC_READ)    access |= FILE_GENERIC_READ;
-    if (access & GENERIC_WRITE)   access |= FILE_GENERIC_WRITE;
-    if (access & GENERIC_EXECUTE) access |= FILE_GENERIC_EXECUTE;
-    if (access & GENERIC_ALL)     access |= FILE_ALL_ACCESS;
-    return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
-}
-
 static struct change_record *get_first_change_record( struct dir *dir )
 {
     struct list *ptr = list_head( &dir->change_records );