ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Return void from the get_volume_info callback. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-09-02 19:08:50 -05:00 committed by Alexandre Julliard
parent 15b8f91e24
commit 6cc36a46ff
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/console.c
View File

@ -99,7 +99,7 @@ static const struct object_ops console_ops =
static enum server_fd_type console_get_fd_type( struct fd *fd );
static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class );
static int console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
static int console_read( struct fd *fd, struct async *async, file_pos_t pos );
static int console_flush( struct fd *fd, struct async *async );
static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
@ -480,7 +480,7 @@ static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned
set_error( STATUS_INVALID_DEVICE_REQUEST );
}
static int console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
{
switch (info_class)
{
@ -500,7 +500,6 @@ static int console_get_volume_info( struct fd *fd, struct async *async, unsigned
default:
set_error( STATUS_NOT_IMPLEMENTED );
}
return 0;
}
static struct object *create_console(void)

6
server/device.c
View File

@ -206,7 +206,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos
static int device_file_flush( struct fd *fd, struct async *async );
static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
static void device_file_reselect_async( struct fd *fd, struct async_queue *queue );
static int device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
static const struct object_ops device_file_ops =
{
@ -614,7 +614,7 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd )
return FD_TYPE_DEVICE;
}
static int device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
{
struct device_file *file = get_fd_user( fd );
irp_params_t params;
@ -622,7 +622,7 @@ static int device_file_get_volume_info( struct fd *fd, struct async *async, unsi
memset( &params, 0, sizeof(params) );
params.volume.type = IRP_CALL_VOLUME;
params.volume.info_class = info_class;
return queue_irp( file, &params, async );
queue_irp( file, &params, async );
}
static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos )

3
server/fd.c
View File

@ -2369,10 +2369,9 @@ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int
}
/* default get_volume_info() routine */
int no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
{
set_error( STATUS_OBJECT_TYPE_MISMATCH );
return 0;
}
/* default ioctl() routine */

4
server/file.h
View File

@ -65,7 +65,7 @@ struct fd_ops
/* query file info */
void (*get_file_info)( struct fd *, obj_handle_t, unsigned int );
/* query volume info */
int (*get_volume_info)( struct fd *, struct async *, unsigned int );
void (*get_volume_info)( struct fd *, struct async *, unsigned int );
/* perform an ioctl on the file */
int (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async );
/* queue an async operation */
@ -114,7 +114,7 @@ extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos );
extern int no_fd_flush( struct fd *fd, struct async *async );
extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class );
extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class );
extern int no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
extern void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async );
extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count );

5
server/named_pipe.c
View File

@ -146,7 +146,7 @@ static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len );
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_data, file_pos_t pos );
static int pipe_end_flush( struct fd *fd, struct async *async );
static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class );
static void pipe_end_get_volume_info( struct fd *fd, struct async *async, 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, obj_handle_t handle, unsigned int info_class );
@ -740,7 +740,7 @@ static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len )
return pipe_end->pipe->obj.ops->get_full_name( &pipe_end->pipe->obj, len );
}
static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class )
{
switch (info_class)
{
@ -760,7 +760,6 @@ static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigne
default:
set_error( STATUS_NOT_IMPLEMENTED );
}
return 0;
}
static void message_queue_read( struct pipe_end *pipe_end, struct async *async )