wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : wined3d: The source texture is always non-NULL in surface_cpu_blt().
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 1b034f7fdb663d9681d1b623ce3782b7fba75c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b034f7fdb663d9681d1b623c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:22 2017 +0200 wined3d: The source texture is always non-NULL in surface_cpu_blt(). Since fills no longer go through the blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 543 ++++++++++++++++++++++++------------------------- 1 file changed, 263 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b034f7fdb663d9681d1b…

1 0

Henri Verbeet : wined3d: The destination width and height are always valid in surface_cpu_blt().
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 3e3685755783602de257ef89258a1ebad6d30959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3685755783602de257ef892… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:21 2017 +0200 wined3d: The destination width and height are always valid in surface_cpu_blt(). Since they have been validated by the caller. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d809282..a811d6a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2945,9 +2945,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { int sx, xinc, sy, yinc; - if (!dst_width || !dst_height) /* Hmm... stupid program? */ - goto release; - if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT && (src_width != dst_width || src_height != dst_height)) {

1 0

Henri Verbeet : wined3d: Send texture dirty region updates through the command stream.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: d6557e812984e010a989a3360039453eb978bd12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6557e812984e010a989a3360… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 12 00:08:50 2017 +0200 wined3d: Send texture dirty region updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 17 +--------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0866a16..85594e4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -65,6 +65,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UNMAP, WINED3D_CS_OP_BLT_SUB_RESOURCE, WINED3D_CS_OP_UPDATE_SUB_RESOURCE, + WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, }; struct wined3d_cs_present @@ -372,6 +373,13 @@ struct wined3d_cs_update_sub_resource struct wined3d_sub_resource_data data; }; +struct wined3d_cs_add_dirty_texture_region +{ + enum wined3d_cs_op opcode; + struct wined3d_texture *texture; + unsigned int layer; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1957,6 +1965,42 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r cs->ops->submit(cs); } +static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_add_dirty_texture_region *op = data; + struct wined3d_texture *texture = op->texture; + unsigned int sub_resource_idx, i; + struct wined3d_context *context; + + context = context_acquire(cs->device, NULL, 0); + sub_resource_idx = op->layer * texture->level_count; + for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) + { + if (wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); + else + ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); + } + context_release(context); + + wined3d_resource_release(&texture->resource); +} + +void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, + struct wined3d_texture *texture, unsigned int layer) +{ + struct wined3d_cs_add_dirty_texture_region *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION; + op->texture = texture; + op->layer = layer; + + wined3d_resource_acquire(&texture->resource); + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1998,6 +2042,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, /* WINED3D_CS_OP_BLT_SUB_RESOURCE */ wined3d_cs_exec_blt_sub_resource, /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, + /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3219305..2419616 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1639,9 +1639,6 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { - unsigned int sub_resource_idx, i; - struct wined3d_context *context; - TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); if (layer >= texture->layer_count) @@ -1653,19 +1650,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, if (dirty_region) FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); - context = context_acquire(texture->resource.device, NULL, 0); - sub_resource_idx = layer * texture->level_count; - for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) - { - if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) - { - ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); - context_release(context); - return E_OUTOFMEMORY; - } - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - } - context_release(context); + wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 600fc04..b39bc2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3243,6 +3243,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, + struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags,

1 0

Henri Verbeet : wined3d: Avoid modifying the device' s shader list outside the command stream.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 6302d5edf82b212d5d32838f40279d4304e60ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6302d5edf82b212d5d32838f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:19 2017 +0200 wined3d: Avoid modifying the device's shader list outside the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 208a09a..7927062 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3073,6 +3073,13 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } +static void wined3d_shader_init_object(void *object) +{ + struct wined3d_shader *shader = object; + + list_add_head(&shader->device->shaders, &shader->shader_list_entry); +} + static void wined3d_shader_destroy_object(void *object) { shader_cleanup(object); @@ -3327,7 +3334,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device list_init(&shader->constantsI); shader->lconst_inf_or_nan = FALSE; list_init(&shader->reg_maps.indexable_temps); - list_add_head(&device->shaders, &shader->shader_list_entry); + list_init(&shader->shader_list_entry); byte_code_size = desc->byte_code_size; if (byte_code_size == ~(size_t)0) @@ -3366,10 +3373,13 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); + return hr; } shader->load_local_constsF = shader->lconst_inf_or_nan; + wined3d_cs_init_object(shader->device->cs, wined3d_shader_init_object, shader); + return hr; } @@ -3429,7 +3439,7 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 *d = *so_desc; if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) { - shader_cleanup(shader); + wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); return E_OUTOFMEMORY; } memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements));

