Commit 50975c81 authored by Alexandre Julliard's avatar Alexandre Julliard

server: Return the status from an async I/O APC call to the server.

parent 06db7052
...@@ -682,6 +682,8 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) ...@@ -682,6 +682,8 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result )
case APC_ASYNC_IO: case APC_ASYNC_IO:
NtCurrentTeb()->num_async_io--; NtCurrentTeb()->num_async_io--;
call->async_io.func( call->async_io.user, call->async_io.sb, call->async_io.status ); call->async_io.func( call->async_io.user, call->async_io.sb, call->async_io.status );
result->type = call->type;
result->async_io.status = ((IO_STATUS_BLOCK *)call->async_io.sb)->u.Status;
break; break;
case APC_VIRTUAL_ALLOC: case APC_VIRTUAL_ALLOC:
result->type = call->type; result->type = call->type;
......
...@@ -338,6 +338,11 @@ typedef union ...@@ -338,6 +338,11 @@ typedef union
{ {
enum apc_type type; enum apc_type type;
unsigned int status; unsigned int status;
} async_io;
struct
{
enum apc_type type;
unsigned int status;
void *addr; void *addr;
unsigned long size; unsigned long size;
} virtual_alloc; } virtual_alloc;
...@@ -4694,6 +4699,6 @@ union generic_reply ...@@ -4694,6 +4699,6 @@ union generic_reply
struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply;
}; };
#define SERVER_PROTOCOL_VERSION 281 #define SERVER_PROTOCOL_VERSION 282
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
...@@ -352,6 +352,11 @@ typedef union ...@@ -352,6 +352,11 @@ typedef union
enum apc_type type; enum apc_type type;
struct struct
{ {
enum apc_type type; /* APC_ASYNC_IO */
unsigned int status; /* new status of async operation */
} async_io;
struct
{
enum apc_type type; /* APC_VIRTUAL_ALLOC */ enum apc_type type; /* APC_VIRTUAL_ALLOC */
unsigned int status; /* status returned by call */ unsigned int status; /* status returned by call */
void *addr; /* resulting address */ void *addr; /* resulting address */
......
...@@ -179,6 +179,10 @@ static void dump_apc_result( const apc_result_t *result ) ...@@ -179,6 +179,10 @@ static void dump_apc_result( const apc_result_t *result )
{ {
case APC_NONE: case APC_NONE:
break; break;
case APC_ASYNC_IO:
fprintf( stderr, "APC_ASYNC_IO,status=%s",
get_status_name( result->async_io.status ) );
break;
case APC_VIRTUAL_ALLOC: case APC_VIRTUAL_ALLOC:
fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s,addr=%p,size=%lu", fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s,addr=%p,size=%lu",
get_status_name( result->virtual_alloc.status ), get_status_name( result->virtual_alloc.status ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment