commit e66207ebfcfddff49102ce8fa7d7811a8fd6abbe
author Alexandre Julliard <julliard@winehq.org> Wed Feb 19 00:33:32 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 19 00:33:32 2003 +0000
tree 5fad34e8197fb3378f883f0ee7d2da73f429766a
parent ac13d2f47e2318c93cba90d862ca9598dca2587f

Moved all references to file descriptors out of the generic object
structure.
Changed the poll()-related routines to deal with file descriptors
instead of objects and integrated poll support into fd.c.

server/mapping.c

diff --git a/server/mapping.c b/server/mapping.c
index 4c39034..26180d4 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -50,6 +50,7 @@
 };
 
 static void mapping_dump( struct object *obj, int verbose );
+static struct fd *mapping_get_fd( struct object *obj );
 static void mapping_destroy( struct object *obj );
 
 static const struct object_ops mapping_ops =
@@ -60,7 +61,7 @@
     NULL,                        /* remove_queue */
     NULL,                        /* signaled */
     NULL,                        /* satisfied */
-    default_get_fd,              /* get_fd */
+    mapping_get_fd,              /* get_fd */
     mapping_destroy              /* destroy */
 };
 
@@ -190,8 +191,7 @@
 
     /* load the headers */
 
-    if (!(fd = get_obj_fd( (struct object *)mapping->file ))) return 0;
-    mapping->obj.fd_obj = fd;
+    if (!(fd = mapping_get_fd( &mapping->obj ))) return 0;
     unix_fd = get_unix_fd( fd );
     filepos = lseek( unix_fd, 0, SEEK_SET );
     if (read( unix_fd, &dos, sizeof(dos) ) != sizeof(dos)) goto error;
@@ -231,11 +231,13 @@
 
     lseek( unix_fd, filepos, SEEK_SET );
     free( sec );
+    release_object( fd );
     return 1;
 
  error:
     lseek( unix_fd, filepos, SEEK_SET );
     if (sec) free( sec );
+    release_object( fd );
     set_error( STATUS_INVALID_FILE_FOR_SECTION );
     return 0;
 }
@@ -301,7 +303,6 @@
         if (!(mapping->file = create_temp_file( access ))) goto error;
         if (!grow_file( mapping->file, size_high, size_low )) goto error;
     }
-    mapping->obj.fd_obj = get_obj_fd( (struct object *)mapping->file );
     mapping->size_high = size_high;
     mapping->size_low  = ROUND_SIZE( 0, size_low );
     mapping->protect   = protect;
@@ -324,6 +325,12 @@
     fputc( '\n', stderr );
 }
 
+static struct fd *mapping_get_fd( struct object *obj )
+{
+    struct mapping *mapping = (struct mapping *)obj;
+    return get_obj_fd( (struct object *)mapping->file );
+}
+
 static void mapping_destroy( struct object *obj )
 {
     struct mapping *mapping = (struct mapping *)obj;