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

Alexandre Julliard : ntdll: Move the activation context initialization out of NtCreateThreadEx().
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: fdb09f452376ead1fceeb04dc5407095467418c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb09f452376ead1fceeb04d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:38:10 2020 +0200 ntdll: Move the activation context initialization out of NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 31 +++++++++++++++++++++++++------ dlls/ntdll/unix/thread.c | 12 ------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 02dddfacb5..76e314841b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -190,26 +190,45 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, HANDLE *handle_ptr, CLIENT_ID *id ) { ULONG flags = suspended ? THREAD_CREATE_FLAGS_CREATE_SUSPENDED : 0; - HANDLE handle; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr_list = (PS_ATTRIBUTE_LIST *)buffer; + HANDLE handle, actctx; + TEB *teb; + ULONG ret; NTSTATUS status; CLIENT_ID client_id; OBJECT_ATTRIBUTES attr; - PS_ATTRIBUTE_LIST attr_list = { sizeof(attr_list) }; - attr_list.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; - attr_list.Attributes[0].Size = sizeof(client_id); - attr_list.Attributes[0].ValuePtr = &client_id; + attr_list->TotalLength = sizeof(buffer); + attr_list->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr_list->Attributes[0].Size = sizeof(client_id); + attr_list->Attributes[0].ValuePtr = &client_id; + attr_list->Attributes[0].ReturnLength = NULL; + attr_list->Attributes[1].Attribute = PS_ATTRIBUTE_TEB_ADDRESS; + attr_list->Attributes[1].Size = sizeof(teb); + attr_list->Attributes[1].ValuePtr = &teb; + attr_list->Attributes[1].ReturnLength = NULL; InitializeObjectAttributes( &attr, NULL, 0, NULL, descr ); + RtlGetActiveActivationContext( &actctx ); + if (actctx) flags |= THREAD_CREATE_FLAGS_CREATE_SUSPENDED; + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, start, param, - flags, 0, stack_commit, stack_reserve, &attr_list ); + flags, 0, stack_commit, stack_reserve, attr_list ); if (!status) { + if (actctx) + { + ULONG_PTR cookie; + RtlActivateActivationContextEx( 0, teb, actctx, &cookie ); + if (!suspended) NtResumeThread( handle, &ret ); + } if (id) *id = client_id; if (handle_ptr) *handle_ptr = handle; else NtClose( handle ); } + if (actctx) RtlReleaseActivationContext( actctx ); return status; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6c64eecf1f..3b451a2257 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -88,7 +88,6 @@ struct startup_info { PRTL_THREAD_START_ROUTINE entry; void *arg; - HANDLE actctx; }; /*********************************************************************** @@ -102,18 +101,12 @@ static void start_thread( TEB *teb ) struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; BOOL suspend; - ULONG_PTR cookie; debug_info.str_pos = debug_info.out_pos = 0; thread_data->debug_info = &debug_info; thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); server_init_thread( info->entry, &suspend ); - if (info->actctx) - { - RtlActivateActivationContext( 0, info->actctx, &cookie ); - RtlReleaseActivationContext( info->actctx ); - } signal_start_thread( info->entry, info->arg, suspend, pRtlUserThreadStart, teb ); } @@ -164,7 +157,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT int request_pipe[2]; SIZE_T extra_stack = PTHREAD_STACK_MIN; CLIENT_ID client_id; - HANDLE actctx; TEB *teb; INITIAL_TEB stack; NTSTATUS status; @@ -230,8 +222,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT return status; } - RtlGetActiveActivationContext( &actctx ); - pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); if ((status = virtual_alloc_teb( &teb ))) goto done; @@ -249,7 +239,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT info = (struct startup_info *)(teb + 1); info->entry = start; info->arg = param; - info->actctx = actctx; teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; @@ -278,7 +267,6 @@ done: if (status) { NtClose( *handle ); - RtlReleaseActivationContext( actctx ); close( request_pipe[1] ); return status; }

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the drive info section.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: d7ef680e950431d868e6d52418513472af7edbb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ef680e950431d868e6d524… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:45:04 2020 +0200 ntdll: Use a pthread mutex for the drive info section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c5ffd0166d..c90fac156a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1871,13 +1871,14 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * /* retrieve device/inode number for all the drives */ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) { + static pthread_mutex_t cache_mutex = PTHREAD_MUTEX_INITIALIZER; static struct file_identity cache[MAX_DOS_DRIVES]; static time_t last_update; static unsigned int nb_drives; unsigned int ret; time_t now = time(NULL); - RtlEnterCriticalSection( &dir_section ); + pthread_mutex_lock( &cache_mutex ); if (now != last_update) { char *buffer, *p; @@ -1912,7 +1913,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) } memcpy( info, cache, sizeof(cache) ); ret = nb_drives; - RtlLeaveCriticalSection( &dir_section ); + pthread_mutex_unlock( &cache_mutex ); return ret; }

