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

server: Remove unused device manager argument from set_irp_result call. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2015-10-28 23:18:49 +01:00 committed by Alexandre Julliard
parent 23cdc7e529
commit 408b7ea6b3
6 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ntoskrnl.exe/ntoskrnl.c
View File

@ -1271,13 +1271,11 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost )
handle = (HANDLE)irp->UserIosb;
if (handle)
{
HANDLE manager = get_device_manager();
void *out_buff = irp->UserBuffer;
FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject;
SERVER_START_REQ( set_irp_result )
{
req->manager = wine_server_obj_handle( manager );
req->handle = wine_server_obj_handle( handle );
req->status = irp->IoStatus.u.Status;
req->file_ptr = wine_server_client_ptr( file );

6
include/wine/server_protocol.h
View File

@ -3228,13 +3228,11 @@ struct ioctl_reply
struct set_irp_result_request
{
struct request_header __header;
obj_handle_t manager;
obj_handle_t handle;
unsigned int status;
client_ptr_t file_ptr;
data_size_t size;
client_ptr_t file_ptr;
/* VARARG(data,bytes); */
char __pad_36[4];
};
struct set_irp_result_reply
{
@ -6149,6 +6147,6 @@ union generic_reply
struct terminate_job_reply terminate_job_reply;
};
#define SERVER_PROTOCOL_VERSION 487
#define SERVER_PROTOCOL_VERSION 488
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */

6
server/device.c
View File

@ -807,11 +807,6 @@ DECL_HANDLER(get_next_device_request)
DECL_HANDLER(set_irp_result)
{
struct irp_call *irp;
struct device_manager *manager;
if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager,
0, &device_manager_ops )))
return;
if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops )))
{
@ -820,7 +815,6 @@ DECL_HANDLER(set_irp_result)
close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */
release_object( irp );
}
release_object( manager );
}

3
server/protocol.def
View File

@ -2345,11 +2345,10 @@ enum message_type
/* Store results of an async irp */
@REQ(set_irp_result)
obj_handle_t manager; /* handle to the device manager */
obj_handle_t handle; /* handle to the irp */
unsigned int status; /* status of the irp */
client_ptr_t file_ptr; /* opaque pointer to the file object */
data_size_t size; /* result size (input or output depending on the operation) */
client_ptr_t file_ptr; /* opaque pointer to the file object */
VARARG(data,bytes); /* output data of the irp */
@END

9
server/request.h
View File

@ -1563,12 +1563,11 @@ C_ASSERT( sizeof(struct ioctl_request) == 64 );
C_ASSERT( FIELD_OFFSET(struct ioctl_reply, wait) == 8 );
C_ASSERT( FIELD_OFFSET(struct ioctl_reply, options) == 12 );
C_ASSERT( sizeof(struct ioctl_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, manager) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 20 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 20 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, file_ptr) == 24 );
C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 32 );
C_ASSERT( sizeof(struct set_irp_result_request) == 40 );
C_ASSERT( sizeof(struct set_irp_result_request) == 32 );
C_ASSERT( FIELD_OFFSET(struct get_irp_result_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct get_irp_result_request, user_arg) == 16 );
C_ASSERT( sizeof(struct get_irp_result_request) == 24 );

5
server/trace.c
View File

@ -2834,11 +2834,10 @@ static void dump_ioctl_reply( const struct ioctl_reply *req )
static void dump_set_irp_result_request( const struct set_irp_result_request *req )
{
fprintf( stderr, " manager=%04x", req->manager );
fprintf( stderr, ", handle=%04x", req->handle );
fprintf( stderr, " handle=%04x", req->handle );
fprintf( stderr, ", status=%08x", req->status );
dump_uint64( ", file_ptr=", &req->file_ptr );
fprintf( stderr, ", size=%u", req->size );
dump_uint64( ", file_ptr=", &req->file_ptr );
dump_varargs_bytes( ", data=", cur_size );
}