Jacek Caban : server: Add a helper for queuing pipe message.
Alexandre Julliard
julliard at winehq.org
Thu Mar 29 19:13:28 CDT 2018
Module: wine
Branch: master
Commit: a588a5a39754fdeb7bacb9047c55f9aeec9429d6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a588a5a39754fdeb7bacb9047c55f9aeec9429d6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Mar 28 22:46:32 2018 +0200
server: Add a helper for queuing pipe message.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/named_pipe.c | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/server/named_pipe.c b/server/named_pipe.c
index a6f5fb6..d7467dc 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -351,6 +351,18 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state
}
+static struct pipe_message *queue_message( struct pipe_end *pipe_end, struct iosb *iosb )
+{
+ struct pipe_message *message;
+
+ if (!(message = mem_alloc( sizeof(*message) ))) return NULL;
+ message->iosb = (struct iosb *)grab_object( iosb );
+ message->async = NULL;
+ message->read_pos = 0;
+ list_add_tail( &pipe_end->message_queue, &message->entry );
+ return message;
+}
+
static void wake_message( struct pipe_message *message )
{
struct async *async = message->async;
@@ -794,26 +806,26 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos )
static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos )
{
- struct pipe_end *write_end = get_fd_user( fd );
- struct pipe_end *read_end = write_end->connection;
+ struct pipe_end *pipe_end = get_fd_user( fd );
struct pipe_message *message;
+ struct iosb *iosb;
- if (!read_end)
+ if (!pipe_end->connection)
{
set_error( STATUS_PIPE_DISCONNECTED );
return 0;
}
- if (!(write_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1;
+ if (!(pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1;
- if (!(message = mem_alloc( sizeof(*message) ))) return 0;
- message->async = (struct async *)grab_object( async );
- message->iosb = async_get_iosb( async );
- message->read_pos = 0;
- list_add_tail( &read_end->message_queue, &message->entry );
+ iosb = async_get_iosb( async );
+ message = queue_message( pipe_end->connection, iosb );
+ release_object( iosb );
+ if (!message) return 0;
- queue_async( &write_end->write_q, async );
- reselect_write_queue( write_end );
+ message->async = (struct async *)grab_object( async );
+ queue_async( &pipe_end->write_q, async );
+ reselect_write_queue( pipe_end );
set_error( STATUS_PENDING );
return 1;
}
More information about the wine-cvs
mailing list