wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Jacek Caban : ntdll: Use server_select in RtlWaitOnAddress.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 4f673d5386f44d4af4459a95b3059cfb887db8c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f673d5386f44d4af4459a95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:29 2020 +0200 ntdll: Use server_select in RtlWaitOnAddress. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 +++- dlls/ntdll/server.c | 14 +++++------- dlls/ntdll/sync.c | 59 ++++++++++--------------------------------------- 3 files changed, 20 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 0c4859343e..f18ab1f227 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -116,6 +116,8 @@ extern sigset_t server_block_set DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; +extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, + timeout_t abs_timeout, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; @@ -127,7 +129,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; -extern void invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; +extern void invoke_apc( const user_apc_t *apc ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f7d8cc90f1..9053ad2042 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -381,7 +381,7 @@ int wait_select_reply( void *cookie ) } -static void invoke_user_apc( const user_apc_t *apc ) +void invoke_apc( const user_apc_t *apc ) { switch( apc->type ) { @@ -410,7 +410,7 @@ static void invoke_user_apc( const user_apc_t *apc ) * Invoke a single APC. * */ -void invoke_apc( const apc_call_t *call, apc_result_t *result ) +static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) { SIZE_T size; void *addr; @@ -422,10 +422,6 @@ void invoke_apc( const apc_call_t *call, apc_result_t *result ) { case APC_NONE: break; - case APC_USER: - case APC_TIMER: - invoke_user_apc( &call->user ); - break; case APC_ASYNC_IO: { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); @@ -637,7 +633,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT SERVER_END_REQ; if (ret != STATUS_KERNEL_APC) break; - invoke_apc( &call, &result ); + invoke_system_apc( &call, &result ); /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) @@ -678,7 +674,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f { ret = server_select( select_op, size, flags, abs_timeout, &apc ); if (ret != STATUS_USER_APC) break; - invoke_user_apc( &apc ); + invoke_apc( &apc ); /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ @@ -727,7 +723,7 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a if (self) { - invoke_apc( call, result ); + invoke_system_apc( call, result ); } else { diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a96a120fb6..5ae3b5bacd 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2458,13 +2458,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size { select_op_t select_op; NTSTATUS ret; - int cookie; BOOL user_apc = FALSE; - obj_handle_t apc_handle = 0; - apc_call_t call; - apc_result_t result; - abstime_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; - sigset_t old_set; + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + user_apc_t apc; if (size != 1 && size != 2 && size != 4 && size != 8) return STATUS_INVALID_PARAMETER; @@ -2476,8 +2472,6 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); select_op.keyed_event.key = wine_server_client_ptr( addr ); - memset( &result, 0, sizeof(result) ); - if (abs_timeout < 0) { LARGE_INTEGER now; @@ -2486,54 +2480,25 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size abs_timeout -= now.QuadPart; } - do + for (;;) { RtlEnterCriticalSection( &addr_section ); if (!compare_addr( addr, cmp, size )) - { - RtlLeaveCriticalSection( &addr_section ); - return STATUS_SUCCESS; - } - - pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); - for (;;) - { - SERVER_START_REQ( select ) - { - req->flags = SELECT_INTERRUPTIBLE; - req->cookie = wine_server_client_ptr( &cookie ); - req->prev_apc = apc_handle; - req->timeout = abs_timeout; - wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); - ret = server_call_unlocked( req ); - apc_handle = reply->apc_handle; - call = reply->call; - } - SERVER_END_REQ; - - if (ret != STATUS_KERNEL_APC) break; - invoke_apc( &call, &result ); - } - pthread_sigmask( SIG_SETMASK, &old_set, NULL ); - + ret = STATUS_SUCCESS; + else + ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, &apc ); RtlLeaveCriticalSection( &addr_section ); - if (ret == STATUS_USER_APC) - { - invoke_apc( &call, &result ); - /* if we ran a user apc we have to check once more if additional apcs are queued, - * but we don't want to wait */ - abs_timeout = 0; - user_apc = TRUE; - } + if (ret != STATUS_USER_APC) break; + invoke_apc( &apc ); - if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; } - while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; - return ret; }

1 0

