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

Jakub Bartmiński : regedit: Fall back to tree root on invalid path.
by Alexandre Julliard April 11, 2017

April 11, 2017

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 : server: Pass APC in async_data_t.
by Alexandre Julliard April 11, 2017

April 11, 2017

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 : ntdll: Introduce server_async helper.
by Alexandre Julliard April 11, 2017

April 11, 2017

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 : ws2_32: Store async callback in ws2_async_io struct.
by Alexandre Julliard April 11, 2017

April 11, 2017

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

Józef Kucia : wined3d: Implement SM4 retc instruction.
by Alexandre Julliard April 11, 2017

April 11, 2017

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: Implement SM5 gather4_po instruction.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 14dd2026f6ef554c066c6e3ea173c32ab3dcff50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14dd2026f6ef554c066c6e3ea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:34 2017 +0200 wined3d: Implement SM5 gather4_po 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 | 26 +++++++++++++++++--------- dlls/wined3d/shader.c | 6 ++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 446d649..a681997 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5125,6 +5125,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GATHER4_C */ NULL, + /* WINED3DSIH_GATHER4_PO */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fada746..b5df3a3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5926,13 +5926,13 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) { + unsigned int resource_param_idx, resource_idx, sampler_idx, sampler_bind_idx, component_idx; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); - unsigned int resource_idx, sampler_idx, sampler_bind_idx, component_idx; + struct glsl_src_param coord_param, compare_param, offset_param; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const struct wined3d_shader_resource_info *resource_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param coord_param, compare_param; unsigned int coord_size, offset_size; char dst_swizzle[6]; BOOL has_offset; @@ -5943,14 +5943,16 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) return; } - has_offset = wined3d_shader_instruction_has_texel_offset(ins); + has_offset = ins->handler_idx == WINED3DSIH_GATHER4_PO + || wined3d_shader_instruction_has_texel_offset(ins); - resource_idx = ins->src[1].reg.idx[0].offset; - sampler_idx = ins->src[2].reg.idx[0].offset; - component_idx = shader_glsl_swizzle_get_component(ins->src[2].swizzle, 0); + resource_param_idx = ins->handler_idx == WINED3DSIH_GATHER4_PO ? 2 : 1; + resource_idx = ins->src[resource_param_idx].reg.idx[0].offset; + sampler_idx = ins->src[resource_param_idx + 1].reg.idx[0].offset; + component_idx = shader_glsl_swizzle_get_component(ins->src[resource_param_idx + 1].swizzle, 0); sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); - if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[resource_param_idx].reg))) return; if (resource_info->type >= ARRAY_SIZE(resource_type_info)) @@ -5960,7 +5962,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) } shader_glsl_get_coord_size(resource_info->type, &coord_size, &offset_size); - shader_glsl_swizzle_to_str(ins->src[1].swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_swizzle_to_str(ins->src[resource_param_idx].swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], resource_info->data_type); shader_glsl_add_src_param(ins, &ins->src[0], (1u << coord_size) - 1, &coord_param); @@ -5972,7 +5974,12 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); shader_addline(buffer, ", %s", compare_param.param_str); } - if (has_offset) + if (ins->handler_idx == WINED3DSIH_GATHER4_PO) + { + shader_glsl_add_src_param(ins, &ins->src[1], (1u << offset_size) - 1, &offset_param); + shader_addline(buffer, ", %s", offset_param.param_str); + } + else if (has_offset) { int offset_immdata[4] = {ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w}; shader_addline(buffer, ", "); @@ -10049,6 +10056,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_C */ shader_glsl_gather4, + /* WINED3DSIH_GATHER4_PO */ shader_glsl_gather4, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index acf914b..e62056e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -145,6 +145,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GATHER4 */ "gather4", /* WINED3DSIH_GATHER4_C */ "gather4_c", + /* WINED3DSIH_GATHER4_PO */ "gather4_po", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", @@ -1460,6 +1461,11 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } + else if (ins.handler_idx == WINED3DSIH_GATHER4_PO) + { + shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, + ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); + } else if (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) { shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 3e8b1f2..fbc2f51 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -232,6 +232,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, + WINED3D_SM5_OP_GATHER4_PO = 0x7f, WINED3D_SM5_OP_RCP = 0x81, WINED3D_SM5_OP_F32TOF16 = 0x82, WINED3D_SM5_OP_F16TOF32 = 0x83, @@ -967,6 +968,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, + {WINED3D_SM5_OP_GATHER4_PO, WINED3DSIH_GATHER4_PO, "f", "fiRS"}, {WINED3D_SM5_OP_RCP, WINED3DSIH_RCP, "f", "f"}, {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "u", "f"}, {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f98136..676e982 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -761,6 +761,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOU, WINED3DSIH_GATHER4, WINED3DSIH_GATHER4_C, + WINED3DSIH_GATHER4_PO, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Józef Kucia : wined3d: Support SM5 variant of gather4.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 739ac1c264938c79a5abc796dc2ef23d7f2d21be URL: http://source.winehq.org/git/wine.git/?a=commit;h=739ac1c264938c79a5abc796d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:33 2017 +0200 wined3d: Support SM5 variant of gather4. 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7cd1698..fada746 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5928,9 +5928,9 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + unsigned int resource_idx, sampler_idx, sampler_bind_idx, component_idx; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const struct wined3d_shader_resource_info *resource_info; - unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param coord_param, compare_param; unsigned int coord_size, offset_size; @@ -5947,6 +5947,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; + component_idx = shader_glsl_swizzle_get_component(ins->src[2].swizzle, 0); sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) @@ -5977,6 +5978,8 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_addline(buffer, ", "); shader_glsl_append_imm_ivec(buffer, offset_immdata, offset_size); } + if (component_idx) + shader_addline(buffer, ", %u", component_idx); shader_addline(buffer, ")%s);\n", dst_swizzle); }

