Jacek Caban : server: Use common implementation for client and server get_file_info.
Alexandre Julliard
julliard at winehq.org
Thu Aug 16 13:42:50 CDT 2018
Module: wine
Branch: master
Commit: 6f6f6e59243ab7e0a7e5f170b8f53d5b0ae4c96f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f6f6e59243ab7e0a7e5f170b8f53d5b0ae4c96f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Aug 16 15:11:08 2018 +0200
server: Use common implementation for client and server get_file_info.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/named_pipe.c | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 9ad1630..95c2442 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -155,12 +155,12 @@ static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t p
static int pipe_end_flush( struct fd *fd, struct async *async );
static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class );
static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue );
+static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class );
/* server end functions */
static void pipe_server_dump( struct object *obj, int verbose );
static void pipe_server_destroy( struct object *obj);
static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
-static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class );
static const struct object_ops pipe_server_ops =
{
@@ -192,7 +192,7 @@ static const struct fd_ops pipe_server_fd_ops =
pipe_end_read, /* read */
pipe_end_write, /* write */
pipe_end_flush, /* flush */
- pipe_server_get_file_info, /* get_file_info */
+ pipe_end_get_file_info, /* get_file_info */
pipe_end_get_volume_info, /* get_volume_info */
pipe_server_ioctl, /* ioctl */
no_fd_queue_async, /* queue_async */
@@ -203,7 +203,6 @@ static const struct fd_ops pipe_server_fd_ops =
static void pipe_client_dump( struct object *obj, int verbose );
static void pipe_client_destroy( struct object *obj );
static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
-static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class );
static const struct object_ops pipe_client_ops =
{
@@ -235,7 +234,7 @@ static const struct fd_ops pipe_client_fd_ops =
pipe_end_read, /* read */
pipe_end_write, /* write */
pipe_end_flush, /* flush */
- pipe_client_get_file_info, /* get_file_info */
+ pipe_end_get_file_info, /* get_file_info */
pipe_end_get_volume_info, /* get_volume_info */
pipe_client_ioctl, /* ioctl */
no_fd_queue_async, /* queue_async */
@@ -556,8 +555,17 @@ static int pipe_end_flush( struct fd *fd, struct async *async )
return 1;
}
-static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsigned int info_class )
+static void pipe_end_get_file_info( struct fd *fd, unsigned int info_class )
{
+ struct pipe_end *pipe_end = get_fd_user( fd );
+ struct named_pipe *pipe = pipe_end->pipe;
+
+ if (!pipe)
+ {
+ set_error( STATUS_PIPE_DISCONNECTED );
+ return;
+ }
+
switch (info_class)
{
case FileNameInformation:
@@ -615,19 +623,6 @@ static int pipe_end_set_sd( struct object *obj, const struct security_descriptor
return 0;
}
-static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class )
-{
- struct pipe_server *server = get_fd_user( fd );
- pipe_end_get_file_info( fd, server->pipe, info_class );
-}
-
-static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class )
-{
- struct pipe_client *client = get_fd_user( fd );
- if (client->server) pipe_end_get_file_info( fd, client->server->pipe, info_class );
- else set_error( STATUS_PIPE_DISCONNECTED );
-}
-
static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class )
{
switch (info_class)
More information about the wine-cvs
mailing list