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

Jacek Caban : server: Don't change cached thread context in set_thread_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 80ceafc2a1da1630be7665ca5d960a2972f9689e URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ceafc2a1da1630be7665ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:18 2020 +0200 server: Don't change cached thread context in set_thread_context. Let the caller take care of that. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 13 +------------ server/ptrace.c | 14 -------------- server/thread.c | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/server/mach.c b/server/mach.c index 3690b29004..69f3ee22a9 100644 --- a/server/mach.c +++ b/server/mach.c @@ -283,18 +283,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.dr7 = dr7; #endif } - if (!thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count )) - { - if (thread->context) /* update the cached values */ - { -#ifdef __x86_64__ - if (thread->process->cpu == CPU_x86_64) - thread->context->debug.x86_64_regs = context->debug.x86_64_regs; - else -#endif - thread->context->debug.i386_regs = context->debug.i386_regs; - } - } + thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); mach_port_deallocate( mach_task_self(), port ); #endif } diff --git a/server/ptrace.c b/server/ptrace.c index 6be1591d54..49347791d8 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -637,36 +637,24 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign /* Linux 2.6.33+ does DR0-DR3 alignment validation, so it has to know LEN bits first */ if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 & 0xffff0000 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr0 = context->debug.i386_regs.dr0; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr1 = context->debug.i386_regs.dr1; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr2 = context->debug.i386_regs.dr2; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.i386_regs.dr3 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr3 = context->debug.i386_regs.dr3; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.i386_regs.dr6 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr6 = context->debug.i386_regs.dr6; /* Linux 2.6.33+ needs enable bits set briefly to update value returned by PEEKUSER later */ ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case CPU_x86_64: if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr0 = context->debug.x86_64_regs.dr0; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr1 = context->debug.x86_64_regs.dr1; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr2 = context->debug.x86_64_regs.dr2; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.x86_64_regs.dr3 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr3 = context->debug.x86_64_regs.dr3; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.x86_64_regs.dr6 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr6 = context->debug.x86_64_regs.dr6; ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr7 = context->debug.x86_64_regs.dr7; thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; default: @@ -785,8 +773,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign #endif if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t)&dbregs, 0 ) != -1) { - if (thread->context) - thread->context->debug.i386_regs = context->debug.i386_regs; /* update the cached values */ thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; } else file_set_error(); diff --git a/server/thread.c b/server/thread.c index 0d3cb28f5c..534fab6597 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1823,7 +1823,7 @@ DECL_HANDLER(set_thread_context) if (system_flags) set_thread_context( thread, context, system_flags ); if (thread->context && !get_error()) { - copy_context( thread->context, context, client_flags ); + copy_context( thread->context, context, context->flags ); thread->context->flags |= client_flags; } }

1 0

Jacek Caban : server: Make thread context a server object.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 40e849ffa46ae3cd060e2db83305dda1c4d2648e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e849ffa46ae3cd060e2db8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:36 2020 +0200 server: Make thread context a server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++---------- server/thread.h | 2 +- 2 files changed, 70 insertions(+), 15 deletions(-) diff --git a/server/thread.c b/server/thread.c index 534fab6597..341693b7bd 100644 --- a/server/thread.c +++ b/server/thread.c @@ -126,6 +126,40 @@ static const struct object_ops thread_apc_ops = }; +/* thread CPU context */ + +struct context +{ + struct object obj; /* object header */ + context_t regs; /* context data */ +}; + +static void dump_context( struct object *obj, int verbose ); + +static const struct object_ops context_ops = +{ + sizeof(struct context), /* size */ + dump_context, /* dump */ + no_get_type, /* get_type */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + + /* thread operations */ static void dump_thread( struct object *obj, int verbose ); @@ -221,6 +255,27 @@ static inline int is_valid_address( client_ptr_t addr ) return addr && !(addr % sizeof(int)); } + +/* dump a context on stdout for debugging purposes */ +static void dump_context( struct object *obj, int verbose ) +{ + struct context *context = (struct context *)obj; + assert( obj->ops == &context_ops ); + + fprintf( stderr, "context flags=%x\n", context->regs.flags ); +} + + +static struct context *create_thread_context( struct thread *thread ) +{ + struct context *context; + if (!(context = alloc_object( &context_ops ))) return NULL; + memset( &context->regs, 0, sizeof(context->regs) ); + context->regs.cpu = thread->process->cpu; + return context; +} + + /* create a new thread */ struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { @@ -317,6 +372,11 @@ static void cleanup_thread( struct thread *thread ) { int i; + if (thread->context) + { + release_object( thread->context ); + thread->context = NULL; + } clear_apc_queue( &thread->system_apc ); clear_apc_queue( &thread->user_apc ); free( thread->req_data ); @@ -324,7 +384,6 @@ static void cleanup_thread( struct thread *thread ) if (thread->request_fd) release_object( thread->request_fd ); if (thread->reply_fd) release_object( thread->reply_fd ); if (thread->wait_fd) release_object( thread->wait_fd ); - free( thread->context ); cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); free_msg_queue( thread ); @@ -343,7 +402,6 @@ static void cleanup_thread( struct thread *thread ) thread->request_fd = NULL; thread->reply_fd = NULL; thread->wait_fd = NULL; - thread->context = NULL; thread->desktop = 0; thread->desc = NULL; thread->desc_len = 0; @@ -776,9 +834,9 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s if (thread->context && thread->suspend_cookie == cookie && signaled != STATUS_KERNEL_APC && signaled != STATUS_USER_APC) { - if (!thread->context->flags) + if (!thread->context->regs.flags) { - free( thread->context ); + release_object( thread->context ); thread->context = NULL; } else signaled = STATUS_KERNEL_APC; /* signal a fake APC so that client calls select to get a new context */ @@ -1556,9 +1614,8 @@ DECL_HANDLER(select) return; } - if (!(current->context = mem_alloc( sizeof(*context) ))) return; - memcpy( current->context, context, sizeof(*context) ); - current->context->flags = 0; /* to keep track of what is modified */ + if (!(current->context = create_thread_context( current ))) return; + copy_context( &current->context->regs, context, context->flags ); current->suspend_cookie = req->cookie; } @@ -1633,10 +1690,8 @@ DECL_HANDLER(select) else if (get_error() != STATUS_PENDING && get_reply_max_size() == sizeof(context_t) && current->context && current->suspend_cookie == req->cookie) { - if (current->context->flags) - set_reply_data_ptr( current->context, sizeof(context_t) ); - else - free( current->context ); + if (current->context->regs.flags) set_reply_data( &current->context->regs, sizeof(context_t) ); + release_object( current->context ); current->context = NULL; } } @@ -1777,7 +1832,7 @@ DECL_HANDLER(get_thread_context) context->cpu = thread->process->cpu; if (thread->context) { - copy_context( context, thread->context, req->flags & ~flags ); + copy_context( context, &thread->context->regs, req->flags & ~flags ); context->flags |= req->flags & ~flags; } if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); @@ -1823,8 +1878,8 @@ DECL_HANDLER(set_thread_context) if (system_flags) set_thread_context( thread, context, system_flags ); if (thread->context && !get_error()) { - copy_context( thread->context, context, context->flags ); - thread->context->flags |= client_flags; + copy_context( &thread->context->regs, context, context->flags ); + thread->context->regs.flags |= client_flags; } } else set_error( STATUS_INVALID_PARAMETER ); diff --git a/server/thread.h b/server/thread.h index b86d8d3dbe..5d12d24dd8 100644 --- a/server/thread.h +++ b/server/thread.h @@ -75,7 +75,7 @@ struct thread int exit_code; /* thread exit code */ int unix_pid; /* Unix pid of client */ int unix_tid; /* Unix tid of client */ - context_t *context; /* current context */ + struct context *context; /* current context */ client_ptr_t suspend_cookie;/* wait cookie of suspending select */ client_ptr_t teb; /* TEB address (in client address space) */ client_ptr_t entry_point; /* entry point (in client address space) */

1 0

Jacek Caban : server: Create thread context object in stop_thread.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 2960a973d1263118515df1022ba4e72b1c7c52ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2960a973d1263118515df102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:54 2020 +0200 server: Create thread context object in stop_thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/server/thread.c b/server/thread.c index 341693b7bd..07be868d48 100644 --- a/server/thread.c +++ b/server/thread.c @@ -131,6 +131,7 @@ static const struct object_ops thread_apc_ops = struct context { struct object obj; /* object header */ + unsigned int status; /* status of the context */ context_t regs; /* context data */ }; @@ -270,6 +271,7 @@ static struct context *create_thread_context( struct thread *thread ) { struct context *context; if (!(context = alloc_object( &context_ops ))) return NULL; + context->status = STATUS_PENDING; memset( &context->regs, 0, sizeof(context->regs) ); context->regs.cpu = thread->process->cpu; return context; @@ -374,6 +376,7 @@ static void cleanup_thread( struct thread *thread ) if (thread->context) { + thread->context->status = STATUS_ACCESS_DENIED; release_object( thread->context ); thread->context = NULL; } @@ -639,7 +642,8 @@ static void set_thread_info( struct thread *thread, /* stop a thread (at the Unix level) */ void stop_thread( struct thread *thread ) { - if (thread->context) return; /* already inside a debug event, no need for a signal */ + if (thread->context) return; /* already suspended, no need for a signal */ + if (!(thread->context = create_thread_context( thread ))) return; /* can't stop a thread while initialisation is in progress */ if (is_process_init_done(thread->process)) send_thread_signal( thread, SIGUSR1 ); } @@ -1463,7 +1467,7 @@ DECL_HANDLER(init_thread) reply->version = SERVER_PROTOCOL_VERSION; reply->server_start = server_start_time; reply->all_cpus = supported_cpus & get_prefix_cpu_mask(); - reply->suspend = (current->suspend || process->suspend); + reply->suspend = (current->suspend || process->suspend || current->context != NULL); return; error: @@ -1608,14 +1612,15 @@ DECL_HANDLER(select) if (get_req_data_size() - sizeof(*result) - req->size == sizeof(context_t)) { const context_t *context = (const context_t *)((const char *)(result + 1) + req->size); - if (current->context || context->cpu != current->process->cpu) + if ((current->context && current->context->status != STATUS_PENDING) || context->cpu != current->process->cpu) { set_error( STATUS_INVALID_PARAMETER ); return; } - if (!(current->context = create_thread_context( current ))) return; - copy_context( &current->context->regs, context, context->flags ); + if (!current->context && !(current->context = create_thread_context( current ))) return; + copy_context( &current->context->regs, context, context->flags & ~current->context->regs.flags ); + current->context->status = STATUS_SUCCESS; current->suspend_cookie = req->cookie; } @@ -1808,7 +1813,7 @@ DECL_HANDLER(get_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_GET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && !thread->context) + if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) { /* thread is not suspended, retry (if it's still running) */ if (thread->state == RUNNING) @@ -1854,7 +1859,7 @@ DECL_HANDLER(set_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && !thread->context) + if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) { /* thread is not suspended, retry (if it's still running) */ if (thread->state == RUNNING)

1 0

Henri Verbeet : wined3d: Implement wined3d_unordered_access_view_copy_counter() on top of wined3d_context_copy_bo_address().
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 6672708b027732b77f933fb2f691d07ad463d5b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6672708b027732b77f933fb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 22:55:12 2020 +0430 wined3d: Implement wined3d_unordered_access_view_copy_counter() on top of wined3d_context_copy_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cb0f2e2e25..a004ec9e0b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1059,21 +1059,20 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { - struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_bo_address dst, src; DWORD dst_location; - if (!view_gl->counter_bo.id) + if (!view->counter_bo) return; dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); dst.addr += offset; - src.buffer_object = (uintptr_t)&view_gl->counter_bo; + src.buffer_object = view->counter_bo; src.addr = NULL; - wined3d_context_gl_copy_bo_address(context_gl, &dst, &src, sizeof(GLuint)); + wined3d_context_copy_bo_address(context, &dst, buffer->resource.bind_flags, + &src, WINED3D_BIND_UNORDERED_ACCESS, sizeof(uint32_t)); wined3d_buffer_invalidate_location(buffer, ~dst_location); } @@ -1105,6 +1104,7 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); checkGLcall("create atomic counter buffer"); + view_gl->v.counter_bo = (uintptr_t)bo; } context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8698620968..5f0b1eee7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4582,6 +4582,7 @@ struct wined3d_unordered_access_view const struct wined3d_format *format; struct wined3d_view_desc desc; + uintptr_t counter_bo; }; void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Implement wined3d_unordered_access_view_set_counter() on top of wined3d_context_copy_bo_address().
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 53cad57ef5d3007dbecdd6e1d2a73804b9e260cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cad57ef5d3007dbecdd6e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 22:55:13 2020 +0430 wined3d: Implement wined3d_unordered_access_view_set_counter() on top of wined3d_context_copy_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a004ec9e0b..834eaa7102 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1041,18 +1041,22 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) { - struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); - const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; struct wined3d_context *context; - if (!view_gl->counter_bo.id) + if (!view->counter_bo) return; - context = context_acquire(view_gl->v.resource->device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view_gl->counter_bo.id)); - GL_EXTCALL(glBufferSubData(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(value), &value)); - checkGLcall("set atomic counter"); + context = context_acquire(view->resource->device, NULL, 0); + + src.buffer_object = 0; + src.addr = (void *)&value; + + dst.buffer_object = view->counter_bo; + dst.addr = NULL; + + wined3d_context_copy_bo_address(context, &dst, WINED3D_BIND_UNORDERED_ACCESS, &src, 0, sizeof(uint32_t)); + context_release(context); }

