April 2017 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Implement SM4 retc instruction.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 849b16b8204418e5af630c2f5e3723f7608467a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849b16b8204418e5af630c2f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:35 2017 +0200 wined3d: Implement SM4 retc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 17 ++++++++++++++--- dlls/wined3d/shader.c | 4 +++- dlls/wined3d/shader_sm4.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a681997..5a7a5c9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5195,6 +5195,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RESINFO */ NULL, /* WINED3DSIH_RET */ shader_hw_ret, + /* WINED3DSIH_RETP */ NULL, /* WINED3DSIH_ROUND_NE */ NULL, /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_ROUND_PI */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b5df3a3..c5017cb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5014,13 +5014,23 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } -static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) +static void shader_glsl_conditional_op(const struct wined3d_shader_instruction *ins) { const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; struct glsl_src_param src_param; + const char *op; + + switch (ins->handler_idx) + { + case WINED3DSIH_BREAKP: op = "break"; break; + case WINED3DSIH_RETP: op = "return"; break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) break;\n", condition, src_param.param_str); + shader_addline(ins->ctx->buffer, "if (%s(%s)) %s;\n", condition, src_param.param_str, op); } static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) @@ -9968,7 +9978,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BFREV */ shader_glsl_map2gl, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, - /* WINED3DSIH_BREAKP */ shader_glsl_breakp, + /* WINED3DSIH_BREAKP */ shader_glsl_conditional_op, /* WINED3DSIH_BUFINFO */ shader_glsl_bufinfo, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, @@ -10126,6 +10136,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RESINFO */ shader_glsl_resinfo, /* WINED3DSIH_RET */ shader_glsl_ret, + /* WINED3DSIH_RETP */ shader_glsl_conditional_op, /* WINED3DSIH_ROUND_NE */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_PI */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e62056e..208a09a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -215,6 +215,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_REP */ "rep", /* WINED3DSIH_RESINFO */ "resinfo", /* WINED3DSIH_RET */ "ret", + /* WINED3DSIH_RETP */ "retp", /* WINED3DSIH_ROUND_NE */ "round_ne", /* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_ROUND_PI */ "round_pi", @@ -2739,7 +2740,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); if (ins.handler_idx == WINED3DSIH_BREAKP - || ins.handler_idx == WINED3DSIH_IF) + || ins.handler_idx == WINED3DSIH_IF + || ins.handler_idx == WINED3DSIH_RETP) { switch (ins.flags) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fbc2f51..614b545 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -174,6 +174,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RESINFO = 0x3d, WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_RETC = 0x3f, WINED3D_SM4_OP_ROUND_NE = 0x40, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_ROUND_PI = 0x42, @@ -891,6 +892,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "u", "uu"}, {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "f", "iR"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, + {WINED3D_SM4_OP_RETC, WINED3DSIH_RETP, "", "u", + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_ROUND_NE, WINED3DSIH_ROUND_NE, "f", "f"}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "f", "f"}, {WINED3D_SM4_OP_ROUND_PI, WINED3DSIH_ROUND_PI, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 676e982..600fc04 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -831,6 +831,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_REP, WINED3DSIH_RESINFO, WINED3DSIH_RET, + WINED3DSIH_RETP, WINED3DSIH_ROUND_NE, WINED3DSIH_ROUND_NI, WINED3DSIH_ROUND_PI,

1 0

Józef Kucia : wined3d: Fix atomics for raw thread group shared memory.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 08b8c5b2074664ef1b9c7b976e2d0d21f36379f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b8c5b2074664ef1b9c7b976… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:36 2017 +0200 wined3d: Fix atomics for raw thread group shared memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c5017cb..a4221e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5405,7 +5405,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &offset); string_buffer_sprintf(address, "%s", offset.param_str); - if (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW) + if (is_tgsm || (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW)) shader_addline(address, "/ 4"); }

1 0

