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

Zebediah Figura : configure: Check for a recent enough version of libusb.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 106d803db1962bdc7a9161d9a88ef88bb4fd0d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=106d803db1962bdc7a9161d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 21 23:55:12 2020 -0500 configure: Check for a recent enough version of libusb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 +++++++++++++------------- configure.ac | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 6c4a5f21b5..0b411702a7 100755 --- a/configure +++ b/configure @@ -13941,9 +13941,9 @@ ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $USB_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default" if test "x$ac_cv_header_libusb_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5 -$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; } -if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_interrupt_event_handler in -lusb-1.0" >&5 +$as_echo_n "checking for libusb_interrupt_event_handler in -lusb-1.0... " >&6; } +if ${ac_cv_lib_usb_1_0_libusb_interrupt_event_handler+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13957,27 +13957,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char libusb_init (); +char libusb_interrupt_event_handler (); int main () { -return libusb_init (); +return libusb_interrupt_event_handler (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_usb_1_0_libusb_init=yes + ac_cv_lib_usb_1_0_libusb_interrupt_event_handler=yes else - ac_cv_lib_usb_1_0_libusb_init=no + ac_cv_lib_usb_1_0_libusb_interrupt_event_handler=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_init" >&5 -$as_echo "$ac_cv_lib_usb_1_0_libusb_init" >&6; } -if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" >&5 +$as_echo "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" >&6; } +if test "x$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" = xyes; then : : else USB_LIBS="" @@ -13993,11 +13993,11 @@ test -z "$USB_CFLAGS" || USB_CFLAGS=`echo " $USB_CFLAGS" | sed 's/ -I$[^/]$/ - test -z "$USB_LIBS" || USB_LIBS=`echo " $USB_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"; then : +if test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"; then : case "x$with_usb" in - x) as_fn_append wine_notices "|libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported." ;; + x) as_fn_append wine_notices "|libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported." ;; xno) ;; - *) as_fn_error $? "libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported. + *) as_fn_error $? "libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported. This is an error since --with-usb was requested." "$LINENO" 5 ;; esac enable_wineusb_sys=${enable_wineusb_sys:-no} diff --git a/configure.ac b/configure.ac index 37e3445a34..00b3f38d4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1480,11 +1480,11 @@ if test "x$with_usb" != "xno" then WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,, [AC_CHECK_HEADER([libusb.h], - [AC_CHECK_LIB(usb-1.0,libusb_init,[:],[USB_LIBS=""],[$USB_LIBS])], + [AC_CHECK_LIB(usb-1.0,libusb_interrupt_event_handler,[:],[USB_LIBS=""],[$USB_LIBS])], [USB_LIBS=""])]) fi -WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"], - [libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported.], +WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"], + [libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.], [enable_wineusb_sys]) dnl **** Check for libv4l2 ****

1 0

Jacek Caban : server: Create thread context object in stop_thread.
by Alexandre Julliard April 22, 2020

April 22, 2020

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

Jacek Caban : server: Make thread context a server object.
by Alexandre Julliard April 22, 2020

April 22, 2020

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: Don't change cached thread context in set_thread_context.
by Alexandre Julliard April 22, 2020

April 22, 2020

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

Roman Pišl : wineconsole: Don't activate window when computing positions.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 8d8eab04fbe6f0af1e0768682c8f6178989f0177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d8eab04fbe6f0af1e076868… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Apr 21 22:09:07 2020 +0200 wineconsole: Don't activate window when computing positions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48740 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 212c65cee4..de3f4ae98c 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -253,7 +253,7 @@ static void WCUSER_ComputePositions(struct inner_data* data) } SetWindowPos(data->hWnd, 0, 0, 0, r.right - r.left + dx, r.bottom - r.top + dy, - SWP_NOMOVE|SWP_NOZORDER); + SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); }

1 0

Alexandre Julliard : ntdll: Call TLS callbacks also for the main exe.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 6f4272ce3e74f2d30f45bf0d407cdc9264b813a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f4272ce3e74f2d30f45bf0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 14:14:06 2020 +0200 ntdll: Call TLS callbacks also for the main exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48971 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 65f9d3f298..e26b9d6b7f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4028,6 +4028,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } attach_implicitly_loaded_dlls( context ); virtual_release_address_space(); + if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, DLL_PROCESS_ATTACH ); if (wm->so_handle) call_constructors( wm ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); }

1 0

Anton Baskanov : amstream: Store parent as struct audio_stream in audio stream sample.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: e7f0917665531d016d9b17cec89d8b59d6723def URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7f0917665531d016d9b17ce… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 22 02:30:06 2020 +0700 amstream: Store parent as struct audio_stream in audio stream sample. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4e34b2549e..90c177d177 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -27,10 +27,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; +struct audio_stream +{ + IAMMediaStream IAMMediaStream_iface; + IAudioMediaStream IAudioMediaStream_iface; + IMemInputPin IMemInputPin_iface; + IPin IPin_iface; + LONG ref; + + IMultiMediaStream* parent; + MSPID purpose_id; + STREAM_TYPE stream_type; + CRITICAL_SECTION cs; + IMediaStreamFilter *filter; + + IPin *peer; + IMemAllocator *allocator; + AM_MEDIA_TYPE mt; + WAVEFORMATEX format; + FILTER_STATE state; +}; + typedef struct { IAudioStreamSample IAudioStreamSample_iface; LONG ref; - IMediaStream *parent; + struct audio_stream *parent; IAudioData *audio_data; } IAudioStreamSampleImpl; @@ -146,7 +167,7 @@ static const struct IAudioStreamSampleVtbl AudioStreamSample_Vtbl = IAudioStreamSampleImpl_GetAudioData }; -static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) +static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) { IAudioStreamSampleImpl *object; @@ -158,7 +179,7 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; - object->parent = (IMediaStream*)parent; + object->parent = parent; object->audio_data = audio_data; *audio_stream_sample = &object->IAudioStreamSample_iface; @@ -166,27 +187,6 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a return S_OK; } -struct audio_stream -{ - IAMMediaStream IAMMediaStream_iface; - IAudioMediaStream IAudioMediaStream_iface; - IMemInputPin IMemInputPin_iface; - IPin IPin_iface; - LONG ref; - - IMultiMediaStream* parent; - MSPID purpose_id; - STREAM_TYPE stream_type; - CRITICAL_SECTION cs; - IMediaStreamFilter *filter; - - IPin *peer; - IMemAllocator *allocator; - AM_MEDIA_TYPE mt; - WAVEFORMATEX format; - FILTER_STATE state; -}; - static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct audio_stream, IAMMediaStream_iface); @@ -565,7 +565,7 @@ static HRESULT WINAPI audio_IAudioMediaStream_CreateSample(IAudioMediaStream *if if (!audio_data) return E_POINTER; - return audiostreamsample_create(iface, audio_data, sample); + return audiostreamsample_create(This, audio_data, sample); } static const struct IAudioMediaStreamVtbl audio_IAudioMediaStream_vtbl =

