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

diff --git a/server/registry.c b/server/registry.c
index 31dfe97..5b75b50 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -37,7 +37,9 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
 #include "object.h"
+#include "file.h"
 #include "handle.h"
 #include "request.h"
 #include "unicode.h"
@@ -166,12 +168,8 @@
     NULL,                    /* remove_queue */
     NULL,                    /* signaled */
     NULL,                    /* satisfied */
-    NULL,                    /* get_poll_events */
-    NULL,                    /* poll_event */
     no_get_fd,               /* get_fd */
-    no_flush,                /* flush */
     no_get_file_info,        /* get_file_info */
-    NULL,                    /* queue_async */
     key_destroy              /* destroy */
 };
 
@@ -1452,7 +1450,7 @@
     int fd;
 
     if (!(obj = get_handle_obj( current->process, handle, GENERIC_READ, NULL ))) return;
-    fd = dup(obj->ops->get_fd( obj ));
+    fd = dup( get_unix_fd( obj ) );
     release_object( obj );
     if (fd != -1)
     {
@@ -1547,7 +1545,7 @@
         return;
     }
     if (!(obj = get_handle_obj( current->process, handle, GENERIC_WRITE, NULL ))) return;
-    fd = dup(obj->ops->get_fd( obj ));
+    fd = dup( get_unix_fd( obj ) );
     release_object( obj );
     if (fd != -1)
     {