1 0

Jakub Bartmiński : regedit: Fall back to tree root on invalid path.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 9e35dd15454be28c487b0f1bebefbbe530b2aca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e35dd15454be28c487b0f1be… Author: Jakub Bartmiński <jakub.bartm(a)gmail.com> Date: Mon Apr 3 21:39:46 2017 +0200 regedit: Fall back to tree root on invalid path. Signed-off-by: Jakub Bartmiński <jakub.bartm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 378657d..4b5e1ca 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -132,13 +132,16 @@ static LPWSTR get_path_component(LPCWSTR *lplpKeyName) { HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { TVITEMEXW tvi; WCHAR buf[261]; /* tree view has 260 character limitation on item name */ - HTREEITEM hItem, hOldItem; + HTREEITEM hRoot, hItem, hOldItem; + BOOL valid_path; buf[260] = '\0'; - hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); + hRoot = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); + hItem = hRoot; SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hItem); hOldItem = hItem; + valid_path = FALSE; while(1) { LPWSTR lpItemName = get_path_component(&lpKeyName); @@ -150,6 +153,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { tvi.cchTextMax = 260; SendMessageW(hwndTV, TVM_GETITEMW, 0, (LPARAM) &tvi); if (!lstrcmpiW(tvi.pszText, lpItemName)) { + valid_path = TRUE; SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) { @@ -164,10 +168,10 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { } HeapFree(GetProcessHeap(), 0, lpItemName); if (!hItem) - return hOldItem; + return valid_path ? hOldItem : hRoot; } else - return hItem; + return valid_path ? hItem : hRoot; } }

1 0

Jacek Caban : services: Call RpcMgmtWaitServerListen in RPC_Stop.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 69608af0a960658fcb3b0958c395614f286bcaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69608af0a960658fcb3b0958c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 14:27:58 2017 +0200 services: Call RpcMgmtWaitServerListen in RPC_Stop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 08b5776a..8c95b7e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1958,6 +1958,7 @@ void RPC_Stop(void) { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(svcctl_v2_0_s_ifspec, NULL, TRUE); + RpcMgmtWaitServerListen(); CloseThreadpoolCleanupGroupMembers(cleanup_group, TRUE, NULL); CloseThreadpoolCleanupGroup(cleanup_group);

1 0

Jacek Caban : ntdll: Remove no longer needed APC from async_fileio.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: f8e9cdcaeb1a66106db79a523d0509cb202d342d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e9cdcaeb1a66106db79a523… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:56 2017 +0200 ntdll: Remove no longer needed APC from async_fileio. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 42979d5..264ad65 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -353,8 +353,6 @@ struct async_fileio async_callback_t *callback; /* must be the first field */ struct async_fileio *next; HANDLE handle; - PIO_APC_ROUTINE apc; - void *apc_arg; }; struct async_fileio_read @@ -394,8 +392,7 @@ static void release_fileio( struct async_fileio *io ) } } -static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle, - PIO_APC_ROUTINE apc, void *arg ) +static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle ) { /* first free remaining previous fileinfos */ @@ -412,8 +409,6 @@ static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, { io->callback = callback; io->handle = handle; - io->apc = apc; - io->apc_arg = arg; } return io; } @@ -570,7 +565,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a HANDLE wait_handle; ULONG options; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; async->event = event; @@ -611,7 +606,7 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE HANDLE wait_handle; ULONG options; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; async->event = event; @@ -783,7 +778,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), FILE_AsyncReadService, handle, apc, apc_user ))) + if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), FILE_AsyncReadService, handle ))) return STATUS_NO_MEMORY; fileio->already = already; @@ -1337,7 +1332,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { struct async_fileio_write *fileio; - fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), FILE_AsyncWriteService, hFile, apc, apc_user ); + fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), FILE_AsyncWriteService, hFile ); if (!fileio) { status = STATUS_NO_MEMORY; @@ -1525,7 +1520,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, HANDLE wait_handle; ULONG options; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; async->event = event; async->buffer = out_buffer; @@ -1938,7 +1933,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]), - read_changes_apc, handle, apc, apc_context ); + read_changes_apc, handle ); if (!fileio) return STATUS_NO_MEMORY; fileio->buffer = buffer;

1 0

Jacek Caban : ntdll: Remove no longer needed APC handling from APC_ASYNC_IO callbacks.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: e2469b2c3d385b2c3e5fcfdafe301d1248a94655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2469b2c3d385b2c3e5fcfdaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:41:29 2017 +0200 ntdll: Remove no longer needed APC handling from APC_ASYNC_IO callbacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 21 +++++---------------- dlls/ntdll/server.c | 5 ++--- dlls/ws2_32/socket.c | 37 ++++++++++--------------------------- 3 files changed, 17 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cf4edb7..42979d5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -346,7 +346,7 @@ 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 ); +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); struct async_fileio { @@ -432,7 +432,7 @@ static async_data_t server_async( HANDLE handle, struct async_fileio *user, HAND } /* callback for irp async I/O completion */ -static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ) +static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) { struct async_irp *async = user; ULONG information = 0; @@ -452,8 +452,6 @@ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status { io->u.Status = status; io->Information = information; - *apc = async->io.apc; - *arg = async->io.apc_arg; release_fileio( &async->io ); } return status; @@ -511,8 +509,7 @@ NTSTATUS FILE_GetNtStatus(void) /*********************************************************************** * FILE_AsyncReadService (INTERNAL) */ -static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -558,8 +555,6 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; release_fileio( &fileio->io ); } return status; @@ -1118,8 +1113,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap /*********************************************************************** * FILE_AsyncWriteService (INTERNAL) */ -static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -1161,8 +1155,6 @@ static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; release_fileio( &fileio->io ); } return status; @@ -1843,8 +1835,7 @@ struct read_changes_fileio char data[1]; }; -static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct read_changes_fileio *fileio = user; int size = 0; @@ -1914,8 +1905,6 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = size; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; release_fileio( &fileio->io ); } return status; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e906898..c02a12a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -404,11 +404,10 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) } case APC_ASYNC_IO: { - void *apc = NULL, *arg = NULL; IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.user ); + NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS) = wine_server_get_ptr( call->async_io.user ); result->type = call->type; - result->async_io.status = (*user)( user, iosb, call->async_io.status, &apc, &arg ); + result->async_io.status = (*user)( user, iosb, call->async_io.status ); if (result->async_io.status != STATUS_PENDING) result->async_io.total = iosb->Information; break; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5bf0482..9d27fab 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -470,7 +470,7 @@ static inline const char *debugstr_optval(const char *optval, int optlenval) * Async IO declarations ****************************************************************/ -typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); struct ws2_async_io { @@ -2399,8 +2399,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa, int flags ) * * Handler for overlapped recv() operations. */ -static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2437,12 +2436,7 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = result; - if (wsa->completion_func) - { - *apc = ws2_async_apc; - *arg = wsa; - } - else + if (!wsa->completion_func) release_async_io( &wsa->io ); } return status; @@ -2454,13 +2448,11 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, * This function is used to finish the read part of an accept request. It is * needed to place the completion on the correct socket (listener). */ -static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { - void *junk; struct ws2_accept_async *wsa = user; - status = WS2_async_recv( wsa->read, iosb, status, &junk, &junk ); + status = WS2_async_recv( wsa->read, iosb, status ); if (status == STATUS_PENDING) return status; @@ -2476,8 +2468,7 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, * * This is the function called to satisfy the AcceptEx callback */ -static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_accept_async *wsa = user; int len; @@ -2621,8 +2612,7 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) * * Handler for overlapped send() operations. */ -static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2665,12 +2655,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, if (status != STATUS_PENDING) { iosb->u.Status = status; - if (wsa->completion_func) - { - *apc = ws2_async_apc; - *arg = wsa; - } - else + if (!wsa->completion_func) release_async_io( &wsa->io ); } return status; @@ -2681,8 +2666,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, * * Handler for shutdown() operations on overlapped sockets. */ -static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_async_shutdown *wsa = user; int fd, err = 1; @@ -3040,8 +3024,7 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws * * Asynchronous callback for overlapped TransmitFile operations. */ -static NTSTATUS WS2_async_transmitfile( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_transmitfile( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_transmitfile_async *wsa = user; int fd;

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

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

← Newer
1
...
49
50
51
52
53
54
55
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017