1 0

Alexandre Julliard : ntdll: Use a pthread mutex for the wait on address section.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 052e8dbf5985ffa5875067491b03a523257752f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=052e8dbf5985ffa587506749… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:48:21 2020 +0200 ntdll: Use a pthread mutex for the wait on address section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/sync.c | 25 +++++++++---------------- dlls/ntdll/unix/unix_private.h | 2 +- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 9a593f7725..faca7da5c9 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -590,7 +590,7 @@ static void invoke_system_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, - timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, + timeout_t abs_timeout, CONTEXT *context, pthread_mutex_t *mutex, user_apc_t *user_apc ) { unsigned int ret; @@ -649,10 +649,10 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = offsetof( select_op_t, signal_and_wait.signal ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); - if (cs) + if (mutex) { - RtlLeaveCriticalSection( cs ); - cs = NULL; + pthread_mutex_unlock( mutex ); + mutex = NULL; } if (ret != STATUS_PENDING) break; diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 5080caef52..69263efa0e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -78,15 +78,7 @@ HANDLE keyed_event = 0; static const LARGE_INTEGER zero_timeout; -static RTL_CRITICAL_SECTION addr_section; -static RTL_CRITICAL_SECTION_DEBUG addr_section_debug = -{ - 0, 0, &addr_section, - { &addr_section_debug.ProcessLocksList, &addr_section_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": addr_section") } -}; -static RTL_CRITICAL_SECTION addr_section = { &addr_section_debug, -1, 0, 0, 0, 0 }; - +static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER; /* return a monotonic time counter, in Win32 ticks */ static inline ULONGLONG monotonic_counter(void) @@ -2253,10 +2245,10 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size if ((ret = fast_wait_addr( addr, cmp, size, timeout )) != STATUS_NOT_IMPLEMENTED) return ret; - RtlEnterCriticalSection( &addr_section ); + pthread_mutex_lock( &addr_mutex ); if (!compare_addr( addr, cmp, size )) { - RtlLeaveCriticalSection( &addr_section ); + pthread_mutex_unlock( &addr_mutex ); return STATUS_SUCCESS; } @@ -2272,7 +2264,8 @@ 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 ); - return server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, &addr_section, NULL ); + return server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, + abs_timeout, NULL, &addr_mutex, NULL ); } /*********************************************************************** @@ -2282,9 +2275,9 @@ void WINAPI RtlWakeAddressAll( const void *addr ) { if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) return; - RtlEnterCriticalSection( &addr_section ); + pthread_mutex_lock( &addr_mutex ); while (NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} - RtlLeaveCriticalSection( &addr_section ); + pthread_mutex_unlock( &addr_mutex ); } /*********************************************************************** @@ -2294,7 +2287,7 @@ void WINAPI RtlWakeAddressSingle( const void *addr ) { if (fast_wake_addr( addr ) != STATUS_NOT_IMPLEMENTED) return; - RtlEnterCriticalSection( &addr_section ); + pthread_mutex_lock( &addr_mutex ); NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ); - RtlLeaveCriticalSection( &addr_section ); + pthread_mutex_unlock( &addr_mutex ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 2a73f17e10..3d56ea5d40 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -162,7 +162,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( pthread_mutex_t *mutex, 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, CONTEXT *context, RTL_CRITICAL_SECTION *cs, + timeout_t abs_timeout, CONTEXT *context, pthread_mutex_t *mutex, 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;

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_MODE ioctl.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 22f53e6d9dd23a88d75ec8b6e4b3a73a186344d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f53e6d9dd23a88d75ec8b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:05 2020 +0200 server: Introduce IOCTL_CONDRV_SET_MODE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index c30802be66..25e5820046 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -25,6 +25,7 @@ /* common console input and output ioctls */ #define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/server/console.c b/server/console.c index 4c161fccb0..577d39bdaa 100644 --- a/server/console.c +++ b/server/console.c @@ -190,7 +190,7 @@ struct screen_buffer struct object obj; /* object header */ struct list entry; /* entry in list of all screen buffers */ struct console_input *input; /* associated console input */ - int mode; /* output mode */ + unsigned int mode; /* output mode */ int cursor_size; /* size of cursor (percentage filled) */ int cursor_visible;/* cursor visibility flag */ int cursor_x; /* position of cursor */ @@ -1584,6 +1584,15 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; + case IOCTL_CONDRV_SET_MODE: + if (get_req_data_size() != sizeof(console->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + console->mode = *(unsigned int *)get_req_data(); + return 1; + case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; @@ -1657,6 +1666,15 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; + case IOCTL_CONDRV_SET_MODE: + if (get_req_data_size() != sizeof(screen_buffer->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + screen_buffer->mode = *(unsigned int *)get_req_data(); + return 1; + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info;

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 48a23dbd432d8dbeaa884fe656105d902729f8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a23dbd432d8dbeaa884fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:40 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- dlls/kernelbase/console.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b923348015..49869948e9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -822,7 +822,7 @@ static void testScreenBuffer(HANDLE hConOut) ret = WriteConsoleA(hFileOutWT, test_str1, lstrlenA(test_str1), &len, NULL); error = GetLastError(); ok(!ret, "Shouldn't succeed\n"); - todo_wine ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION, + ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION, "GetLastError: got %u\n", error); CloseHandle(hFileOutRW); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cc30a11d68..52fd5bb39c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -610,18 +610,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleInputExeNameW( DWORD len, LPWSTR buffer */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) { - BOOL ret; - - SERVER_START_REQ( get_console_mode ) - { - req->handle = console_handle_unmap( handle ); - if ((ret = !wine_server_call_err( req ))) - { - if (mode) *mode = reply->mode; - } - } - SERVER_END_REQ; - return ret; + return console_ioctl( handle, IOCTL_CONDRV_GET_MODE, NULL, 0, mode, sizeof(*mode), NULL ); }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_MODE ioctl.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 409160bb596e44bcceee24d9ecd4d2629cbd6cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409160bb596e44bcceee24d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:29 2020 +0200 server: Introduce IOCTL_CONDRV_GET_MODE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ server/console.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 5992834069..c30802be66 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -23,6 +23,9 @@ #include "winioctl.h" +/* common console input and output ioctls */ +#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) diff --git a/server/console.c b/server/console.c index a91d963a41..4c161fccb0 100644 --- a/server/console.c +++ b/server/console.c @@ -1576,6 +1576,14 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { + case IOCTL_CONDRV_GET_MODE: + if (get_reply_max_size() != sizeof(console->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; + case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; @@ -1641,6 +1649,14 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { + case IOCTL_CONDRV_GET_MODE: + if (get_reply_max_size() != sizeof(screen_buffer->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info;

1 0

Zebediah Figura : msdmo: Return the number of media types retrieved from DMOGetTypes().
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 37b926b8fe57e3242b0729598f33f0ad69a2c55f URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b926b8fe57e3242b072959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 09:38:03 2020 -0500 msdmo: Return the number of media types retrieved from DMOGetTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 22 ++++++++-------------- dlls/msdmo/tests/msdmo.c | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index cd253c3e9a..8c32a8f59f 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -730,22 +730,16 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsid, ULONG input_count, ULONG *ret_input_c } *ret_input_count = 0; - if (input_count > 0) - { - size = input_count * sizeof(DMO_PARTIAL_MEDIATYPE); - ret = RegQueryValueExW(key, L"InputTypes", NULL, NULL, (BYTE *)input, &size); - if (!ret || ret == ERROR_MORE_DATA) - *ret_input_count = size / sizeof(DMO_PARTIAL_MEDIATYPE); - } + size = input_count * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(key, L"InputTypes", NULL, NULL, (BYTE *)input, &size); + if (!ret || ret == ERROR_MORE_DATA) + *ret_input_count = min(input_count, size / sizeof(DMO_PARTIAL_MEDIATYPE)); *ret_output_count = 0; - if (output_count > 0) - { - size = output_count * sizeof(DMO_PARTIAL_MEDIATYPE); - ret = RegQueryValueExW(key, L"OutputTypes", NULL, NULL, (BYTE *)output, &size); - if (!ret || ret == ERROR_MORE_DATA) - *ret_output_count = size / sizeof(DMO_PARTIAL_MEDIATYPE); - } + size = output_count * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(key, L"OutputTypes", NULL, NULL, (BYTE *)output, &size); + if (!ret || ret == ERROR_MORE_DATA) + *ret_output_count = min(output_count, size / sizeof(DMO_PARTIAL_MEDIATYPE)); return S_OK; } diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 2afa56e5a6..a1ab8ee00d 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -144,7 +144,7 @@ static void test_DMOGetTypes(void) memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(input_count == 1, "Got input count %u.\n", input_count); + ok(input_count == 1, "Got input count %u.\n", input_count); ok(!output_count, "Got output count %u.\n", output_count); todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n");