1 0

Brendan Shanks : dinput: Block Acquire() until hooks are installed to prevent input being lost.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: d5fd3c8a386cf716b1a9695069462be0abd0fa4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fd3c8a386cf716b1a96950… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Apr 17 11:35:06 2020 -0700 dinput: Block Acquire() until hooks are installed to prevent input being lost. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 19 ++++++++++++++++--- dlls/dinput8/tests/device.c | 3 --- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0855cb41cd..5eaa32bd0b 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1717,10 +1717,11 @@ static DWORD WINAPI hook_thread_proc(void *param) if (msg.message == WM_USER+0x10) { IDirectInputImpl *dinput; + HANDLE finished_event = (HANDLE)msg.lParam; - TRACE( "Processing hook change notification lp:%ld\n", msg.lParam ); + TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); - if (!msg.wParam && !msg.lParam) + if (!msg.wParam) { if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); @@ -1765,6 +1766,9 @@ static DWORD WINAPI hook_thread_proc(void *param) UnhookWindowsHookEx( mouse_hook ); mouse_hook = NULL; } + + if (finished_event) + SetEvent(finished_event); } TranslateMessage(&msg); DispatchMessageW(&msg); @@ -1824,6 +1828,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) static HHOOK callwndproc_hook; static ULONG foreground_cnt; IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface); + HANDLE hook_change_finished_event = NULL; EnterCriticalSection(&dinput_hook_crit); @@ -1851,9 +1856,17 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) hook_thread_event = NULL; } - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); + if (acquired) + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); + + if (acquired) + { + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); + } } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index ea5ab75109..bb82855d40 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -798,12 +798,10 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); - todo_wine ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); @@ -812,7 +810,6 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); /* Test injecting keyboard events with scancode=0.

1 0

Brendan Shanks : dinput: Fix DInput8 keyboard behavior for injected events with scancode=0.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: f65cfbfe9b20e38537c7cb8608e7f411c9e8b725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65cfbfe9b20e38537c7cb86… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Apr 17 11:35:07 2020 -0700 dinput: Fix DInput8 keyboard behavior for injected events with scancode=0. Grand Theft Auto IV injects VK_F8 and scancode=0, and expects DirectInput not to report that F8 is pressed. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 8 ++++---- dlls/dinput8/tests/device.c | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 47f28cac52..f842f1ca42 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -68,9 +68,9 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardIm return &This->base.IDirectInputDevice8W_iface; } -static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType) +static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD version) { - if (!scanCode) + if (!scanCode && version < 0x0800) scanCode = MapVirtualKeyW(vkCode, MAPVK_VK_TO_VSC); if (subType == DIDEVTYPEKEYBOARD_JAPAN106) @@ -125,7 +125,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode, This->subtype); + dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode, This->subtype, This->base.dinput->dwVersion); if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; @@ -282,7 +282,7 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) continue; - dik_code = map_dik_code(i, 0, newDevice->subtype); + dik_code = map_dik_code(i, 0, newDevice->subtype, dinput->dwVersion); memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[dik_code], df->dwObjSize); df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON; } diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index bb82855d40..39c635f2fb 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -820,7 +820,6 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); @@ -834,7 +833,6 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); hr = IDirectInputDevice8_Unacquire(di_keyboard);

1 0

Zhiyi Zhang : wined3d: Fix uninitialised variable warnings.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: c2a20e7f595c97cc69bacb3cfdb5c5c500322051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a20e7f595c97cc69bacb3c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 21:36:58 2020 +0800 wined3d: Fix uninitialised variable warnings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6a247f4644..ddde6e0c10 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12781,7 +12781,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter enum complex_fixup complex_fixup = get_complex_fixup(args->fixup); struct wined3d_string_buffer *buffer, *output; GLuint program, vshader_id, fshader_id; - const char *tex_type, *swizzle, *ptr; + const char *tex_type = NULL, *swizzle = NULL, *ptr; unsigned int i; GLint loc; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d08485c8d4..06857f2284 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2586,7 +2586,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for && format->format != GL_LUMINANCE && format->format != GL_LUMINANCE_ALPHA && (format->f.red_size || format->f.alpha_size)) { - DWORD readback[16 * 16 * 16], color, r_range, a_range; + DWORD readback[16 * 16 * 16], color = 0, r_range, a_range; BYTE r, a; BOOL match = TRUE; GLuint rb;

1 0

Zhiyi Zhang : ddraw: Handle more cases in hr_ddraw_from_wined3d().
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: dc6af98c1122c6fb0278072322aa75472cf80ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6af98c1122c6fb02780723… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 21:37:17 2020 +0800 ddraw: Handle more cases in hr_ddraw_from_wined3d(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 +----- dlls/ddraw/surface.c | 9 +-------- dlls/ddraw/utils.c | 7 +++++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1c104548f6..7cfb56f45c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1146,11 +1146,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW wined3d_mutex_unlock(); - switch (hr) - { - case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; - default: return hr; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DWORD height, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 04b398855b..c418bb7b2b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3931,14 +3931,7 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R src_rect, dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags); wined3d_mutex_unlock(); - switch (hr) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE; - case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE; - default: - return hr; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw_surface4_UpdateOverlay(IDirectDrawSurface4 *iface, RECT *src_rect, diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 23e75a32fc..efc1dddd18 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1189,8 +1189,11 @@ hr_ddraw_from_wined3d(HRESULT hr) { switch(hr) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; + case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; + case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE; + case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE; + default: return hr; } }

1 0

Nikolay Sivov : mf: Release presentation clock on SAR shutdown.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 2931ebd0d3f7f904fc1c0d45dbcf5068998f0a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2931ebd0d3f7f904fc1c0d45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 16:43:00 2020 +0300 mf: Release presentation clock on SAR shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 30 +++++++++++++++++------------- dlls/mf/tests/mf.c | 2 ++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 80cfd94952..ed59075fc2 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -282,6 +282,21 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, return hr; } +static void audio_renderer_set_presentation_clock(struct audio_renderer *renderer, IMFPresentationClock *clock) +{ + if (renderer->clock) + { + IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); + IMFPresentationClock_Release(renderer->clock); + } + renderer->clock = clock; + if (renderer->clock) + { + IMFPresentationClock_AddRef(renderer->clock); + IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); + } +} + static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -294,19 +309,7 @@ static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *ifa if (renderer->is_shut_down) hr = MF_E_SHUTDOWN; else - { - if (renderer->clock) - { - IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); - IMFPresentationClock_Release(renderer->clock); - } - renderer->clock = clock; - if (renderer->clock) - { - IMFPresentationClock_AddRef(renderer->clock); - IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); - } - } + audio_renderer_set_presentation_clock(renderer, clock); LeaveCriticalSection(&renderer->cs); @@ -353,6 +356,7 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) renderer->is_shut_down = TRUE; IMFMediaEventQueue_Shutdown(renderer->event_queue); IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); + audio_renderer_set_presentation_clock(renderer, NULL); LeaveCriticalSection(&renderer->cs); return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 511c6a8eb9..b7229b4f71 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2970,8 +2970,10 @@ todo_wine IUnknown_Release(unk); /* Shutdown */ + EXPECT_REF(present_clock, 2); hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + EXPECT_REF(present_clock, 1); hr = IMFMediaSink_Shutdown(sink); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

1 0