Jacek Caban : ntdll: Factor out server_select.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 87012607688f730755ee91de14620e6e3b78395c URL: https://source.winehq.org/git/wine.git/?a=commit;h=87012607688f730755ee91de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:19 2020 +0200 ntdll: Factor out server_select. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +-- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/server.c | 71 +++++++++++++++++++++++++++++++----------------- dlls/ntdll/sync.c | 10 +++---- 5 files changed, 56 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index e8ffc1ceed..1892d3abcb 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -242,7 +242,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) time.QuadPart = timeout * (LONGLONG)-10000000; select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = wine_server_obj_handle( sem ); - ret = server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); + ret = server_wait( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); } return ret; } diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c35312fd1d..7bd7baa135 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -128,7 +128,7 @@ void wait_suspend( CONTEXT *context ) /* wait with 0 timeout, will only return once the thread is no longer suspended */ timeout.QuadPart = 0; - server_select( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); + server_wait( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context ) @@ -185,7 +185,7 @@ 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, NULL ); + server_wait( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4601e49034..0c4859343e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -116,8 +116,8 @@ extern sigset_t server_block_set DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; -extern unsigned int server_select( const select_op_t *select_op, data_size_t size, - UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; +extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, + UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_remove_fd_from_cache( HANDLE handle ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int access, int *unix_fd, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 05f10769a5..f7d8cc90f1 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -606,27 +606,17 @@ void invoke_apc( const apc_call_t *call, apc_result_t *result ) * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - const LARGE_INTEGER *timeout ) + timeout_t abs_timeout, user_apc_t *user_apc ) { unsigned int ret; int cookie; - BOOL user_apc = FALSE; obj_handle_t apc_handle = 0; apc_call_t call; apc_result_t result; - abstime_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; sigset_t old_set; memset( &result, 0, sizeof(result) ); - if (abs_timeout < 0) - { - LARGE_INTEGER now; - - RtlQueryPerformanceCounter(&now); - abs_timeout -= now.QuadPart; - } - do { pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); @@ -646,29 +636,60 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } SERVER_END_REQ; + if (ret != STATUS_KERNEL_APC) break; + invoke_apc( &call, &result ); + /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) size = offsetof( select_op_t, signal_and_wait.signal ); - - if (ret != STATUS_KERNEL_APC) break; - invoke_apc( &call, &result ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); + if (ret != STATUS_PENDING) break; - if (ret == STATUS_USER_APC) - { - invoke_apc( &call, &result ); - /* if we ran a user apc we have to check once more if additional apcs are queued, - * but we don't want to wait */ - abs_timeout = 0; - user_apc = TRUE; - size = 0; - } - - if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + ret = wait_select_reply( &cookie ); } while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); + if (ret == STATUS_USER_APC) *user_apc = call.user; + return ret; +} + + +/*********************************************************************** + * server_wait + */ +unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, + const LARGE_INTEGER *timeout ) +{ + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + BOOL user_apc = FALSE; + unsigned int ret; + user_apc_t apc; + + if (abs_timeout < 0) + { + LARGE_INTEGER now; + + RtlQueryPerformanceCounter(&now); + abs_timeout -= now.QuadPart; + } + + for (;;) + { + ret = server_select( select_op, size, flags, abs_timeout, &apc ); + if (ret != STATUS_USER_APC) break; + invoke_user_apc( &apc ); + + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; + size = 0; + /* don't signal multiple times */ + if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) + size = offsetof( select_op_t, signal_and_wait.signal ); + } + if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; /* A test on Windows 2000 shows that Windows always yields during diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index bd71511cfb..a96a120fb6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1091,7 +1091,7 @@ static NTSTATUS wait_objects( DWORD count, const HANDLE *handles, if (alertable) flags |= SELECT_ALERTABLE; select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL; for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); - return server_select( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); + return server_wait( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); } @@ -1130,7 +1130,7 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE hSignalObject, HANDLE hWa select_op.signal_and_wait.op = SELECT_SIGNAL_AND_WAIT; select_op.signal_and_wait.wait = wine_server_obj_handle( hWaitObject ); select_op.signal_and_wait.signal = wine_server_obj_handle( hSignalObject ); - return server_select( &select_op, sizeof(select_op.signal_and_wait), flags, timeout ); + return server_wait( &select_op, sizeof(select_op.signal_and_wait), flags, timeout ); } @@ -1155,7 +1155,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou { /* if alertable, we need to query the server */ if (alertable) - return server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout ); + return server_wait( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout ); if (!timeout || timeout->QuadPart == TIMEOUT_INFINITE) /* sleep forever */ { @@ -1254,7 +1254,7 @@ NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; select_op.keyed_event.handle = wine_server_obj_handle( handle ); select_op.keyed_event.key = wine_server_client_ptr( key ); - return server_select( &select_op, sizeof(select_op.keyed_event), flags, timeout ); + return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } /****************************************************************************** @@ -1272,7 +1272,7 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.op = SELECT_KEYED_EVENT_RELEASE; select_op.keyed_event.handle = wine_server_obj_handle( handle ); select_op.keyed_event.key = wine_server_client_ptr( key ); - return server_select( &select_op, sizeof(select_op.keyed_event), flags, timeout ); + return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } /******************************************************************

1 0