1 0

Józef Kucia : wined3d: Implement SM4.1 gather4 instruction.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 2fad01e59d3c7ca43b7ded35dc2c18b0a57e2a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fad01e59d3c7ca43b7ded35d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:31 2017 +0200 wined3d: Implement SM4.1 gather4 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/glsl_shader.c | 76 +++++++++++++++++++++++++++++++++++++++++----- dlls/wined3d/shader.c | 3 +- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 348de8f..c617393 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3434,6 +3434,18 @@ static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info, return shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]; } +static void shader_glsl_get_coord_size(enum wined3d_shader_resource_type resource_type, + unsigned int *coord_size, unsigned int *deriv_size) +{ + const BOOL is_array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY + || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; + + *coord_size = resource_type_info[resource_type].coord_size; + *deriv_size = *coord_size; + if (is_array) + --(*deriv_size); +} + static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { @@ -3450,7 +3462,6 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; const char *base = "texture", *type_part = "", *suffix = ""; unsigned int coord_size, deriv_size; - BOOL array; sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; @@ -3459,8 +3470,6 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } - array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY - || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) @@ -3500,12 +3509,9 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context string_buffer_sprintf(sample_function->name, "%s%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", offset ? "Offset" : "", suffix); - coord_size = resource_type_info[resource_type].coord_size; - deriv_size = coord_size; + shader_glsl_get_coord_size(resource_type, &coord_size, &deriv_size); if (shadow) ++coord_size; - if (array) - --deriv_size; sample_function->offset_size = offset ? deriv_size : 0; sample_function->coord_mask = (1u << coord_size) - 1; sample_function->deriv_mask = (1u << deriv_size) - 1; @@ -5918,6 +5924,58 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_shader_resource_info *resource_info; + unsigned int resource_idx, sampler_idx, sampler_bind_idx; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + unsigned int coord_size, offset_size; + struct glsl_src_param coord_param; + char dst_swizzle[6]; + BOOL has_offset; + + if (!gl_info->supported[ARB_TEXTURE_GATHER]) + { + FIXME("OpenGL implementation does not support textureGather.\n"); + return; + } + + has_offset = wined3d_shader_instruction_has_texel_offset(ins); + + resource_idx = ins->src[1].reg.idx[0].offset; + sampler_idx = ins->src[2].reg.idx[0].offset; + sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); + + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) + return; + + if (resource_info->type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_info->type); + return; + } + shader_glsl_get_coord_size(resource_info->type, &coord_size, &offset_size); + + shader_glsl_swizzle_to_str(ins->src[1].swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], resource_info->data_type); + + shader_glsl_add_src_param(ins, &ins->src[0], (1u << coord_size) - 1, &coord_param); + + shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", + has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); + if (has_offset) + { + int offset_immdata[4] = {ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w}; + shader_addline(buffer, ", "); + shader_glsl_append_imm_ivec(buffer, offset_immdata, offset_size); + } + + shader_addline(buffer, ")%s);\n", dst_swizzle); +} + static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ @@ -7004,6 +7062,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n"); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); + if (gl_info->supported[ARB_TEXTURE_GATHER]) + shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -9979,7 +10039,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, - /* WINED3DSIH_GATHER4 */ NULL, + /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3783006..f44ce28 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1448,7 +1448,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { --cur_loop_depth; } - else if (ins.handler_idx == WINED3DSIH_SAMPLE + else if (ins.handler_idx == WINED3DSIH_GATHER4 + || ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B || ins.handler_idx == WINED3DSIH_SAMPLE_C || ins.handler_idx == WINED3DSIH_SAMPLE_C_LZ

1 0

Alistair Leslie-Hughes : wmvcore/tests: Add initial tests.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 4ff2e36b59e0091d74f60d405a84fbc3e3dc8e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff2e36b59e0091d74f60d405… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 30 22:07:06 2017 +0000 wmvcore/tests: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/wmvcore/Makefile.in | 1 + dlls/wmvcore/tests/Makefile.in | 5 ++ dlls/wmvcore/tests/wmvcore.c | 142 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 152 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 34a84ca..93fd7e5 100755 --- a/configure +++ b/configure @@ -18483,7 +18483,8 @@ wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean wine_fn_config_test dlls/wmp/tests wmp_test -wine_fn_config_dll wmvcore enable_wmvcore +wine_fn_config_dll wmvcore enable_wmvcore implib +wine_fn_config_test dlls/wmvcore/tests wmvcore_test wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll wpc enable_wpc clean diff --git a/configure.ac b/configure.ac index fa27a6c..b231fe9 100644 --- a/configure.ac +++ b/configure.ac @@ -3517,7 +3517,8 @@ WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_TEST(dlls/wmp/tests) -WINE_CONFIG_DLL(wmvcore) +WINE_CONFIG_DLL(wmvcore,,[implib]) +WINE_CONFIG_TEST(dlls/wmvcore/tests) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(wpc,,[clean]) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index ba3539b..0ee6f97 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = wmvcore.dll +IMPORTLIB = wmvcore IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in new file mode 100644 index 0000000..8054ddd --- /dev/null +++ b/dlls/wmvcore/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wmvcore.dll +IMPORTS = ole32 wmvcore + +C_SRCS = \ + wmvcore.c diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c new file mode 100644 index 0000000..ef77aff --- /dev/null +++ b/dlls/wmvcore/tests/wmvcore.c @@ -0,0 +1,142 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#define WIN32_LEAN_AND_MEAN +#include "initguid.h" +#include "wmsdkidl.h" + +#include "wine/test.h" + +static void test_wmwriter_interfaces(void) +{ + HRESULT hr; + IWMWriter *writer; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + + hr = WMCreateWriter( NULL, &writer ); + ok(hr == S_OK, "WMCreateWriter failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMWriter\n"); + return; + } + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + IWMWriter_Release(writer); +} + +static void test_wmreader_interfaces(void) +{ + HRESULT hr; + IWMReader *reader; + IWMReaderAdvanced *advanced; + IWMReaderAdvanced2 *advanced2; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + + hr = WMCreateReader( NULL, 0, &reader ); + ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMReader\n"); + return; + } + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced, (void **)&advanced); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(advanced) + IWMReaderAdvanced_Release(advanced); + if(advanced2) + IWMReaderAdvanced2_Release(advanced2); + if(profile) + IWMProfile_Release(profile); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + + IWMReader_Release(reader); +} + +void test_profile_manager_interfaces(void) +{ + HRESULT hr; + IWMProfileManager *profile; + + hr = WMCreateProfileManager(&profile); + ok(hr == S_OK, "WMCreateProfileManager failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMProfileManager\n"); + return; + } + + IWMProfileManager_Release(profile); +} + +START_TEST(wmvcore) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "failed to init com\n"); + if(hr != S_OK) + return; + + test_wmreader_interfaces(); + test_wmwriter_interfaces(); + test_profile_manager_interfaces(); + + CoUninitialize(); +}

1 0

Jacek Caban : ntdll: Remove no longer needed APC from async_fileio.
by Alexandre Julliard April 11, 2017

April 11, 2017

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