Józef Kucia : d3d11/tests: Add test for gather4 instructions.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 4329552a64cbb7a0c17d552843ac8f518d794a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4329552a64cbb7a0c17d55284… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:37 2017 +0200 d3d11/tests: Add test for gather4 instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 318 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4329552a64cbb7a0c17d5…

1 0

Jacek Caban : ws2_32: Store async callback in ws2_async_io struct.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: f6cd817531c24add1888023f4c68fd2bad28e1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cd817531c24add1888023f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:20:27 2017 +0200 ws2_32: Store async callback in ws2_async_io struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 57 +++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6cd817531c24add18880…

1 0

Jacek Caban : ntdll: Store async callback in async_fileio struct.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: b82782a9c1a6413512d0fa3016cdcc236f92a0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82782a9c1a6413512d0fa301… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:20:38 2017 +0200 ntdll: Store async callback in async_fileio struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c153e7b..d97c4dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -346,8 +346,11 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB * Asynchronous file I/O * */ +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); + struct async_fileio { + async_callback_t *callback; /* must be the first field */ struct async_fileio *next; HANDLE handle; PIO_APC_ROUTINE apc; @@ -391,7 +394,8 @@ static void release_fileio( struct async_fileio *io ) } } -static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROUTINE apc, void *arg ) +static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle, + PIO_APC_ROUTINE apc, void *arg ) { /* first free remaining previous fileinfos */ @@ -406,9 +410,10 @@ static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROU if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - io->handle = handle; - io->apc = apc; - io->apc_arg = arg; + io->callback = callback; + io->handle = handle; + io->apc = apc; + io->apc_arg = arg; } return io; } @@ -558,7 +563,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; @@ -605,7 +610,7 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; @@ -783,7 +788,7 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, struct async_fileio_read *fileio; NTSTATUS status; - if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), handle, apc, apc_user ))) + if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), FILE_AsyncReadService, handle, apc, apc_user ))) return STATUS_NO_MEMORY; fileio->already = already; @@ -1345,7 +1350,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { struct async_fileio_write *fileio; - fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), FILE_AsyncWriteService, hFile, apc, apc_user ); if (!fileio) { status = STATUS_NO_MEMORY; @@ -1539,7 +1544,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; async->buffer = out_buffer; @@ -1961,7 +1966,7 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP if (filter == 0 || (filter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; fileio = (struct read_changes_fileio *)alloc_fileio( offsetof(struct read_changes_fileio, data[size]), - handle, apc, apc_context ); + read_changes_apc, handle, apc, apc_context ); if (!fileio) return STATUS_NO_MEMORY; fileio->buffer = buffer;

1 0

Jacek Caban : ntdll: Use callback stored in async user for calling APC_ASYNC_IO.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 05410c4aa6f4d0c710e3d82eb41bfdad825c4b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05410c4aa6f4d0c710e3d82eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:20:51 2017 +0200 ntdll: Use callback stored in async user for calling APC_ASYNC_IO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ac3183b..ed77aa5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -406,10 +406,9 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { void *apc = NULL, *arg = NULL; IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (*func)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.func ); + NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.user ); result->type = call->type; - result->async_io.status = func( wine_server_get_ptr( call->async_io.user ), - iosb, call->async_io.status, &apc, &arg ); + 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;

1 0

Jacek Caban : ntdll: Introduce server_async helper.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: d92bb525b175c5bdf6fb4e09a34048819d9f34ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92bb525b175c5bdf6fb4e09a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:04 2017 +0200 ntdll: Introduce server_async helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 83 ++++++++++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d97c4dd..6273254 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -418,6 +418,19 @@ static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, return io; } +static async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) +{ + async_data_t async; + async.handle = wine_server_obj_handle( handle ); + async.callback = wine_server_client_ptr( user ? user->callback : 0 ); + async.arg = wine_server_client_ptr( user ); + async.iosb = wine_server_client_ptr( io ); + async.event = wine_server_obj_handle( event ); + async.cvalue = wine_server_client_ptr( apc ? 0 : apc_context ); + return async; +} + /* callback for irp async I/O completion */ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ) { @@ -561,7 +574,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a NTSTATUS status; HANDLE wait_handle; ULONG options; - ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; @@ -572,14 +584,9 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a SERVER_START_REQ( read ) { - req->blocking = !apc && !event && !cvalue; - req->async.handle = wine_server_obj_handle( handle ); - req->async.callback = wine_server_client_ptr( irp_completion ); - req->async.iosb = wine_server_client_ptr( io ); - req->async.arg = wine_server_client_ptr( async ); - req->async.event = wine_server_obj_handle( event ); - req->async.cvalue = cvalue; - req->pos = offset ? offset->QuadPart : 0; + req->blocking = !apc && !event && !apc_context; + req->async = server_async( handle, &async->io, event, apc, apc_context, io ); + req->pos = offset ? offset->QuadPart : 0; wine_server_set_reply( req, buffer, size ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); @@ -608,7 +615,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE NTSTATUS status; HANDLE wait_handle; ULONG options; - ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; @@ -619,14 +625,9 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE SERVER_START_REQ( write ) { - req->blocking = !apc && !event && !cvalue; - req->async.handle = wine_server_obj_handle( handle ); - req->async.callback = wine_server_client_ptr( irp_completion ); - req->async.iosb = wine_server_client_ptr( io ); - req->async.arg = wine_server_client_ptr( async ); - req->async.event = wine_server_obj_handle( event ); - req->async.cvalue = cvalue; - req->pos = offset ? offset->QuadPart : 0; + req->blocking = !apc && !event && !apc_context; + req->async = server_async( handle, &async->io, event, apc, apc_context, io ); + req->pos = offset ? offset->QuadPart : 0; wine_server_add_data( req, buffer, size ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); @@ -784,7 +785,6 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, IO_STATUS_BLOCK *iosb, void *buffer, ULONG already, ULONG length, BOOL avail_mode ) { - ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; struct async_fileio_read *fileio; NTSTATUS status; @@ -800,12 +800,7 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, { req->type = ASYNC_TYPE_READ; req->count = length; - req->async.handle = wine_server_obj_handle( handle ); - req->async.event = wine_server_obj_handle( event ); - req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( fileio ); - req->async.cvalue = cvalue; + req->async = server_async( handle, &fileio->io, event, apc, apc_user, iosb ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -1364,12 +1359,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { req->type = ASYNC_TYPE_WRITE; req->count = length; - req->async.handle = wine_server_obj_handle( hFile ); - req->async.event = wine_server_obj_handle( hEvent ); - req->async.callback = wine_server_client_ptr( FILE_AsyncWriteService ); - req->async.iosb = wine_server_client_ptr( io_status ); - req->async.arg = wine_server_client_ptr( fileio ); - req->async.cvalue = cvalue; + req->async = server_async( hFile, &fileio->io, hEvent, apc, apc_user, io_status ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -1542,7 +1532,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NTSTATUS status; HANDLE wait_handle; ULONG options; - ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; @@ -1552,14 +1541,9 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { - req->code = code; - req->blocking = !apc && !event && !cvalue; - req->async.handle = wine_server_obj_handle( handle ); - req->async.callback = wine_server_client_ptr( irp_completion ); - req->async.iosb = wine_server_client_ptr( io ); - req->async.arg = wine_server_client_ptr( async ); - req->async.event = wine_server_obj_handle( event ); - req->async.cvalue = cvalue; + req->code = code; + req->blocking = !apc && !event && !apc_context; + req->async = server_async( handle, &async->io, event, apc, apc_context, io ); wine_server_add_data( req, in_buffer, in_size ); if ((code & 3) != METHOD_BUFFERED) wine_server_add_data( req, out_buffer, out_size ); @@ -1957,7 +1941,6 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP struct read_changes_fileio *fileio; NTSTATUS status; ULONG size = max( 4096, buffer_size ); - ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; TRACE( "%p %p %p %p %p %p %u %u %d\n", handle, event, apc, apc_context, iosb, buffer, buffer_size, filter, subtree ); @@ -1975,15 +1958,10 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP SERVER_START_REQ( read_directory_changes ) { - req->filter = filter; - req->want_data = (buffer != NULL); - req->subtree = subtree; - req->async.handle = wine_server_obj_handle( handle ); - req->async.callback = wine_server_client_ptr( read_changes_apc ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( fileio ); - req->async.event = wine_server_obj_handle( event ); - req->async.cvalue = cvalue; + req->filter = filter; + req->want_data = (buffer != NULL); + req->subtree = subtree; + req->async = server_async( handle, &fileio->io, event, apc, apc_context, iosb ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -3452,9 +3430,8 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { SERVER_START_REQ( flush ) { - req->blocking = 1; /* always blocking */ - req->async.handle = wine_server_obj_handle( hFile ); - req->async.iosb = wine_server_client_ptr( IoStatusBlock ); + req->blocking = 1; /* always blocking */ + req->async = server_async( hFile, NULL, NULL, NULL, NULL, IoStatusBlock ); ret = wine_server_call( req ); hEvent = wine_server_ptr_handle( reply->event ); }

1 0

Jacek Caban : server: Pass APC in async_data_t.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 28c339031fcfd5c6359e1ec286f47e7f1fad2ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c339031fcfd5c6359e1ec28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:31 2017 +0200 server: Pass APC in async_data_t. Also don't pass callback pointer that's not used anymore. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 12 ++++++------ dlls/ws2_32/socket.c | 14 +++++++------- include/wine/server_protocol.h | 9 ++++----- server/async.c | 11 +++++------ server/protocol.def | 7 +++---- server/trace.c | 11 ++++++----- 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6273254..cf4edb7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -422,12 +422,12 @@ static async_data_t server_async( HANDLE handle, struct async_fileio *user, HAND PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) { async_data_t async; - async.handle = wine_server_obj_handle( handle ); - async.callback = wine_server_client_ptr( user ? user->callback : 0 ); - async.arg = wine_server_client_ptr( user ); - async.iosb = wine_server_client_ptr( io ); - async.event = wine_server_obj_handle( event ); - async.cvalue = wine_server_client_ptr( apc ? 0 : apc_context ); + async.handle = wine_server_obj_handle( handle ); + async.user = wine_server_client_ptr( user ); + async.iosb = wine_server_client_ptr( io ); + async.event = wine_server_obj_handle( event ); + async.apc = wine_server_client_ptr( apc ); + async.apc_context = wine_server_client_ptr( apc_context ); return async; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index efeb0f3..5bf0482 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -572,13 +572,13 @@ static NTSTATUS register_async( int type, HANDLE handle, struct ws2_async_io *as SERVER_START_REQ( register_async ) { - req->type = type; - req->async.handle = wine_server_obj_handle( handle ); - req->async.callback = wine_server_client_ptr( async->callback ); - req->async.arg = wine_server_client_ptr( async ); - req->async.iosb = wine_server_client_ptr( io ); - req->async.event = wine_server_obj_handle( event ); - req->async.cvalue = wine_server_client_ptr( apc ? 0 : apc_context ); + req->type = type; + req->async.handle = wine_server_obj_handle( handle ); + req->async.user = wine_server_client_ptr( async ); + req->async.iosb = wine_server_client_ptr( io ); + req->async.event = wine_server_obj_handle( event ); + req->async.apc = wine_server_client_ptr( apc ); + req->async.apc_context = wine_server_client_ptr( apc_context ); status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ee9fdd1..f1ae41cd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -252,10 +252,10 @@ typedef struct { obj_handle_t handle; obj_handle_t event; - client_ptr_t callback; client_ptr_t iosb; - client_ptr_t arg; - apc_param_t cvalue; + client_ptr_t user; + client_ptr_t apc; + apc_param_t apc_context; } async_data_t; @@ -463,7 +463,6 @@ typedef union { enum apc_type type; unsigned int status; - client_ptr_t func; client_ptr_t user; client_ptr_t sb; } async_io; @@ -6412,6 +6411,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 524 +#define SERVER_PROTOCOL_VERSION 525 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index e113681..ba80721 100644 --- a/server/async.c +++ b/server/async.c @@ -180,14 +180,13 @@ void async_terminate( struct async *async, unsigned int status ) async->status = status; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; - if (async->data.callback) + if (async->data.user) { apc_call_t data; memset( &data, 0, sizeof(data) ); data.type = APC_ASYNC_IO; - data.async_io.func = async->data.callback; - data.async_io.user = async->data.arg; + data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; data.async_io.status = status; thread_queue_apc( async->thread, &async->obj, &data ); @@ -328,8 +327,8 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->status = status; if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ - if (async->queue && async->data.cvalue) - add_async_completion( async->queue, async->data.cvalue, status, total ); + if (async->queue && !async->data.apc && async->data.apc_context) + add_async_completion( async->queue, async->data.apc_context, status, total ); if (apc) { apc_call_t data; @@ -504,7 +503,7 @@ DECL_HANDLER(get_async_result) struct async *async; LIST_FOR_EACH_ENTRY( async, &current->process->asyncs, struct async, process_entry ) - if (async->data.arg == req->user_arg) + if (async->data.user == req->user_arg) { iosb = async->iosb; break; diff --git a/server/protocol.def b/server/protocol.def index 60865a6..204df9c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -268,10 +268,10 @@ typedef struct { obj_handle_t handle; /* object to perform I/O on */ obj_handle_t event; /* event to signal when done */ - client_ptr_t callback; /* client-side callback to call upon end of async */ client_ptr_t iosb; /* I/O status block in client addr space */ - client_ptr_t arg; /* opaque user data to pass to callback */ - apc_param_t cvalue; /* completion value to use for completion events */ + client_ptr_t user; /* opaque user data containing callback pointer and async-specific data */ + client_ptr_t apc; /* user APC to call */ + apc_param_t apc_context; /* user APC context or completion value */ } async_data_t; /* structures for extra message data */ @@ -479,7 +479,6 @@ typedef union { enum apc_type type; /* APC_ASYNC_IO */ unsigned int status; /* I/O status */ - client_ptr_t func; /* unsigned int (*func)(void*, void*, unsigned int, void**, void**); */ client_ptr_t user; /* user pointer */ client_ptr_t sb; /* status block */ } async_io; diff --git a/server/trace.c b/server/trace.c index e0ce45a..febd2f7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -158,8 +158,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( ",arg=", &call->timer.arg ); break; case APC_ASYNC_IO: - dump_uint64( "APC_ASYNC_IO,func=", &call->async_io.func ); - dump_uint64( ",user=", &call->async_io.user ); + dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user ); dump_uint64( ",sb=", &call->async_io.sb ); fprintf( stderr, ",status=%s", get_status_name(call->async_io.status) ); break; @@ -305,10 +304,10 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) static void dump_async_data( const char *prefix, const async_data_t *data ) { fprintf( stderr, "%s{handle=%04x,event=%04x", prefix, data->handle, data->event ); - dump_uint64( ",callback=", &data->callback ); dump_uint64( ",iosb=", &data->iosb ); - dump_uint64( ",arg=", &data->arg ); - dump_uint64( ",cvalue=", &data->cvalue ); + dump_uint64( ",user=", &data->user ); + dump_uint64( ",apc=", &data->apc ); + dump_uint64( ",apc_context=", &data->apc_context ); fputc( '}', stderr ); } @@ -5367,6 +5366,7 @@ static const struct { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, { "HOST_UNREACHABLE", STATUS_HOST_UNREACHABLE }, { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, + { "INFO_LENGTH_MISMATCH", STATUS_INFO_LENGTH_MISMATCH }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, { "INSUFFICIENT_RESOURCES", STATUS_INSUFFICIENT_RESOURCES }, { "INVALID_CID", STATUS_INVALID_CID }, @@ -5413,6 +5413,7 @@ static const struct { "OBJECT_PATH_SYNTAX_BAD", STATUS_OBJECT_PATH_SYNTAX_BAD }, { "OBJECT_TYPE_MISMATCH", STATUS_OBJECT_TYPE_MISMATCH }, { "PENDING", STATUS_PENDING }, + { "PIPE_BROKEN", STATUS_PIPE_BROKEN }, { "PIPE_CONNECTED", STATUS_PIPE_CONNECTED }, { "PIPE_DISCONNECTED", STATUS_PIPE_DISCONNECTED }, { "PIPE_LISTENING", STATUS_PIPE_LISTENING },

1 0

Jacek Caban : server: Use stored APC in async_set_result.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 5c0e2965bca081f34b01c369b40a63da94697803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0e2965bca081f34b01c369b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:41 2017 +0200 server: Use stored APC in async_set_result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 11 +++++------ server/file.h | 3 +-- server/thread.c | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/server/async.c b/server/async.c index ba80721..7323047 100644 --- a/server/async.c +++ b/server/async.c @@ -191,7 +191,7 @@ void async_terminate( struct async *async, unsigned int status ) data.async_io.status = status; thread_queue_apc( async->thread, &async->obj, &data ); } - else async_set_result( &async->obj, STATUS_SUCCESS, 0, 0, 0 ); + else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); async_reselect( async ); if (async->queue) release_object( async ); /* so that it gets destroyed when the async is done */ @@ -300,8 +300,7 @@ static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, } /* store the result of the client-side async callback */ -void async_set_result( struct object *obj, unsigned int status, apc_param_t total, - client_ptr_t apc, client_ptr_t apc_arg ) +void async_set_result( struct object *obj, unsigned int status, apc_param_t total ) { struct async *async = (struct async *)obj; @@ -329,13 +328,13 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->queue && !async->data.apc && async->data.apc_context) add_async_completion( async->queue, async->data.apc_context, status, total ); - if (apc) + if (async->data.apc) { apc_call_t data; memset( &data, 0, sizeof(data) ); data.type = APC_USER; - data.user.func = apc; - data.user.args[0] = apc_arg; + data.user.func = async->data.apc; + data.user.args[0] = async->data.apc_context; data.user.args[1] = async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); diff --git a/server/file.h b/server/file.h index 398733c..94cc37f 100644 --- a/server/file.h +++ b/server/file.h @@ -178,8 +178,7 @@ extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); -extern void async_set_result( struct object *obj, unsigned int status, - apc_param_t total, client_ptr_t apc, client_ptr_t apc_arg ); +extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); diff --git a/server/thread.c b/server/thread.c index 67f976d..10a5bf1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1484,8 +1484,7 @@ DECL_HANDLER(select) else if (apc->result.type == APC_ASYNC_IO) { if (apc->owner) - async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total, - apc->result.async_io.apc, apc->result.async_io.arg ); + async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total ); } wake_up( &apc->obj, 0 ); close_handle( current->process, req->prev_apc );

1 0

Jacek Caban : server: Removed no longed needed APC from APC_ASYNC_IO reply.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: fbf241034c94b3dcf622522dc01d1b3d679d6bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf241034c94b3dcf622522dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:49 2017 +0200 server: Removed no longed needed APC from APC_ASYNC_IO reply. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ed77aa5..e906898 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 f1ae41cd..6c80dab 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 204df9c..222ff95 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 febd2f7..5ebd909 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",

1 0