commit 863637b158114511bb14e01ca555c580f0ef20b1
author Alexandre Julliard <julliard@winehq.org> Thu Jan 30 00:26:44 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 30 00:26:44 2003 +0000
tree 2acbaa2f9fad5e370b78ab184c32faaccdb1d145
parent 45adf0843f475b8755e5ee0eca64cf437edc7633

Started moving functions that deal with Unix file descriptors to a
separate fd object. This will be needed for file locking.

server/mapping.c

diff --git a/server/mapping.c b/server/mapping.c
index b7b055c..4881bc7 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -28,6 +28,7 @@
 
 #include "winbase.h"
 
+#include "file.h"
 #include "handle.h"
 #include "thread.h"
 #include "request.h"
@@ -47,7 +48,7 @@
     struct mapping *shared_prev;     /* prev in shared PE mapping list */
 };
 
-static int mapping_get_fd( struct object *obj );
+static struct fd *mapping_get_fd( struct object *obj );
 static int mapping_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags );
 static void mapping_dump( struct object *obj, int verbose );
 static void mapping_destroy( struct object *obj );
@@ -60,12 +61,8 @@
     NULL,                        /* remove_queue */
     NULL,                        /* signaled */
     NULL,                        /* satisfied */
-    NULL,                        /* get_poll_events */
-    NULL,                        /* poll_event */
     mapping_get_fd,              /* get_fd */
-    no_flush,                    /* flush */
     mapping_get_info,            /* get_file_info */
-    NULL,                        /* queue_async */
     mapping_destroy              /* destroy */
 };
 
@@ -111,13 +108,7 @@
 /* get the fd to use for mmaping a file */
 inline static int get_mmap_fd( struct file *file )
 {
-    struct object *obj;
-    if (!(obj = (struct object *)file))
-    {
-        set_error( STATUS_INVALID_HANDLE );
-        return -1;
-    }
-    return obj->ops->get_fd( obj );
+    return get_unix_fd( (struct object *)file );
 }
 
 /* find the shared PE mapping for a given mapping */
@@ -327,11 +318,12 @@
     fputc( '\n', stderr );
 }
 
-static int mapping_get_fd( struct object *obj )
+static struct fd *mapping_get_fd( struct object *obj )
 {
     struct mapping *mapping = (struct mapping *)obj;
     assert( obj->ops == &mapping_ops );
-    return get_mmap_fd( mapping->file );
+
+    return default_get_fd( (struct object *)mapping->file );
 }
 
 static int mapping_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags )