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

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 : 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 : 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

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

Henri Verbeet : wined3d: Unify the 2D and 3D paths in wined3d_device_update_texture().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: c1ebab1a4b19f71e1f421f74efc674ff2d936a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ebab1a4b19f71e1f421f74e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:32 2017 +0200 wined3d: Unify the 2D and 3D paths in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 108 ++++++++++++++++------------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 42 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bf3600..d2b30eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3542,6 +3542,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { unsigned int src_size, dst_size, src_skip_levels = 0; + unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; unsigned int row_pitch, slice_pitch; enum wined3d_resource_type type; @@ -3591,8 +3592,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - level_count = min(wined3d_texture_get_level_count(src_texture), - wined3d_texture_get_level_count(dst_texture)); + src_level_count = src_texture->level_count; + dst_level_count = dst_texture->level_count; + level_count = min(src_level_count, dst_level_count); src_size = max(src_texture->resource.width, src_texture->resource.height); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); @@ -3615,88 +3617,60 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL, 0); + + /* Make sure that the destination texture is loaded. */ wined3d_texture_load(dst_texture, context, FALSE); - context_release(context); + + /* Only a prepare, since we're uploading entire sub-resources. */ + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); /* Update every surface level of the texture. */ - switch (type) + for (i = 0; i < level_count; ++i) { - case WINED3D_RTYPE_TEXTURE_2D: + for (j = 0; j < layer_count; ++j) { - unsigned int src_levels = src_texture->level_count; - unsigned int dst_levels = dst_texture->level_count; - struct wined3d_surface *src_surface; - struct wined3d_surface *dst_surface; + unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; + unsigned int dst_sub_resource_idx = j * dst_level_count + i; - for (i = 0; i < layer_count; ++i) + /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ + if (dst_texture->resource.format->convert + || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) { - for (j = 0; j < level_count; ++j) + SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, + src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) { - unsigned int src_sub_resource_idx = i * src_levels + j + src_skip_levels; - unsigned int dst_sub_resource_idx = i * dst_levels + j; - - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, j), - wined3d_texture_get_level_height(dst_texture, j)); - if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, - src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; - } - continue; - } - - src_surface = src_texture->sub_resources[src_sub_resource_idx].u.surface; - dst_surface = dst_texture->sub_resources[dst_sub_resource_idx].u.surface; - if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; - } + WARN("Failed to update surface, hr %#x.\n", hr); + context_release(context); + return hr; } + continue; } - return WINED3D_OK; - } - case WINED3D_RTYPE_TEXTURE_3D: - context = context_acquire(device, NULL, 0); - - /* Only a prepare, since we're uploading entire volumes. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - - for (j = 0; j < level_count; ++j) + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, + context, src_texture->resource.map_binding)) { - if (!wined3d_texture_load_location(src_texture, src_skip_levels + j, - context, src_texture->resource.map_binding)) - { - WARN("Failed to load source sub-resource %u into %s.\n", src_skip_levels + j, - wined3d_debug_location(src_texture->resource.map_binding)); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - - wined3d_texture_get_memory(src_texture, src_skip_levels + j, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_skip_levels + j, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, j, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, j, ~WINED3D_LOCATION_TEXTURE_RGB); + WARN("Failed to load source sub-resource %u into %s.\n", src_sub_resource_idx, + wined3d_debug_location(src_texture->resource.map_binding)); + context_release(context); + return WINED3DERR_INVALIDCALL; } - context_release(context); - return WINED3D_OK; + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, src_skip_levels + i, &row_pitch, &slice_pitch); - default: - FIXME("Unsupported texture type %#x.\n", type); - return WINED3DERR_INVALIDCALL; + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, NULL, + wined3d_const_bo_address(&data), row_pitch, slice_pitch); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + } } + + context_release(context); + + return WINED3D_OK; } HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c9d9c10..c0f9491 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -866,7 +866,7 @@ static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surfac return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &box)); } -HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, +static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b40e132..9f98136 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3085,8 +3085,6 @@ BOOL surface_load_location(struct wined3d_surface *surface, void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, - struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Implement wined3d_device_update_texture() on top of wined3d_cs_emit_blt_sub_resource().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 4c8b3e0d19a9c10400311419b605bf016e65bd05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3e0d19a9c10400311419b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:33 2017 +0200 wined3d: Implement wined3d_device_update_texture() on top of wined3d_cs_emit_blt_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 61 ++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2b30eb..a43e080 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3544,12 +3544,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; - unsigned int row_pitch, slice_pitch; + unsigned int width, height, depth; enum wined3d_resource_type type; - struct wined3d_context *context; - struct wined3d_bo_address data; - HRESULT hr; - RECT r; + struct wined3d_box box; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3617,59 +3614,23 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - context = context_acquire(device, NULL, 0); - - /* Make sure that the destination texture is loaded. */ - wined3d_texture_load(dst_texture, context, FALSE); - - /* Only a prepare, since we're uploading entire sub-resources. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { + width = wined3d_texture_get_level_width(dst_texture, i); + height = wined3d_texture_get_level_height(dst_texture, i); + depth = wined3d_texture_get_level_depth(dst_texture, i); + wined3d_box_set(&box, 0, 0, width, height, 0, depth); + for (j = 0; j < layer_count; ++j) { - unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; - unsigned int dst_sub_resource_idx = j * dst_level_count + i; - - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); - if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, - src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - context_release(context); - return hr; - } - continue; - } - - if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, - context, src_texture->resource.map_binding)) - { - WARN("Failed to load source sub-resource %u into %s.\n", src_sub_resource_idx, - wined3d_debug_location(src_texture->resource.map_binding)); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_skip_levels + i, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, j * dst_level_count + i, &box, + &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, + 0, NULL, WINED3D_TEXF_POINT); } } - context_release(context); - return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Require a valid destination point in surface_upload_from_surface().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: f243302ed527cb892645ceb225b347768d08e529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f243302ed527cb892645ceb22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:34 2017 +0200 wined3d: Require a valid destination point in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c0f9491..dfb083d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -878,25 +878,12 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; - RECT r, dst_rect; - POINT p; + RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - if (!dst_point) - { - p.x = 0; - p.y = 0; - dst_point = &p; - } - else if (dst_point->x < 0 || dst_point->y < 0) - { - WARN("Invalid destination point.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!src_rect) { SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), @@ -910,21 +897,14 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, return WINED3DERR_INVALIDCALL; } - update_w = src_rect->right - src_rect->left; - update_h = src_rect->bottom - src_rect->top; - SetRect(&dst_rect, dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h); - if (!wined3d_surface_check_rect_dimensions(dst_surface, &dst_rect)) - { - WARN("Destination rectangle not block-aligned.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; /* Only load the surface for partial updates. For newly allocated texture * the texture wouldn't be the current location, and we'd upload zeroes * just to overwrite them again. */ + update_w = src_rect->right - src_rect->left; + update_h = src_rect->bottom - src_rect->top; if (update_w == wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level) && update_h == wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)) wined3d_texture_prepare_texture(dst_texture, context, FALSE);

1 0

Henri Verbeet : wined3d: Require a valid source rectangle in surface_upload_from_surface().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 2310378042e50690adc130129a69ec6907035cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2310378042e50690adc130129… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:35 2017 +0200 wined3d: Require a valid source rectangle in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dfb083d..d809282 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -859,13 +859,6 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } } -static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surface, const RECT *rect) -{ - struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - - return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &box)); -} - static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { @@ -878,25 +871,11 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; - RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - if (!src_rect) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), - wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); - src_rect = &r; - } - - if (!wined3d_surface_check_rect_dimensions(src_surface, src_rect)) - { - WARN("Source rectangle not block-aligned.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 6a307598b19813bd5a65982eb2e8d4df43e08207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a307598b19813bd5a65982eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:36 2017 +0200 wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 17 ++++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d97f467..88667b4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5518,7 +5518,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6fe7c8b..65bc8fc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17618,7 +17618,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6997378..3219305 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1639,8 +1639,8 @@ 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; - unsigned int sub_resource_idx; TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); @@ -1649,19 +1649,22 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, WARN("Invalid layer %u specified.\n", layer); return WINED3DERR_INVALIDCALL; } - sub_resource_idx = layer * texture->level_count; if (dirty_region) FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); context = context_acquire(texture->resource.device, NULL, 0); - if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + sub_resource_idx = layer * texture->level_count; + for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) { - ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); - context_release(context); - return E_OUTOFMEMORY; + 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); } - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); context_release(context); return WINED3D_OK;

1 0

Nikolay Sivov : dwrite: Improve font objects refcounting.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: be5a4656bd299f0b2d42623a8112bdb7eba61f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a4656bd299f0b2d42623a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:32 2017 +0300 dwrite: Improve font objects refcounting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 15 +- dlls/dwrite/font.c | 186 +++++++++------- dlls/dwrite/gdiinterop.c | 40 +++- dlls/dwrite/main.c | 79 ++++--- dlls/dwrite/tests/font.c | 512 ++++++++++++++++++++++++++++++++++++------- 5 files changed, 617 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be5a4656bd299f0b2d426…

1 0