From fbf241034c94b3dcf622522dc01d1b3d679d6bc1 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 10 Apr 2017 13:21:49 +0200 Subject: [PATCH] server: Removed no longed needed APC from APC_ASYNC_IO reply. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/ntdll/server.c | 4 ---- include/wine/server_protocol.h | 4 +--- server/protocol.def | 2 -- server/trace.c | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ed77aa5173b..e906898c1e6 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -410,11 +410,7 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) result->type = call->type; result->async_io.status = (*user)( user, iosb, call->async_io.status, &apc, &arg ); if (result->async_io.status != STATUS_PENDING) - { result->async_io.total = iosb->Information; - result->async_io.apc = wine_server_client_ptr( apc ); - result->async_io.arg = wine_server_client_ptr( arg ); - } break; } case APC_VIRTUAL_ALLOC: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f1ae41cd2d5..6c80daba38a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -551,8 +551,6 @@ typedef union { enum apc_type type; unsigned int status; - client_ptr_t apc; - client_ptr_t arg; unsigned int total; } async_io; struct @@ -6411,6 +6409,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 525 +#define SERVER_PROTOCOL_VERSION 526 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 204df9cf21c..222ff95401d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -567,8 +567,6 @@ typedef union { enum apc_type type; /* APC_ASYNC_IO */ unsigned int status; /* new status of async operation */ - client_ptr_t apc; /* user APC to call */ - client_ptr_t arg; /* user APC argument */ unsigned int total; /* bytes transferred */ } async_io; struct diff --git a/server/trace.c b/server/trace.c index febd2f7a7ab..5ebd909c659 100644 --- a/server/trace.c +++ b/server/trace.c @@ -229,8 +229,6 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) case APC_ASYNC_IO: fprintf( stderr, "APC_ASYNC_IO,status=%s,total=%u", get_status_name( result->async_io.status ), result->async_io.total ); - dump_uint64( ",apc=", &result->async_io.apc ); - dump_uint64( ",arg=", &result->async_io.arg ); break; case APC_VIRTUAL_ALLOC: fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s",