Alexandre Julliard : server: Remove the extra apc_arg parameter now that user APCs all require the same arg as the kernel APC .
Module: wine Branch: master Commit: 8992f89f27435b4de3c779c1704aecab80798a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8992f89f27435b4de3c779c170...
Author: Alexandre Julliard julliard@winehq.org Date: Sun Jun 3 12:05:44 2007 +0200
server: Remove the extra apc_arg parameter now that user APCs all require the same arg as the kernel APC.
---
dlls/ntdll/directory.c | 1 - dlls/ntdll/file.c | 3 --- dlls/ws2_32/socket.c | 3 --- include/wine/server_protocol.h | 3 +-- server/async.c | 2 +- server/protocol.def | 1 - server/trace.c | 4 ++-- 7 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 3256c59..5eac7f3 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2286,7 +2286,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, req->async.iosb = IoStatusBlock; req->async.arg = info; req->async.apc = read_changes_user_apc; - req->async.apc_arg = info; req->async.event = Event; status = wine_server_call( req ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7c166a9..b48cc9d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -639,7 +639,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, req->async.iosb = io_status; req->async.arg = fileio; req->async.apc = fileio_apc; - req->async.apc_arg = fileio; req->async.event = hEvent; status = wine_server_call( req ); } @@ -873,7 +872,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, req->async.iosb = io_status; req->async.arg = fileio; req->async.apc = fileio_apc; - req->async.apc_arg = fileio; req->async.event = hEvent; status = wine_server_call( req ); } @@ -1001,7 +999,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->async.iosb = io; req->async.arg = async; req->async.apc = (apc || event) ? ioctl_apc : NULL; - req->async.apc_arg = async; req->async.event = event; wine_server_add_data( req, in_buffer, in_size ); wine_server_set_reply( req, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c0a387d..4c87d23 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1319,7 +1319,6 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) req->async.iosb = &wsa->local_iosb; req->async.arg = wsa; req->async.apc = ws2_async_apc; - req->async.apc_arg = wsa; status = wine_server_call( req ); } SERVER_END_REQ; @@ -2677,7 +2676,6 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, req->async.iosb = iosb; req->async.arg = wsa; req->async.apc = ws2_async_apc; - req->async.apc_arg = wsa; req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; err = wine_server_call( req ); } @@ -4185,7 +4183,6 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, req->async.iosb = iosb; req->async.arg = wsa; req->async.apc = ws2_async_apc; - req->async.apc_arg = wsa; req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; err = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a5c5b03..6b703a1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -161,7 +161,6 @@ typedef struct void *iosb; void *arg; void *apc; - void *apc_arg; obj_handle_t event; } async_data_t;
@@ -4728,6 +4727,6 @@ union generic_reply struct get_next_device_request_reply get_next_device_request_reply; };
-#define SERVER_PROTOCOL_VERSION 304 +#define SERVER_PROTOCOL_VERSION 305
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index 58b7720..24cbd2a 100644 --- a/server/async.c +++ b/server/async.c @@ -252,7 +252,7 @@ void async_set_result( struct object *obj, unsigned int status ) apc_call_t data; data.type = APC_USER; data.user.func = async->data.apc; - data.user.args[0] = (unsigned long)async->data.apc_arg; + data.user.args[0] = (unsigned long)async->data.arg; data.user.args[1] = (unsigned long)async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); diff --git a/server/protocol.def b/server/protocol.def index 6d88a13..8a7e5a8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -177,7 +177,6 @@ typedef struct void *iosb; /* I/O status block in client addr space */ void *arg; /* opaque user data to pass to callback */ void *apc; /* user apc to call */ - void *apc_arg; /* argument for user apc */ obj_handle_t event; /* event to signal when done */ } async_data_t;
diff --git a/server/trace.c b/server/trace.c index 1dc83cf..a340bad 100644 --- a/server/trace.c +++ b/server/trace.c @@ -245,8 +245,8 @@ static void dump_apc_result( const apc_result_t *result )
static void dump_async_data( const async_data_t *data ) { - fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,apc=%p,apc_arg=%p,event=%p}", - data->callback, data->iosb, data->arg, data->apc, data->apc_arg, data->event ); + fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,apc=%p,event=%p}", + data->callback, data->iosb, data->arg, data->apc, data->event ); }
static void dump_luid( const luid_t *luid )
-
Alexandre Julliard