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

Jacek Caban : ntdll: Block signals in send_debug_event.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 137fd7d3a0df17aa6c0dc3e40809eae341e12ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=137fd7d3a0df17aa6c0dc3e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:39 2020 +0200 ntdll: Block signals in send_debug_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 589ceab390..a9ac24e44d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -133,9 +133,12 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS]; context_t server_context; select_op_t select_op; + sigset_t old_set; if (!NtCurrentTeb()->Peb->BeingDebugged) return 0; /* no debugger present */ + pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); + for (i = 0; i < min( rec->NumberParameters, EXCEPTION_MAXIMUM_PARAMETERS ); i++) params[i] = rec->ExceptionInformation[i]; @@ -151,23 +154,27 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con req->len = i * sizeof(params[0]); wine_server_add_data( req, params, req->len ); wine_server_add_data( req, &server_context, sizeof(server_context) ); - if (!wine_server_call( req )) handle = reply->handle; + if (!(ret = wine_server_call( req ))) handle = reply->handle; } SERVER_END_REQ; - if (!handle) return 0; - - select_op.wait.op = SELECT_WAIT; - select_op.wait.handles[0] = handle; - server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL, NULL ); - SERVER_START_REQ( get_exception_status ) + if (handle) { - req->handle = handle; - wine_server_set_reply( req, &server_context, sizeof(server_context) ); - ret = wine_server_call( req ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = handle; + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL, NULL ); + + SERVER_START_REQ( get_exception_status ) + { + req->handle = handle; + wine_server_set_reply( req, &server_context, sizeof(server_context) ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (ret >= 0) context_from_server( context, &server_context ); } - SERVER_END_REQ; - if (ret >= 0) context_from_server( context, &server_context ); + + pthread_sigmask( SIG_SETMASK, &old_set, NULL ); return ret; }

1 0

Jacek Caban : ntdll: Use server_select to pass context to server in send_debug_event.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 7f9eb22af8c3c8f9a0d8e07b0e6d8ee89feacd9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f9eb22af8c3c8f9a0d8e07b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:56 2020 +0200 ntdll: Use server_select to pass context to server in send_debug_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 10 +++------- include/wine/server_protocol.h | 4 +--- server/debugger.c | 26 +------------------------- server/protocol.def | 3 --- server/request.h | 1 - server/thread.c | 6 ------ server/thread.h | 1 - server/trace.c | 8 +------- 8 files changed, 6 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index a9ac24e44d..87341654ba 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -131,7 +131,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con DWORD i; obj_handle_t handle = 0; client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS]; - context_t server_context; + CONTEXT exception_context = *context; select_op_t select_op; sigset_t old_set; @@ -142,8 +142,6 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con for (i = 0; i < min( rec->NumberParameters, EXCEPTION_MAXIMUM_PARAMETERS ); i++) params[i] = rec->ExceptionInformation[i]; - context_to_server( &server_context, context ); - SERVER_START_REQ( queue_exception_event ) { req->first = first_chance; @@ -153,7 +151,6 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con req->address = wine_server_client_ptr( rec->ExceptionAddress ); req->len = i * sizeof(params[0]); wine_server_add_data( req, params, req->len ); - wine_server_add_data( req, &server_context, sizeof(server_context) ); if (!(ret = wine_server_call( req ))) handle = reply->handle; } SERVER_END_REQ; @@ -162,16 +159,15 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con { select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL, NULL ); + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, &exception_context, NULL ); SERVER_START_REQ( get_exception_status ) { req->handle = handle; - wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); } SERVER_END_REQ; - if (ret >= 0) context_from_server( context, &server_context ); + if (ret >= 0) *context = exception_context; } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba43aa07ed..9cdb9c765f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2522,7 +2522,6 @@ struct queue_exception_event_request client_ptr_t address; data_size_t len; /* VARARG(params,uints64,len); */ - /* VARARG(context,context); */ char __pad_44[4]; }; struct queue_exception_event_reply @@ -2542,7 +2541,6 @@ struct get_exception_status_request struct get_exception_status_reply { struct reply_header __header; - /* VARARG(context,context); */ }; @@ -6686,7 +6684,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 600 +#define SERVER_PROTOCOL_VERSION 601 /* ### protocol_version end ### */ diff --git a/server/debugger.c b/server/debugger.c index 5ff63b92b9..401ce36a47 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -50,7 +50,6 @@ struct debug_event enum debug_event_state state; /* event state */ int status; /* continuation status */ debug_event_t data; /* event data */ - context_t context; /* register context */ }; /* debug context */ @@ -347,11 +346,6 @@ static void debug_event_destroy( struct object *obj ) break; } } - if (event->sender->context == &event->context) - { - event->sender->context = NULL; - stop_thread_if_suspended( event->sender ); - } release_object( event->sender ); release_object( event->debugger ); } @@ -746,13 +740,6 @@ DECL_HANDLER(queue_exception_event) if ((event = alloc_debug_event( thread, EXCEPTION_DEBUG_EVENT, &data ))) { - const context_t *context = (const context_t *)((const char *)get_req_data() + req->len); - data_size_t size = get_req_data_size() - req->len; - - memset( &event->context, 0, sizeof(event->context) ); - memcpy( &event->context, context, min( sizeof(event->context), size ) ); - thread->context = &event->context; - if ((reply->handle = alloc_handle( thread->process, event, SYNCHRONIZE, 0 ))) { link_event( event ); @@ -772,18 +759,7 @@ DECL_HANDLER(get_exception_status) 0, &debug_event_ops ))) { close_handle( current->process, req->handle ); - if (event->state == EVENT_CONTINUED) - { - if (current->context == &event->context) - { - data_size_t size = min( sizeof(context_t), get_reply_max_size() ); - set_reply_data( &event->context, size ); - current->context = NULL; - stop_thread_if_suspended( current ); - } - set_error( event->status ); - } - else set_error( STATUS_PENDING ); + set_error( event->state == EVENT_CONTINUED ? event->status : STATUS_PENDING ); release_object( event ); } } diff --git a/server/protocol.def b/server/protocol.def index 7b92ffd374..1413021a39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1934,7 +1934,6 @@ enum char_info_mode client_ptr_t address; /* exception address */ data_size_t len; /* size of parameters */ VARARG(params,uints64,len);/* exception parameters */ - VARARG(context,context); /* thread context */ @REPLY obj_handle_t handle; /* handle to the queued event */ @END @@ -1943,8 +1942,6 @@ enum char_info_mode /* Retrieve the status of an exception event */ @REQ(get_exception_status) obj_handle_t handle; /* handle to the queued event */ -(a)REPLY - VARARG(context,context); /* modified thread context */ @END diff --git a/server/request.h b/server/request.h index dff5edc893..0d4c083460 100644 --- a/server/request.h +++ b/server/request.h @@ -1377,7 +1377,6 @@ C_ASSERT( FIELD_OFFSET(struct queue_exception_event_reply, handle) == 8 ); C_ASSERT( sizeof(struct queue_exception_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_request) == 16 ); -C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/thread.c b/server/thread.c index 762ddb3580..863a7c18ba 100644 --- a/server/thread.c +++ b/server/thread.c @@ -588,12 +588,6 @@ void stop_thread( struct thread *thread ) if (is_process_init_done(thread->process)) send_thread_signal( thread, SIGUSR1 ); } -/* stop a thread if it's supposed to be suspended */ -void stop_thread_if_suspended( struct thread *thread ) -{ - if (thread->suspend + thread->process->suspend > 0) stop_thread( thread ); -} - /* suspend a thread */ int suspend_thread( struct thread *thread ) { diff --git a/server/thread.h b/server/thread.h index 9aabcaca99..4b9304fe13 100644 --- a/server/thread.h +++ b/server/thread.h @@ -115,7 +115,6 @@ extern enum select_op get_wait_queue_select_op( struct wait_queue_entry *entry ) extern client_ptr_t get_wait_queue_key( struct wait_queue_entry *entry ); extern void make_wait_abandoned( struct wait_queue_entry *entry ); extern void stop_thread( struct thread *thread ); -extern void stop_thread_if_suspended( struct thread *thread ); extern int wake_thread( struct thread *thread ); extern int wake_thread_queue_entry( struct wait_queue_entry *entry ); extern int add_queue( struct object *obj, struct wait_queue_entry *entry ); diff --git a/server/trace.c b/server/trace.c index e762cd56a0..dd63b166f3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2435,7 +2435,6 @@ static void dump_queue_exception_event_request( const struct queue_exception_eve dump_uint64( ", address=", &req->address ); fprintf( stderr, ", len=%u", req->len ); dump_varargs_uints64( ", params=", min(cur_size,req->len) ); - dump_varargs_context( ", context=", cur_size ); } static void dump_queue_exception_event_reply( const struct queue_exception_event_reply *req ) @@ -2448,11 +2447,6 @@ static void dump_get_exception_status_request( const struct get_exception_status fprintf( stderr, " handle=%04x", req->handle ); } -static void dump_get_exception_status_reply( const struct get_exception_status_reply *req ) -{ - dump_varargs_context( " context=", cur_size ); -} - static void dump_continue_debug_event_request( const struct continue_debug_event_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4999,7 +4993,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_next_thread_reply, (dump_func)dump_wait_debug_event_reply, (dump_func)dump_queue_exception_event_reply, - (dump_func)dump_get_exception_status_reply, + NULL, NULL, NULL, NULL,

1 0

Jacek Caban : server: Get rid of separate thread suspend_context.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 234fa118d4b8dd39c7992bace28e3d5ddb81453f URL: https://source.winehq.org/git/wine.git/?a=commit;h=234fa118d4b8dd39c7992bac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:56:08 2020 +0200 server: Get rid of separate thread suspend_context. It's always the same as context now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 33 ++++++++++++++------------------- server/thread.h | 3 +-- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/server/thread.c b/server/thread.c index 863a7c18ba..9c22d83a9d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -180,7 +180,6 @@ static inline void init_thread_structure( struct thread *thread ) thread->unix_pid = -1; /* not known yet */ thread->unix_tid = -1; /* not known yet */ thread->context = NULL; - thread->suspend_context = NULL; thread->teb = 0; thread->entry_point = 0; thread->debug_ctx = NULL; @@ -325,7 +324,7 @@ 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->suspend_context ); + free( thread->context ); cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); free_msg_queue( thread ); @@ -345,7 +344,6 @@ static void cleanup_thread( struct thread *thread ) thread->reply_fd = NULL; thread->wait_fd = NULL; thread->context = NULL; - thread->suspend_context = NULL; thread->desktop = 0; thread->desc = NULL; thread->desc_len = 0; @@ -775,14 +773,13 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s int ret; /* check if we're waking current suspend wait */ - if (thread->suspend_context && thread->suspend_cookie == cookie + if (thread->context && thread->suspend_cookie == cookie && signaled != STATUS_KERNEL_APC && signaled != STATUS_USER_APC) { - if (!thread->suspend_context->flags) + if (!thread->context->flags) { - if (current->context == current->suspend_context) thread->context = NULL; - free( thread->suspend_context ); - thread->suspend_context = NULL; + free( thread->context ); + thread->context = NULL; } else signaled = STATUS_KERNEL_APC; /* signal a fake APC so that client calls select to get a new context */ } @@ -1560,10 +1557,9 @@ DECL_HANDLER(select) return; } - if (!(current->suspend_context = mem_alloc( sizeof(*context) ))) return; - memcpy( current->suspend_context, context, sizeof(*context) ); - current->suspend_context->flags = 0; /* to keep track of what is modified */ - current->context = current->suspend_context; + 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 */ current->suspend_cookie = req->cookie; } @@ -1635,15 +1631,14 @@ DECL_HANDLER(select) } release_object( apc ); } - else if(get_error() != STATUS_PENDING && get_reply_max_size() == sizeof(context_t) - && current->suspend_context && current->suspend_cookie == req->cookie) + else if (get_error() != STATUS_PENDING && get_reply_max_size() == sizeof(context_t) && + current->context && current->suspend_cookie == req->cookie) { - if (current->suspend_context->flags) - set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); + if (current->context->flags) + set_reply_data_ptr( current->context, sizeof(context_t) ); else - free( current->suspend_context ); - if (current->context == current->suspend_context) current->context = NULL; - current->suspend_context = NULL; + free( current->context ); + current->context = NULL; } } diff --git a/server/thread.h b/server/thread.h index 4b9304fe13..b86d8d3dbe 100644 --- a/server/thread.h +++ b/server/thread.h @@ -75,8 +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 if in an exception handler */ - context_t *suspend_context; /* current context if suspended */ + context_t *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

Zebediah Figura : wineusb.sys: New stub driver.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 3c392094449b7c15bfc98a24fbda6d0970a6085d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c392094449b7c15bfc98a24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 15 09:43:18 2020 -0500 wineusb.sys: New stub driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 101 ++++++++++++++++++++++++++++++++++++++ configure.ac | 14 ++++++ dlls/wineusb.sys/Makefile.in | 8 +++ dlls/wineusb.sys/wineusb.c | 61 +++++++++++++++++++++++ dlls/wineusb.sys/wineusb.sys.spec | 1 + loader/wine.inf.in | 2 + 6 files changed, 187 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c392094449b7c15bfc9…

1 0

Zebediah Figura : wineusb.sys: Implement AddDevice().
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 1a5e531838656ba0a0f2547590f941eee557c5da URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a5e531838656ba0a0f25475… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 15 09:43:19 2020 -0500 wineusb.sys: Implement AddDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b26f1036d8..6af8a9aaa5 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -38,6 +38,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); +static DEVICE_OBJECT *bus_fdo, *bus_pdo; + +static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) +{ + NTSTATUS ret; + + TRACE("driver %p, pdo %p.\n", driver, pdo); + + if ((ret = IoCreateDevice(driver, 0, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &bus_fdo))) + { + ERR("Failed to create FDO, status %#x.\n", ret); + return ret; + } + + IoAttachDeviceToDeviceStack(bus_fdo, pdo); + bus_pdo = pdo; + bus_fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + static void WINAPI driver_unload(DRIVER_OBJECT *driver) { libusb_exit(NULL); @@ -55,6 +76,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_UNSUCCESSFUL; } + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; return STATUS_SUCCESS;

1 0

Zebediah Figura : wineusb.sys: Implement basic IRP_MJ_PNP requests for the bus FDO.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: ff9645b21571c0da184844594ec19192bcdaa4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff9645b21571c0da18484459… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 15 09:43:20 2020 -0500 wineusb.sys: Implement basic IRP_MJ_PNP requests for the bus FDO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 6af8a9aaa5..14795f4ec4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -40,6 +40,41 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); static DEVICE_OBJECT *bus_fdo, *bus_pdo; +static NTSTATUS fdo_pnp(IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret; + + TRACE("irp %p, minor function %#x.\n", irp, stack->MinorFunction); + + switch (stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + irp->IoStatus.Status = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + irp->IoStatus.Status = STATUS_SUCCESS; + IoSkipCurrentIrpStackLocation(irp); + ret = IoCallDriver(bus_pdo, irp); + IoDetachDevice(bus_pdo); + IoDeleteDevice(bus_fdo); + return ret; + + default: + FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); + } + + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(bus_pdo, irp); +} + +static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) +{ + return fdo_pnp(irp); +} + static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) { NTSTATUS ret; @@ -78,6 +113,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; + driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; return STATUS_SUCCESS; }

1 0

Zebediah Figura : wineusb.sys: Start an event handler thread.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: eb8cb9e0cfae1d43ebccc72ded6179b60012e188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb8cb9e0cfae1d43ebccc72d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 15 09:43:21 2020 -0500 wineusb.sys: Start an event handler thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 14795f4ec4..060fb3d0d2 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -40,6 +40,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); static DEVICE_OBJECT *bus_fdo, *bus_pdo; +static BOOL thread_shutdown; +static HANDLE event_thread; + +static DWORD CALLBACK event_thread_proc(void *arg) +{ + int ret; + + TRACE("Starting event thread.\n"); + + while (!thread_shutdown) + { + if ((ret = libusb_handle_events(NULL))) + ERR("Error handling events: %s\n", libusb_strerror(ret)); + } + + TRACE("Shutting down event thread.\n"); + return 0; +} + static NTSTATUS fdo_pnp(IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -55,6 +74,11 @@ static NTSTATUS fdo_pnp(IRP *irp) break; case IRP_MN_REMOVE_DEVICE: + thread_shutdown = TRUE; + libusb_interrupt_event_handler(NULL); + WaitForSingleObject(event_thread, INFINITE); + CloseHandle(event_thread); + irp->IoStatus.Status = STATUS_SUCCESS; IoSkipCurrentIrpStackLocation(irp); ret = IoCallDriver(bus_pdo, irp); @@ -111,6 +135,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_UNSUCCESSFUL; } + event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp;

1 0

Zebediah Figura : wineusb.sys: Create USB devices.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: b0c2e5c6ce0e116e33435db85c051d8feb07ecb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c2e5c6ce0e116e33435db8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 15 09:43:22 2020 -0500 wineusb.sys: Create USB devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 160 ++++++++++++++++++++++++++++++++++++++++++++- include/ddk/usbioctl.h | 2 + 2 files changed, 161 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 060fb3d0d2..22804d8657 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -38,11 +38,115 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; + +DECLARE_CRITICAL_SECTION(wineusb_cs); + +static struct list device_list = LIST_INIT(device_list); + +struct usb_device +{ + struct list entry; + + DEVICE_OBJECT *device_obj; + + libusb_device *libusb_device; + libusb_device_handle *handle; +}; + +static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *bus_fdo, *bus_pdo; +static libusb_hotplug_callback_handle hotplug_cb_handle; + +static void add_usb_device(libusb_device *libusb_device) +{ + static const WCHAR formatW[] = {'\\','D','e','v','i','c','e','\\','U','S','B','P','D','O','-','%','u',0}; + struct libusb_device_descriptor device_desc; + static unsigned int name_index; + libusb_device_handle *handle; + struct usb_device *device; + DEVICE_OBJECT *device_obj; + UNICODE_STRING string; + NTSTATUS status; + WCHAR name[20]; + int ret; + + libusb_get_device_descriptor(libusb_device, &device_desc); + + TRACE("Adding new device %p, vendor %04x, product %04x.\n", libusb_device, + device_desc.idVendor, device_desc.idProduct); + + if ((ret = libusb_open(libusb_device, &handle))) + { + WARN("Failed to open device: %s\n", libusb_strerror(ret)); + return; + } + + sprintfW(name, formatW, name_index++); + RtlInitUnicodeString(&string, name); + if ((status = IoCreateDevice(driver_obj, sizeof(*device), &string, + FILE_DEVICE_USB, 0, FALSE, &device_obj))) + { + ERR("Failed to create device, status %#x.\n", status); + LeaveCriticalSection(&wineusb_cs); + libusb_close(handle); + return; + } + + device = device_obj->DeviceExtension; + device->device_obj = device_obj; + device->libusb_device = libusb_ref_device(libusb_device); + device->handle = handle; + + EnterCriticalSection(&wineusb_cs); + list_add_tail(&device_list, &device->entry); + LeaveCriticalSection(&wineusb_cs); + + IoInvalidateDeviceRelations(bus_pdo, BusRelations); +} + +static void remove_usb_device(libusb_device *libusb_device) +{ + struct usb_device *device; + + TRACE("Removing device %p.\n", libusb_device); + + EnterCriticalSection(&wineusb_cs); + LIST_FOR_EACH_ENTRY(device, &device_list, struct usb_device, entry) + { + if (device->libusb_device == libusb_device) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + list_remove(&device->entry); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); + IoDeleteDevice(device->device_obj); + break; + } + } + LeaveCriticalSection(&wineusb_cs); +} + static BOOL thread_shutdown; static HANDLE event_thread; +static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device, + libusb_hotplug_event event, void *user_data) +{ + if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) + add_usb_device(device); + else + remove_usb_device(device); + + return 0; +} + static DWORD CALLBACK event_thread_proc(void *arg) { int ret; @@ -69,22 +173,49 @@ static NTSTATUS fdo_pnp(IRP *irp) switch (stack->MinorFunction) { case IRP_MN_START_DEVICE: + if ((ret = libusb_hotplug_register_callback(NULL, + LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, + LIBUSB_HOTPLUG_ENUMERATE, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY, + LIBUSB_HOTPLUG_MATCH_ANY, hotplug_cb, NULL, &hotplug_cb_handle))) + { + ERR("Failed to register callback: %s\n", libusb_strerror(ret)); + irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + break; + } + irp->IoStatus.Status = STATUS_SUCCESS; + break; + case IRP_MN_SURPRISE_REMOVAL: irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: + { + struct usb_device *device, *cursor; + + libusb_hotplug_deregister_callback(NULL, hotplug_cb_handle); thread_shutdown = TRUE; libusb_interrupt_event_handler(NULL); WaitForSingleObject(event_thread, INFINITE); CloseHandle(event_thread); + EnterCriticalSection(&wineusb_cs); + LIST_FOR_EACH_ENTRY_SAFE(device, cursor, &device_list, struct usb_device, entry) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + list_remove(&device->entry); + IoDeleteDevice(device->device_obj); + } + LeaveCriticalSection(&wineusb_cs); + irp->IoStatus.Status = STATUS_SUCCESS; IoSkipCurrentIrpStackLocation(irp); ret = IoCallDriver(bus_pdo, irp); IoDetachDevice(bus_pdo); IoDeleteDevice(bus_fdo); return ret; + } default: FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); @@ -94,9 +225,34 @@ static NTSTATUS fdo_pnp(IRP *irp) return IoCallDriver(bus_pdo, irp); } +static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret = irp->IoStatus.Status; + + TRACE("device_obj %p, irp %p, minor function %#x.\n", device_obj, irp, stack->MinorFunction); + + switch (stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_QUERY_CAPABILITIES: + ret = STATUS_SUCCESS; + break; + + default: + FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); + } + + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) { - return fdo_pnp(irp); + if (device == bus_fdo) + return fdo_pnp(irp); + return pdo_pnp(device, irp); } static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) @@ -129,6 +285,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + driver_obj = driver; + if ((err = libusb_init(NULL))) { ERR("Failed to initialize libusb: %s\n", libusb_strerror(err)); diff --git a/include/ddk/usbioctl.h b/include/ddk/usbioctl.h index 003e2b6786..0438dce8bf 100644 --- a/include/ddk/usbioctl.h +++ b/include/ddk/usbioctl.h @@ -19,6 +19,8 @@ #ifndef __DDK_USBIOCTL_H__ #define __DDK_USBIOCTL_H__ +#include "ddk/usbiodef.h" + #define IOCTL_INTERNAL_USB_SUBMIT_URB \ CTL_CODE(FILE_DEVICE_USB, USB_SUBMIT_URB, METHOD_NEITHER, FILE_ANY_ACCESS)

1 0

Jeff Smith : gdiplus: Reuse point when calling GdipAddPathBeziers on open figure.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: a7e6cb4a257540e01aca1d160ca10890eaca9ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7e6cb4a257540e01aca1d16… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:08 2020 -0500 gdiplus: Reuse point when calling GdipAddPathBeziers on open figure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48877 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 20 +------------------- dlls/gdiplus/tests/graphicspath.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 547f172d98..2729455567 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -322,30 +322,12 @@ GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, INT count) { - INT i, old_count; - TRACE("(%p, %p, %d)\n", path, points, count); if(!path || !points || ((count - 1) % 3)) return InvalidParameter; - if(!lengthen_path(path, count)) - return OutOfMemory; - - old_count = path->pathdata.Count; - - for(i = 0; i < count; i++){ - path->pathdata.Points[old_count + i].X = points[i].X; - path->pathdata.Points[old_count + i].Y = points[i].Y; - path->pathdata.Types[old_count + i] = PathPointTypeBezier; - } - - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); - path->newfigure = FALSE; - path->pathdata.Count += count; - - return Ok; + return extend_current_figure(path, points, count, PathPointTypeBezier); } GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index d85cf68dfc..d19c7836fb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -365,6 +365,28 @@ static void test_bezier(void) GdipDeletePath(path); } +static void test_beziers(void) +{ + GpStatus status; + GpPath* path; + PointF bezier_points1[] = {{10.0,10.0}, {20.0,10.0}, {20.0,20.0}, {30.0,20.0}}; + PointF bezier_points2[] = {{30.0,20.0}, {40.0,20.0}, {40.0,30.0}, {50.0,30.0}}; + PointF bezier_points3[] = {{50.0,10.0}, {60.0,10.0}, {60.0,20.0}, {70.0,20.0}}; + + GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathBeziers(path, bezier_points1, 4); + expect(Ok, status); + status = GdipAddPathBeziers(path, bezier_points2, 4); + expect(Ok, status); + status = GdipAddPathBeziers(path, bezier_points3, 4); + expect(Ok, status); + + ok_path(path, bezier_path, ARRAY_SIZE(bezier_path), FALSE); + + GdipDeletePath(path); +} + static path_test_t arc_path[] = { {600.0, 450.0, PathPointTypeStart, 0, 0}, /*0*/ {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*1*/ @@ -1818,6 +1840,7 @@ START_TEST(graphicspath) test_createpath2(); test_line2(); test_bezier(); + test_beziers(); test_arc(); test_worldbounds(); test_pathpath();

1 0

Jeff Smith : gdiplus: Reuse point when calling GdipAddPathLine on open figure.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: f54bf06a2a593825e228db0e2a316df66d233af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54bf06a2a593825e228db0e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:09 2020 -0500 gdiplus: Reuse point when calling GdipAddPathLine on open figure. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 24 ++++++------------------ dlls/gdiplus/tests/graphicspath.c | 5 ++++- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2729455567..083b79b932 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -717,31 +717,19 @@ GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, I */ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2) { - INT old_count; + PointF points[2]; TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2); if(!path) return InvalidParameter; - if(!lengthen_path(path, 2)) - return OutOfMemory; - - old_count = path->pathdata.Count; - - path->pathdata.Points[old_count].X = x1; - path->pathdata.Points[old_count].Y = y1; - path->pathdata.Points[old_count + 1].X = x2; - path->pathdata.Points[old_count + 1].Y = y2; - - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); - path->pathdata.Types[old_count + 1] = PathPointTypeLine; - - path->newfigure = FALSE; - path->pathdata.Count += 2; + points[0].X = x1; + points[0].Y = y1; + points[1].X = x2; + points[1].Y = y2; - return Ok; + return extend_current_figure(path, points, 2, PathPointTypeLine); } /************************************************************************* diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index d19c7836fb..1af53762e4 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -722,7 +722,8 @@ static path_test_t linei_path[] = { {15.00, 15.00, PathPointTypeLine, 0, 0}, /*9*/ {26.00, 28.00, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*10*/ {35.00, 35.00, PathPointTypeStart, 0, 0}, /*11*/ - {36.00, 38.00, PathPointTypeLine, 0, 0} /*12*/ + {36.00, 38.00, PathPointTypeLine, 0, 0}, /*12*/ + {39.00, 40.00, PathPointTypeLine, 0, 0} /*13*/ }; static void test_linei(void) @@ -739,6 +740,8 @@ static void test_linei(void) GdipClosePathFigure(path); status = GdipAddPathLineI(path, 35.0, 35.0, 36.0, 38.0); expect(Ok, status); + status = GdipAddPathLineI(path, 36, 38, 39, 40); + expect(Ok, status); ok_path(path, linei_path, ARRAY_SIZE(linei_path), FALSE);

1 0