1 0

Zebediah Figura : strmbase: Make the pin_get_media_type() callback optional.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 38f5f364629650cba3ee90f326c2bb4f1c0f19c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f5f364629650cba3ee90f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:33 2020 -0500 strmbase: Make the pin_get_media_type() callback optional. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 36 ++++++++++++++++++++++++++---------- dlls/strmbase/renderer.c | 1 - 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4676c9d82b..d9d25f7627 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -57,10 +57,13 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes object->pin = pin; IPin_AddRef(&pin->IPin_iface); - while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + if (pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++object->count; + while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++object->count; + } } TRACE("Created enumerator %p.\n", object); @@ -121,6 +124,13 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, TRACE("enummt %p, count %u, mts %p, ret_count %p.\n", enummt, count, mts, ret_count); + if (!enummt->pin->ops->pin_get_media_type) + { + if (ret_count) + *ret_count = 0; + return count ? S_FALSE : S_OK; + } + for (i = 0; i < count; ++i) { if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) @@ -169,10 +179,13 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface) TRACE("enummt %p.\n", enummt); enummt->count = 0; - while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + if (enummt->pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++enummt->count; + while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++enummt->count; + } } enummt->index = 0; @@ -397,10 +410,13 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), enum_media_types); - if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) - return hr; - if (hr == S_OK) - FreeMediaType(&mt); + if (pin->ops->pin_get_media_type) + { + if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) + return hr; + if (hr == S_OK) + FreeMediaType(&mt); + } return enum_media_types_create(pin, enum_media_types); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fd999d3ae9..f1e74f6476 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -257,7 +257,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_query_interface = sink_query_interface, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = BaseRenderer_Receive, .sink_connect = sink_connect, .sink_disconnect = sink_disconnect,

1 0

Alexandre Julliard : ntdll: The builtin load callback is no longer used for ntdll itself.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 68e675d73db4fb90fff84c0e1f6de3b492061b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e675d73db4fb90fff84c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 15:50:44 2020 +0200 ntdll: The builtin load callback is no longer used for ntdll itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e26b9d6b7f..b457d60f6b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2058,21 +2058,14 @@ static NTSTATUS build_so_dll_module( const WCHAR *load_path, const UNICODE_STRIN */ static void load_builtin_callback( void *module, const char *filename ) { - static const WCHAR emptyW[1]; - const WCHAR *load_path; - if (!module) { ERR("could not map image for %s\n", debugstr_us(builtin_load_info->filename) ); builtin_load_info->status = STATUS_NO_MEMORY; return; } - - load_path = builtin_load_info->load_path; - if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (!load_path) load_path = emptyW; - - builtin_load_info->status = build_so_dll_module( load_path, builtin_load_info->filename, module, + builtin_load_info->status = build_so_dll_module( builtin_load_info->load_path, + builtin_load_info->filename, module, 0, &builtin_load_info->wm ); } @@ -4482,7 +4475,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - HMODULE ntdll_module; + HMODULE ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); INITIAL_TEB stack; BOOL suspend; SIZE_T info_size; @@ -4512,15 +4505,11 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ RtlInitUnicodeString( &nt_name, ntdllW ); - default_load_info.filename = &nt_name; + map_so_dll( &__wine_spec_nt_header, ntdll_module ); + status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); + assert( !status ); + wine_dll_set_callback( load_builtin_callback ); - ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); - if (!get_modref( ntdll_module )) - { - map_so_dll( &__wine_spec_nt_header, ntdll_module ); - status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); - assert( !status ); - } RtlInitUnicodeString( &nt_name, kernel32W ); if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS)

1 0

Zhiyi Zhang : winemac.drv: Allocate LUID for GPUs.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 31b112e718448ba18ad3127fae3b860dae7c7632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31b112e718448ba18ad3127f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 20:12:43 2020 +0800 winemac.drv: Allocate LUID for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4c610c4573..851d549d5f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -51,6 +51,8 @@ struct display_mode_descriptor BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); @@ -1313,11 +1315,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; + DEVPROPTYPE property_type; WCHAR nameW[MAX_PATH]; WCHAR bufferW[1024]; FILETIME filetime; HKEY hkey = NULL; GUID guid; + LUID luid; INT written; DWORD size; BOOL ret = FALSE; @@ -1343,6 +1347,20 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write DEVPROPKEY_GPU_LUID property */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + if (!AllocateLocallyUniqueId(&luid)) + goto done; + + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) + goto done; + } + TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), gpu->name, + luid.HighPart, luid.LowPart); + /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL);

1 0