Jacek Caban : server: Introduce a separated type for user APCs.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 4f9cc93108a0ee2e589021319b4634869fff4517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f9cc93108a0ee2e58902131… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:04 2020 +0200 server: Introduce a separated type for user APCs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 34 ++++++++++++++++++++++++---------- dlls/ntdll/thread.c | 10 +++++----- include/wine/server_protocol.h | 8 +++++++- server/async.c | 10 +++++----- server/protocol.def | 6 ++++++ server/timer.c | 8 ++++---- server/trace.c | 12 ++++++------ 7 files changed, 57 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index d6b9b2ff0a..05f10769a5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -381,6 +381,29 @@ int wait_select_reply( void *cookie ) } +static void invoke_user_apc( const user_apc_t *apc ) +{ + switch( apc->type ) + { + case APC_USER: + { + void (WINAPI *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR) = wine_server_get_ptr( apc->user.func ); + func( apc->user.args[0], apc->user.args[1], apc->user.args[2] ); + break; + } + case APC_TIMER: + { + void (WINAPI *func)(void*, unsigned int, unsigned int) = wine_server_get_ptr( apc->user.func ); + func( wine_server_get_ptr( apc->user.args[1] ), + (DWORD)apc->timer.time, (DWORD)(apc->timer.time >> 32) ); + break; + } + default: + server_protocol_error( "get_apc_request: bad type %d\n", apc->type ); + break; + } +} + /*********************************************************************** * invoke_apc * @@ -400,18 +423,9 @@ void invoke_apc( const apc_call_t *call, apc_result_t *result ) case APC_NONE: break; case APC_USER: - { - void (WINAPI *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR) = wine_server_get_ptr( call->user.func ); - func( call->user.args[0], call->user.args[1], call->user.args[2] ); - break; - } case APC_TIMER: - { - void (WINAPI *func)(void*, unsigned int, unsigned int) = wine_server_get_ptr( call->timer.func ); - func( wine_server_get_ptr( call->timer.arg ), - (DWORD)call->timer.time, (DWORD)(call->timer.time >> 32) ); + invoke_user_apc( &call->user ); break; - } case APC_ASYNC_IO: { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6baeb610fc..ee3c925f91 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -739,11 +739,11 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 req->handle = wine_server_obj_handle( handle ); if (func) { - req->call.type = APC_USER; - req->call.user.func = wine_server_client_ptr( func ); - req->call.user.args[0] = arg1; - req->call.user.args[1] = arg2; - req->call.user.args[2] = arg3; + req->call.type = APC_USER; + req->call.user.user.func = wine_server_client_ptr( func ); + req->call.user.user.args[0] = arg1; + req->call.user.user.args[1] = arg2; + req->call.user.user.args[2] = arg3; } else req->call.type = APC_NONE; /* wake up only */ ret = wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba3045be62..298e2dbfa4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -474,6 +474,12 @@ typedef union abstime_t time; client_ptr_t arg; } timer; +} user_apc_t; + +typedef union +{ + enum apc_type type; + user_apc_t user; struct { enum apc_type type; @@ -6710,7 +6716,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 597 +#define SERVER_PROTOCOL_VERSION 598 /* ### protocol_version end ### */ diff --git a/server/async.c b/server/async.c index 5486601c67..03994e8fac 100644 --- a/server/async.c +++ b/server/async.c @@ -399,11 +399,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota { apc_call_t data; memset( &data, 0, sizeof(data) ); - data.type = APC_USER; - data.user.func = async->data.apc; - data.user.args[0] = async->data.apc_context; - data.user.args[1] = async->data.iosb; - data.user.args[2] = 0; + data.type = APC_USER; + data.user.user.func = async->data.apc; + data.user.user.args[0] = async->data.apc_context; + data.user.user.args[1] = async->data.iosb; + data.user.user.args[2] = 0; thread_queue_apc( NULL, async->thread, NULL, &data ); } else if (async->data.apc_context && (async->pending || diff --git a/server/protocol.def b/server/protocol.def index 93b558cc2b..bfe817b654 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -490,6 +490,12 @@ typedef union abstime_t time; /* time of expiration */ client_ptr_t arg; /* user argument */ } timer; +} user_apc_t; + +typedef union +{ + enum apc_type type; + user_apc_t user; struct { enum apc_type type; /* APC_ASYNC_IO */ diff --git a/server/timer.c b/server/timer.c index c1269e0ff0..6460acbf51 100644 --- a/server/timer.c +++ b/server/timer.c @@ -116,10 +116,10 @@ static void timer_callback( void *private ) memset( &data, 0, sizeof(data) ); if (timer->callback) { - data.type = APC_TIMER; - data.timer.func = timer->callback; - data.timer.time = timer->when; - data.timer.arg = timer->arg; + data.type = APC_TIMER; + data.user.timer.func = timer->callback; + data.user.timer.time = timer->when; + data.user.timer.arg = timer->arg; } else data.type = APC_NONE; /* wake up only */ diff --git a/server/trace.c b/server/trace.c index 46c433e7a1..095a45f0dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -159,15 +159,15 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) fprintf( stderr, "APC_NONE" ); break; case APC_USER: - dump_uint64( "APC_USER,func=", &call->user.func ); - dump_uint64( ",args={", &call->user.args[0] ); - dump_uint64( ",", &call->user.args[1] ); - dump_uint64( ",", &call->user.args[2] ); + dump_uint64( "APC_USER,func=", &call->user.user.func ); + dump_uint64( ",args={", &call->user.user.args[0] ); + dump_uint64( ",", &call->user.user.args[1] ); + dump_uint64( ",", &call->user.user.args[2] ); fputc( '}', stderr ); break; case APC_TIMER: - dump_timeout( "APC_TIMER,time=", &call->timer.time ); - dump_uint64( ",arg=", &call->timer.arg ); + dump_timeout( "APC_TIMER,time=", &call->user.timer.time ); + dump_uint64( ",arg=", &call->user.timer.arg ); break; case APC_ASYNC_IO: dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user );

1 0

Zebediah Figura : ntdll/tests: Add tests for kernel32 threadpool I/O functions.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 320a0258827fdff3515f65aa19493d17da38e3ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=320a0258827fdff3515f65aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 00:16:27 2020 -0500 ntdll/tests: Add tests for kernel32 threadpool I/O functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 228 +++++++++++++++++++++++++++++++++++------- 1 file changed, 190 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 32d4c3eac2..2984983a06 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -22,7 +22,6 @@ #define NONAMELESSUNION #include "ntdll_test.h" -static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pTpAllocCleanupGroup)(TP_CLEANUP_GROUP **); static NTSTATUS (WINAPI *pTpAllocIoCompletion)(TP_IO **,HANDLE,PTP_IO_CALLBACK,void *,TP_CALLBACK_ENVIRON *); static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); @@ -52,51 +51,58 @@ static VOID (WINAPI *pTpWaitForTimer)(TP_TIMER *,BOOL); static VOID (WINAPI *pTpWaitForWait)(TP_WAIT *,BOOL); static VOID (WINAPI *pTpWaitForWork)(TP_WORK *,BOOL); -#define NTDLL_GET_PROC(func) \ +static void (WINAPI *pCancelThreadpoolIo)(TP_IO *); +static void (WINAPI *pCloseThreadpoolIo)(TP_IO *); +static TP_IO *(WINAPI *pCreateThreadpoolIo)(HANDLE, PTP_WIN32_IO_CALLBACK, void *, TP_CALLBACK_ENVIRON *); +static void (WINAPI *pStartThreadpoolIo)(TP_IO *); +static void (WINAPI *pWaitForThreadpoolIoCallbacks)(TP_IO *, BOOL); + +#define GET_PROC(func) \ do \ { \ - p ## func = (void *)GetProcAddress(hntdll, #func); \ + p ## func = (void *)GetProcAddress(module, #func); \ if (!p ## func) trace("Failed to get address for %s\n", #func); \ } \ while (0) static BOOL init_threadpool(void) { - hntdll = GetModuleHandleA("ntdll"); - if (!hntdll) - { - win_skip("Could not load ntdll\n"); - return FALSE; - } - - NTDLL_GET_PROC(TpAllocCleanupGroup); - NTDLL_GET_PROC(TpAllocIoCompletion); - NTDLL_GET_PROC(TpAllocPool); - NTDLL_GET_PROC(TpAllocTimer); - NTDLL_GET_PROC(TpAllocWait); - NTDLL_GET_PROC(TpAllocWork); - NTDLL_GET_PROC(TpCancelAsyncIoOperation); - NTDLL_GET_PROC(TpCallbackMayRunLong); - NTDLL_GET_PROC(TpCallbackReleaseSemaphoreOnCompletion); - NTDLL_GET_PROC(TpDisassociateCallback); - NTDLL_GET_PROC(TpIsTimerSet); - NTDLL_GET_PROC(TpPostWork); - NTDLL_GET_PROC(TpReleaseCleanupGroup); - NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); - NTDLL_GET_PROC(TpReleaseIoCompletion); - NTDLL_GET_PROC(TpReleasePool); - NTDLL_GET_PROC(TpReleaseTimer); - NTDLL_GET_PROC(TpReleaseWait); - NTDLL_GET_PROC(TpReleaseWork); - NTDLL_GET_PROC(TpSetPoolMaxThreads); - NTDLL_GET_PROC(TpSetTimer); - NTDLL_GET_PROC(TpSetWait); - NTDLL_GET_PROC(TpSimpleTryPost); - NTDLL_GET_PROC(TpStartAsyncIoOperation); - NTDLL_GET_PROC(TpWaitForIoCompletion); - NTDLL_GET_PROC(TpWaitForTimer); - NTDLL_GET_PROC(TpWaitForWait); - NTDLL_GET_PROC(TpWaitForWork); + HMODULE module = GetModuleHandleA("ntdll"); + GET_PROC(TpAllocCleanupGroup); + GET_PROC(TpAllocIoCompletion); + GET_PROC(TpAllocPool); + GET_PROC(TpAllocTimer); + GET_PROC(TpAllocWait); + GET_PROC(TpAllocWork); + GET_PROC(TpCallbackMayRunLong); + GET_PROC(TpCallbackReleaseSemaphoreOnCompletion); + GET_PROC(TpCancelAsyncIoOperation); + GET_PROC(TpDisassociateCallback); + GET_PROC(TpIsTimerSet); + GET_PROC(TpPostWork); + GET_PROC(TpReleaseCleanupGroup); + GET_PROC(TpReleaseCleanupGroupMembers); + GET_PROC(TpReleaseIoCompletion); + GET_PROC(TpReleasePool); + GET_PROC(TpReleaseTimer); + GET_PROC(TpReleaseWait); + GET_PROC(TpReleaseWork); + GET_PROC(TpSetPoolMaxThreads); + GET_PROC(TpSetTimer); + GET_PROC(TpSetWait); + GET_PROC(TpSimpleTryPost); + GET_PROC(TpStartAsyncIoOperation); + GET_PROC(TpWaitForIoCompletion); + GET_PROC(TpWaitForTimer); + GET_PROC(TpWaitForWait); + GET_PROC(TpWaitForWork); + + module = GetModuleHandleA("kernel32"); + GET_PROC(CancelThreadpoolIo); + GET_PROC(CloseThreadpoolIo); + GET_PROC(CreateThreadpoolIo); + GET_PROC(StartThreadpoolIo); + GET_PROC(WaitForThreadpoolIoCallbacks); if (!pTpAllocPool) { @@ -2084,6 +2090,151 @@ static void test_tp_io(void) pTpReleasePool(pool); } +static void CALLBACK kernel32_io_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, + void *ovl, ULONG ret, ULONG_PTR length, TP_IO *io) +{ + struct io_cb_ctx *ctx = userdata; + ++ctx->count; + ctx->ovl = ovl; + ctx->ret = ret; + ctx->length = length; + ctx->io = io; +} + +static void test_kernel32_tp_io(void) +{ + TP_CALLBACK_ENVIRON environment = {.Version = 1}; + OVERLAPPED ovl = {}, ovl2 = {}; + HANDLE client, server, thread; + struct io_cb_ctx userdata; + char in[1], in2[1]; + const char out[1]; + NTSTATUS status; + DWORD ret_size; + TP_POOL *pool; + TP_IO *io; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + status = pTpAllocPool(&pool, NULL); + ok(!status, "failed to allocate pool, status %#x\n", status); + + server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", + PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + client = CreateFileA("\\\\.\\pipe\\wine_tp_test", GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %u.\n", GetLastError()); + + environment.Pool = pool; + io = NULL; + io = pCreateThreadpoolIo(server, kernel32_io_cb, &userdata, &environment); + todo_wine ok(!!io, "expected non-NULL TP_IO\n"); + if (!io) + return; + + pWaitForThreadpoolIoCallbacks(io, FALSE); + + userdata.count = 0; + pStartThreadpoolIo(io); + + thread = CreateThread(NULL, 0, io_wait_thread, io, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "TpWaitForIoCompletion() should not return\n"); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 1, "callback ran %u times\n", userdata.count); + ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); + ok(userdata.ret == ERROR_SUCCESS, "got status %#x\n", userdata.ret); + ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + ok(!WaitForSingleObject(thread, 1000), "wait timed out\n"); + CloseHandle(thread); + + userdata.count = 0; + pStartThreadpoolIo(io); + pStartThreadpoolIo(io); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ret = ReadFile(server, in2, sizeof(in2), NULL, &ovl2); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 2, "callback ran %u times\n", userdata.count); + ok(userdata.ret == STATUS_SUCCESS, "got status %#x\n", userdata.ret); + ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + userdata.count = 0; + pStartThreadpoolIo(io); + pWaitForThreadpoolIoCallbacks(io, TRUE); + ok(!userdata.count, "callback ran %u times\n", userdata.count); + + pStartThreadpoolIo(io); + + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(ret, "wrong ret %d\n", ret); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 1, "callback ran %u times\n", userdata.count); + ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); + ok(userdata.ret == ERROR_SUCCESS, "got status %#x\n", userdata.ret); + ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + userdata.count = 0; + pStartThreadpoolIo(io); + + ret = ReadFile(server, NULL, 1, NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError()); + + pCancelThreadpoolIo(io); + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(!userdata.count, "callback ran %u times\n", userdata.count); + + userdata.count = 0; + pStartThreadpoolIo(io); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ret = CancelIo(server); + ok(ret, "CancelIo() failed, error %u\n", GetLastError()); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 1, "callback ran %u times\n", userdata.count); + ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); + ok(userdata.ret == ERROR_OPERATION_ABORTED, "got status %#x\n", userdata.ret); + ok(!userdata.length, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + CloseHandle(ovl.hEvent); + CloseHandle(client); + CloseHandle(server); + pCloseThreadpoolIo(io); + pTpReleasePool(pool); +} + START_TEST(threadpool) { test_RtlQueueWorkItem(); @@ -2104,4 +2255,5 @@ START_TEST(threadpool) test_tp_wait(); test_tp_multi_wait(); test_tp_io(); + test_kernel32_tp_io(); }

1 0

Zebediah Figura : ntdll: Implement threadpool I/O queues.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 75e8c4493a697c85b1a707a233f34c7453602818 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75e8c4493a697c85b1a707a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 00:16:26 2020 -0500 ntdll: Implement threadpool I/O queues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 + dlls/ntdll/ntdll_misc.h | 7 + dlls/ntdll/tests/threadpool.c | 179 ++++++++++++++++++++++ dlls/ntdll/threadpool.c | 335 ++++++++++++++++++++++++++++++++++++++++-- include/winternl.h | 8 +- 5 files changed, 523 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75e8c4493a697c85b1a7…

1 0

Zebediah Figura : ntdll: Factor out object_is_finished().
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 74d830755c2e43771e79bec482bb4ff704ef22db URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d830755c2e43771e79bec4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 00:16:25 2020 -0500 ntdll: Factor out object_is_finished(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4b4bdf2cd7..a6e4749e10 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -2023,6 +2023,17 @@ static void tp_object_cancel( struct threadpool_object *object ) tp_object_release( object ); } +static BOOL object_is_finished( struct threadpool_object *object, BOOL group ) +{ + if (object->num_pending_callbacks) + return FALSE; + + if (group) + return !object->num_running_callbacks; + else + return !object->num_associated_callbacks; +} + /*********************************************************************** * tp_object_wait (internal) * @@ -2034,14 +2045,11 @@ static void tp_object_wait( struct threadpool_object *object, BOOL group_wait ) struct threadpool *pool = object->pool; RtlEnterCriticalSection( &pool->cs ); - if (group_wait) + while (!object_is_finished( object, group_wait )) { - while (object->num_pending_callbacks || object->num_running_callbacks) + if (group_wait) RtlSleepConditionVariableCS( &object->group_finished_event, &pool->cs, NULL ); - } - else - { - while (object->num_pending_callbacks || object->num_associated_callbacks) + else RtlSleepConditionVariableCS( &object->finished_event, &pool->cs, NULL ); } RtlLeaveCriticalSection( &pool->cs ); @@ -2261,13 +2269,13 @@ static void CALLBACK threadpool_worker_proc( void *param ) } object->num_running_callbacks--; - if (!object->num_pending_callbacks && !object->num_running_callbacks) + if (object_is_finished( object, TRUE )) RtlWakeAllConditionVariable( &object->group_finished_event ); if (instance.associated) { object->num_associated_callbacks--; - if (!object->num_pending_callbacks && !object->num_associated_callbacks) + if (object_is_finished( object, FALSE )) RtlWakeAllConditionVariable( &object->finished_event ); } @@ -2567,7 +2575,7 @@ VOID WINAPI TpDisassociateCallback( TP_CALLBACK_INSTANCE *instance ) RtlEnterCriticalSection( &pool->cs ); object->num_associated_callbacks--; - if (!object->num_pending_callbacks && !object->num_associated_callbacks) + if (object_is_finished( object, FALSE )) RtlWakeAllConditionVariable( &object->finished_event ); RtlLeaveCriticalSection( &pool->cs );

1 0

Marcus Meissner : ws2_32: Add IPPROTO_IPIP mapping.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 8bce44e4eabe1e9fc58cb30efa0dba9081c754c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bce44e4eabe1e9fc58cb30e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 12 11:47:05 2020 +0200 ws2_32: Add IPPROTO_IPIP mapping. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + include/winsock.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5b62767795..d688994e62 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -761,6 +761,7 @@ static const int ws_proto_map[][2] = MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ), + MAP_OPTION( IPPROTO_IPIP ), {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; diff --git a/include/winsock.h b/include/winsock.h index 891fa9de23..a8bb35a4c4 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -257,6 +257,7 @@ extern "C" { #define IPPROTO_ICMP 1 #define IPPROTO_IGMP 2 #define IPPROTO_GGP 3 +#define IPPROTO_IPIP 4 #define IPPROTO_TCP 6 #define IPPROTO_UDP 17 #define IPPROTO_IDP 22 @@ -270,6 +271,7 @@ extern "C" { #define WS_IPPROTO_ICMP 1 #define WS_IPPROTO_IGMP 2 #define WS_IPPROTO_GGP 3 +#define WS_IPPROTO_IPIP 4 #define WS_IPPROTO_TCP 6 #define WS_IPPROTO_UDP 17 #define WS_IPPROTO_IDP 22

1 0

Vijay Kiran Kamuju : qdvd: New stub DLL.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: ffff484daa60f66bc5c7e5127b627693b2f4a839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffff484daa60f66bc5c7e512… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 11 15:43:09 2020 -0500 qdvd: New stub DLL. Based on patch by Austin English. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/qdvd/Makefile.in | 6 ++++++ dlls/qdvd/qdvd.spec | 4 ++++ dlls/qdvd/qdvd_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7f228f93bc..dd55c12db8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,6 +109,7 @@ F: dlls/amstream/ F: dlls/mciqtz32/ F: dlls/qasf/ F: dlls/qcap/ +F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ diff --git a/configure b/configure index cf6609f765..b41f1c797f 100755 --- a/configure +++ b/configure @@ -1523,6 +1523,7 @@ enable_psapi enable_pstorec enable_qasf enable_qcap +enable_qdvd enable_qedit enable_qmgr enable_qmgrprxy @@ -20803,6 +20804,7 @@ wine_fn_config_makefile dlls/qasf enable_qasf wine_fn_config_makefile dlls/qasf/tests enable_tests wine_fn_config_makefile dlls/qcap enable_qcap wine_fn_config_makefile dlls/qcap/tests enable_tests +wine_fn_config_makefile dlls/qdvd enable_qdvd wine_fn_config_makefile dlls/qedit enable_qedit wine_fn_config_makefile dlls/qedit/tests enable_tests wine_fn_config_makefile dlls/qmgr enable_qmgr diff --git a/configure.ac b/configure.ac index fb775d7a73..241ea82d83 100644 --- a/configure.ac +++ b/configure.ac @@ -3582,6 +3582,7 @@ WINE_CONFIG_MAKEFILE(dlls/qasf) WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) WINE_CONFIG_MAKEFILE(dlls/qcap/tests) +WINE_CONFIG_MAKEFILE(dlls/qdvd) WINE_CONFIG_MAKEFILE(dlls/qedit) WINE_CONFIG_MAKEFILE(dlls/qedit/tests) WINE_CONFIG_MAKEFILE(dlls/qmgr) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in new file mode 100644 index 0000000000..c4b7dcce1f --- /dev/null +++ b/dlls/qdvd/Makefile.in @@ -0,0 +1,6 @@ +MODULE = qdvd.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + qdvd_main.c diff --git a/dlls/qdvd/qdvd.spec b/dlls/qdvd/qdvd.spec new file mode 100644 index 0000000000..c534b4fbf4 --- /dev/null +++ b/dlls/qdvd/qdvd.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c new file mode 100644 index 0000000000..5c7368ce90 --- /dev/null +++ b/dlls/qdvd/qdvd_main.c @@ -0,0 +1,47 @@ +/* + * DirectShow DVD support + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(instance); + return TRUE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) +{ + FIXME("clsid %s, iid %s, out %p, stub!\n", debugstr_guid(clsid), debugstr_guid(iid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +}

1 0

Zebediah Figura : devenum: Pass moniker fields to moniker_create().
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 8cabd4785fe18c45421fd48063a5dd985da32716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cabd4785fe18c45421fd480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:43 2020 -0500 devenum: Pass moniker fields to moniker_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 4 +- dlls/devenum/mediacatenum.c | 89 ++++++++++++++++++++++++----------------- dlls/devenum/parsedisplayname.c | 41 +++++++++---------- 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bdb5fb7b01..cb274d6c11 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -68,7 +68,9 @@ struct moniker }; }; -struct moniker *moniker_create(void) DECLSPEC_HIDDEN; +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) DECLSPEC_HIDDEN; +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 860eef7603..4a5ae45e8b 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -768,7 +768,7 @@ static const IMonikerVtbl IMoniker_Vtbl = moniker_IsSystemMoniker, }; -struct moniker *moniker_create(void) +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) { struct moniker *object; @@ -777,6 +777,49 @@ struct moniker *moniker_create(void) object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; object->ref = 1; + object->type = DEVICE_FILTER; + if (class) + object->class = *class; + object->has_class = !!class; + object->name = wcsdup(name); + + DEVENUM_LockModule(); + + return object; +} + +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) +{ + struct moniker *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; + object->type = DEVICE_CODEC; + if (class) + object->class = *class; + object->has_class = !!class; + object->name = wcsdup(name); + + DEVENUM_LockModule(); + + return object; +} + +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) +{ + struct moniker *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; + object->type = DEVICE_DMO; + object->class = class; + object->clsid = clsid; DEVENUM_LockModule(); @@ -842,11 +885,11 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; - struct moniker *pMoniker; + struct moniker *moniker; LONG res; ULONG fetched = 0; - CLSID clsid; HRESULT hr; + GUID clsid; HKEY hkey; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -858,14 +901,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike /* try DMOs */ if ((hr = IEnumDMO_Next(This->dmo_enum, 1, &clsid, NULL, NULL)) == S_OK) { - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_DMO; - pMoniker->clsid = clsid; - - StringFromGUID2(&clsid, buffer, CHARS_IN_GUID); - StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); + moniker = dmo_moniker_create(This->class, clsid); } /* try DirectShow filters */ else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) @@ -874,17 +910,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_FILTER; - - if (!(pMoniker->name = CoTaskMemAlloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - lstrcpyW(pMoniker->name, buffer); + moniker = filter_moniker_create(&This->class, buffer); } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) @@ -894,26 +920,15 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike if ((res = RegOpenKeyExW(This->cm_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_CODEC; - - if (!(pMoniker->name = CoTaskMemAlloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - lstrcpyW(pMoniker->name, buffer); + moniker = codec_moniker_create(&This->class, buffer); } else break; - pMoniker->has_class = TRUE; - pMoniker->class = This->class; + if (!moniker) + return E_OUTOFMEMORY; - rgelt[fetched] = &pMoniker->IMoniker_iface; - fetched++; + rgelt[fetched++] = &moniker->IMoniker_iface; } TRACE("-- fetched %d\n", fetched); diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index ab0f7bf870..45a89f6993 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -68,10 +68,10 @@ static ULONG WINAPI devenum_parser_Release(IParseDisplayName *iface) static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { + struct moniker *moniker; WCHAR buffer[MAX_PATH]; enum device_type type; - struct moniker *mon; - CLSID class; + GUID class, clsid; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); @@ -102,47 +102,42 @@ static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, return MK_E_SYNTAX; } - if (!(mon = moniker_create())) - return E_OUTOFMEMORY; - if (type == DEVICE_DMO) { lstrcpynW(buffer, name, CHARS_IN_GUID); - if (FAILED(CLSIDFromString(buffer, &mon->clsid))) - { - IMoniker_Release(&mon->IMoniker_iface); + if (FAILED(CLSIDFromString(buffer, &clsid))) return MK_E_SYNTAX; - } lstrcpynW(buffer, name + CHARS_IN_GUID - 1, CHARS_IN_GUID); - if (FAILED(CLSIDFromString(buffer, &mon->class))) - { - IMoniker_Release(&mon->IMoniker_iface); + if (FAILED(CLSIDFromString(buffer, &class))) return MK_E_SYNTAX; - } + + moniker = dmo_moniker_create(class, clsid); } else { lstrcpynW(buffer, name, CHARS_IN_GUID); if (CLSIDFromString(buffer, &class) == S_OK) { - mon->has_class = TRUE; - mon->class = class; name += CHARS_IN_GUID; + if (type == DEVICE_FILTER) + moniker = filter_moniker_create(&class, name); + else + moniker = codec_moniker_create(&class, name); } - - if (!(mon->name = CoTaskMemAlloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + else { - IMoniker_Release(&mon->IMoniker_iface); - return E_OUTOFMEMORY; + if (type == DEVICE_FILTER) + moniker = filter_moniker_create(NULL, name); + else + moniker = codec_moniker_create(NULL, name); } - lstrcpyW(mon->name, name); } - mon->type = type; - - *ret = &mon->IMoniker_iface; + if (!moniker) + return E_OUTOFMEMORY; + *ret = &moniker->IMoniker_iface; return S_OK; }

1 0

Zebediah Figura : devenum: Use calloc() in moniker_create().
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 4994ba2123d9a829ef2708d4647800da7cbac4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4994ba2123d9a829ef2708d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:42 2020 -0500 devenum: Use calloc() in moniker_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index fff40e4af3..860eef7603 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -405,7 +405,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) if (ref == 0) { CoTaskMemFree(This->name); - CoTaskMemFree(This); + free(This); DEVENUM_UnlockModule(); } return ref; @@ -770,20 +770,17 @@ static const IMonikerVtbl IMoniker_Vtbl = struct moniker *moniker_create(void) { - struct moniker *pMoniker; + struct moniker *object; - pMoniker = CoTaskMemAlloc(sizeof(*pMoniker)); - if (!pMoniker) + if (!(object = calloc(1, sizeof(*object)))) return NULL; - pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; - pMoniker->ref = 1; - pMoniker->has_class = FALSE; - pMoniker->name = NULL; + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; DEVENUM_LockModule(); - return pMoniker; + return object; } static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020