1 0

Serge Gautherie : msvcrt: Remove extra pointers on lldiv() implementation and test.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 0a835c8da9e7aa5bc1d9f43ae785ce441757d18d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a835c8da9e7aa5bc1d9f43a… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 11 20:02:45 2020 +0200 msvcrt: Remove extra pointers on lldiv() implementation and test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 9 +++++---- dlls/ucrtbase/tests/misc.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e9154795d..ae4a267e03 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2114,11 +2114,12 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) /********************************************************************* * lldiv (MSVCR100.@) */ -MSVCRT_lldiv_t* CDECL MSVCRT_lldiv(MSVCRT_lldiv_t *ret, - MSVCRT_longlong num, MSVCRT_longlong denom) +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) { - ret->quot = num / denom; - ret->rem = num % denom; + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; return ret; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cd100cf1a9..e4928b194f 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -520,12 +520,19 @@ static void test__sopen_s(void) static void test_lldiv(void) { - static lldiv_t* (CDECL *p_lldiv)(lldiv_t*,LONGLONG,LONGLONG) = (void*)lldiv; lldiv_t r; - p_lldiv(&r, (LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + r = lldiv(((LONGLONG)0x111 << 32) + 0x222, (LONGLONG)1 << 32); ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x69CF0012 << 32) + 0x0033E78A, 0x30); + ok(r.quot == ((LONGLONG)0x02345000 << 32) + 0x600114D2, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == 0x2A, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x243A5678 << 32) + 0x9ABCDEF0, (LONGLONG)0x12 << 48); + ok(r.quot == 0x0203, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == ((LONGLONG)0x00045678 << 32) + 0x9ABCDEF0, "rem = %s\n", wine_dbgstr_longlong(r.rem)); } static void test_isblank(void)

1 0

Rémi Bernon : mmdevapi: Support new AUDCLNT_* creation flags.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 2e1934598d035b852bcceb8ef01eac181d8415ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1934598d035b852bcceb8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 10 14:13:44 2020 -0500 mmdevapi: Support new AUDCLNT_* creation flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25173 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45700 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 6 ++++-- dlls/wineandroid.drv/mmdevdrv.c | 6 ++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++-- dlls/wineoss.drv/mmdevdrv.c | 6 ++++-- dlls/winepulse.drv/mmdevdrv.c | 6 ++++-- include/audiosessiontypes.h | 2 ++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 09f98dc7b8..714d6ab9b1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1264,8 +1264,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index b4d8564256..eac55f9e29 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -813,8 +813,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index acfa01c3d6..860d33fa3b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1323,8 +1323,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a08e7f561b..0c97b85f3a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1055,8 +1055,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 463d3d5a71..23c34a50f6 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1590,8 +1590,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)) { - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h index 2f78574353..81c6526575 100644 --- a/include/audiosessiontypes.h +++ b/include/audiosessiontypes.h @@ -34,9 +34,11 @@ typedef enum _AUDCLNT_SHAREMODE #define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 #define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 #define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY 0x08000000 #define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 +#define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000 typedef enum _AudioSessionState {

1 0

Alexandre Julliard : ntdll: Return the TEB pointer in NtCreateThreadEx().
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: c6fea822a99ca4b5c82e5217a0a631434ad52c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6fea822a99ca4b5c82e5217… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 18:36:56 2020 +0200 ntdll: Return the TEB pointer in NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 19 ++++++++++++++----- dlls/ntdll/unix/thread.c | 13 ++++++++++--- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4e65b0eab2..9a593f7725 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -533,9 +533,11 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) break; case APC_CREATE_THREAD: { - PS_ATTRIBUTE_LIST attr = { sizeof(attr) }; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[2] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; CLIENT_ID id; HANDLE handle; + TEB *teb; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; void *func = wine_server_get_ptr( call->create_thread.func ); @@ -545,16 +547,23 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { - attr.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; - attr.Attributes[0].Size = sizeof(id); - attr.Attributes[0].ValuePtr = &id; + attr->TotalLength = sizeof(buffer); + attr->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr->Attributes[0].Size = sizeof(id); + attr->Attributes[0].ValuePtr = &id; + attr->Attributes[0].ReturnLength = NULL; + attr->Attributes[1].Attribute = PS_ATTRIBUTE_TEB_ADDRESS; + attr->Attributes[1].Size = sizeof(teb); + attr->Attributes[1].ValuePtr = &teb; + attr->Attributes[1].ReturnLength = NULL; result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), func, arg, call->create_thread.flags, 0, - commit, reserve, &attr ); + commit, reserve, attr ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.pid = HandleToULong(id.UniqueProcess); result->create_thread.tid = HandleToULong(id.UniqueThread); + result->create_thread.teb = wine_server_client_ptr( teb ); } else result->create_thread.status = STATUS_INVALID_PARAMETER; break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 78da6ae638..6c64eecf1f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -123,7 +123,7 @@ static void start_thread( TEB *teb ) * * Update the output attributes. */ -static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id ) +static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB *teb ) { SIZE_T i, count = (attr->TotalLength - sizeof(attr->TotalLength)) / sizeof(PS_ATTRIBUTE); @@ -135,6 +135,12 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id ) memcpy( attr->Attributes[i].ValuePtr, id, size ); if (attr->Attributes[i].ReturnLength) *attr->Attributes[i].ReturnLength = size; } + else if (attr->Attributes[i].Attribute == PS_ATTRIBUTE_TEB_ADDRESS) + { + SIZE_T size = min( attr->Attributes[i].Size, sizeof(teb) ); + memcpy( attr->Attributes[i].ValuePtr, &teb, size ); + if (attr->Attributes[i].ReturnLength) *attr->Attributes[i].ReturnLength = size; + } } } @@ -181,10 +187,11 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if (result.create_thread.status == STATUS_SUCCESS) { + TEB *teb = wine_server_get_ptr( result.create_thread.teb ); *handle = wine_server_ptr_handle( result.create_thread.handle ); client_id.UniqueProcess = ULongToHandle( result.create_thread.pid ); client_id.UniqueThread = ULongToHandle( result.create_thread.tid ); - if (attr_list) update_attr_list( attr_list, &client_id ); + if (attr_list) update_attr_list( attr_list, &client_id, teb ); } return result.create_thread.status; } @@ -275,7 +282,7 @@ done: close( request_pipe[1] ); return status; } - if (attr_list) update_attr_list( attr_list, &client_id ); + if (attr_list) update_attr_list( attr_list, &client_id, teb ); return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a282155eb..730e368f0c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -647,6 +647,7 @@ typedef union unsigned int status; process_id_t pid; thread_id_t tid; + client_ptr_t teb; obj_handle_t handle; } create_thread; struct @@ -6481,7 +6482,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 624 +#define SERVER_PROTOCOL_VERSION 625 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 36e674f086..90c695ec0b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -663,6 +663,7 @@ typedef union unsigned int status; /* status returned by call */ process_id_t pid; /* process id */ thread_id_t tid; /* thread id */ + client_ptr_t teb; /* thread teb (in process address space) */ obj_handle_t handle; /* handle to new thread */ } create_thread; struct

1 0