commit 88cd32b2d15bccdac5e9a26206a6e1727b5360bc
author Martin Wilck <Martin.Wilck@fujitsu-siemens.com> Wed Jan 09 20:30:51 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 09 20:30:51 2002 +0000
tree b155836953cb58a1ceae4202d8bebc23135be3d7
parent 06ffc1aba34734b03f9023eb04522bb14d041bb6

More general approach to file descriptor types and flags.

server/file.c

diff --git a/server/file.c b/server/file.c
index 351da8a..67805c2 100644
--- a/server/file.c
+++ b/server/file.c
@@ -53,7 +53,7 @@
 static void file_poll_event( struct object *obj, int event );
 static int file_get_fd( struct object *obj );
 static int file_flush( struct object *obj );
-static int file_get_info( struct object *obj, struct get_file_info_reply *reply );
+static int file_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags );
 static void file_destroy( struct object *obj );
 static struct async_queue * file_queue_async(struct object *obj, struct async* async, int type, int count);
 
@@ -303,7 +303,7 @@
     return ret;
 }
 
-static int file_get_info( struct object *obj, struct get_file_info_reply *reply )
+static int file_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags )
 {
     struct stat st;
     struct file *file = (struct file *)obj;
@@ -339,9 +339,8 @@
         reply->index_low   = st.st_ino;
         reply->serial      = 0; /* FIXME */
     }
-
-    if (file->flags & FILE_FLAG_OVERLAPPED) return FD_TYPE_OVERLAPPED;
-
+    *flags = 0;
+    if (file->flags & FILE_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED;
     return FD_TYPE_DEFAULT;
 }
 
@@ -587,7 +586,7 @@
             if ((fd = obj->ops->get_fd( obj )) != -1)
                 send_client_fd( current->process, fd, req->handle );
         }
-        reply->type = obj->ops->get_file_info( obj, NULL );
+        reply->type = obj->ops->get_file_info( obj, NULL, &reply->flags );
         release_object( obj );
     }
 }
@@ -633,7 +632,8 @@
 
     if ((obj = get_handle_obj( current->process, req->handle, 0, NULL )))
     {
-        obj->ops->get_file_info( obj, reply );
+        int flags;
+        obj->ops->get_file_info( obj, reply, &flags );
         release_object( obj );
     }
 }