March 2019 - Wine-devel - list.winehq.org

[PATCH 2/5] mshtml: Use detach_document_node in detach_gecko_browser.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH 1/5] mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] ucrtbase: Add more _o forwards.
by Józef Kucia 13 Mar '19

13 Mar '19

For dxc.exe. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 32 +++++++++---------- dlls/ucrtbase/ucrtbase.spec | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 77be3a55151f..99df11e5c56b 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -94,7 +94,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ stub _o___acrt_iob_func +@ cdecl _o___acrt_iob_func(long) ucrtbase._o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @@ -143,10 +143,10 @@ @ stub _o___pctype_func @ stub _o___pwctype_func @ stub _o___std_exception_copy -@ stub _o___std_exception_destroy +@ cdecl _o___std_exception_destroy(ptr) ucrtbase._o___std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ stub _o___std_type_info_name -@ stub _o___stdio_common_vfprintf +@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @ stub _o___stdio_common_vfscanf @@ -154,11 +154,11 @@ @ stub _o___stdio_common_vfwprintf_p @ stub _o___stdio_common_vfwprintf_s @ stub _o___stdio_common_vfwscanf -@ stub _o___stdio_common_vsnprintf_s +@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase._o___stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s @ stub _o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p -@ stub _o___stdio_common_vsprintf_s +@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase._o___stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @ stub _o___stdio_common_vswprintf @ stub _o___stdio_common_vswprintf_p @@ -240,7 +240,7 @@ @ stub _o__endthread @ stub _o__endthreadex @ stub _o__eof -@ stub _o__errno +@ cdecl _o__errno() ucrtbase._o__errno @ stub _o__except1 @ cdecl _o__execute_onexit_table(ptr) ucrtbase._o__execute_onexit_table @ stub _o__execv @@ -281,7 +281,7 @@ @ stub _o__findnext64 @ stub _o__findnext64i32 @ stub _o__flushall -@ stub _o__fpclass +@ cdecl _o__fpclass(double) ucrtbase._o__fpclass @ stub _o__fpclassf @ stub _o__fputc_nolock @ stub _o__fputchar @@ -985,15 +985,15 @@ @ stub _o_getwchar @ stub _o_hypot @ stub _o_is_wctype -@ stub _o_isalnum -@ stub _o_isalpha +@ cdecl _o_isalnum(long) ucrtbase._o_isalnum +@ cdecl _o_isalpha(long) ucrtbase._o_isalpha @ stub _o_isblank @ stub _o_iscntrl -@ stub _o_isdigit +@ cdecl _o_isdigit(long) ucrtbase._o_isdigit @ stub _o_isgraph @ stub _o_isleadbyte @ stub _o_islower -@ stub _o_isprint +@ cdecl _o_isprint(long) ucrtbase._o_isprint @ stub _o_ispunct @ stub _o_isspace @ stub _o_isupper @@ -1075,12 +1075,12 @@ @ stub _o_puts @ stub _o_putwc @ stub _o_putwchar -@ stub _o_qsort +@ cdecl _o_qsort(ptr long long ptr) ucrtbase._o_qsort @ stub _o_qsort_s @ stub _o_raise @ stub _o_rand @ stub _o_rand_s -@ stub _o_realloc +@ cdecl _o_realloc(ptr long) ucrtbase._o_realloc @ stub _o_remainder @ stub _o_remainderf @ stub _o_remainderl @@ -1113,7 +1113,7 @@ @ stub _o_sqrt @ stub _o_sqrtf @ stub _o_srand -@ stub _o_strcat_s +@ cdecl _o_strcat_s(str long str) ucrtbase._o_strcat_s @ stub _o_strcoll @ stub _o_strcpy_s @ stub _o_strerror @@ -1128,7 +1128,7 @@ @ stub _o_strtol @ stub _o_strtold @ stub _o_strtoll -@ stub _o_strtoul +@ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ stub _o_strtoull @ stub _o_system @ stub _o_tan @@ -1141,7 +1141,7 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ stub _o_tolower +@ cdecl _o_tolower(long) ucrtbase._o_tolower @ cdecl _o_toupper(long) ucrtbase._o_toupper @ stub _o_towlower @ stub _o_towupper diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d1d8da35626..cd189d9f9827 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -758,7 +758,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ stub _o___acrt_iob_func +@ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @@ -807,10 +807,10 @@ @ stub _o___pctype_func @ stub _o___pwctype_func @ stub _o___std_exception_copy -@ stub _o___std_exception_destroy +@ cdecl _o___std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub _o___std_type_info_name -@ stub _o___stdio_common_vfprintf +@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @ stub _o___stdio_common_vfscanf @@ -818,11 +818,11 @@ @ stub _o___stdio_common_vfwprintf_p @ stub _o___stdio_common_vfwprintf_s @ stub _o___stdio_common_vfwscanf -@ stub _o___stdio_common_vsnprintf_s +@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s @ stub _o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p -@ stub _o___stdio_common_vsprintf_s +@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @ stub _o___stdio_common_vswprintf @ stub _o___stdio_common_vswprintf_p @@ -904,7 +904,7 @@ @ stub _o__endthread @ stub _o__endthreadex @ stub _o__eof -@ stub _o__errno +@ cdecl _o__errno() MSVCRT__errno @ stub _o__except1 @ cdecl _o__execute_onexit_table(ptr) MSVCRT__execute_onexit_table @ stub _o__execv @@ -945,7 +945,7 @@ @ stub _o__findnext64 @ stub _o__findnext64i32 @ stub _o__flushall -@ stub _o__fpclass +@ cdecl _o__fpclass(double) MSVCRT__fpclass @ stub _o__fpclassf @ stub _o__fputc_nolock @ stub _o__fputchar @@ -1649,15 +1649,15 @@ @ stub _o_getwchar @ stub _o_hypot @ stub _o_is_wctype -@ stub _o_isalnum -@ stub _o_isalpha +@ cdecl _o_isalnum(long) MSVCRT_isalnum +@ cdecl _o_isalpha(long) MSVCRT_isalpha @ stub _o_isblank @ stub _o_iscntrl -@ stub _o_isdigit +@ cdecl _o_isdigit(long) MSVCRT_isdigit @ stub _o_isgraph @ stub _o_isleadbyte @ stub _o_islower -@ stub _o_isprint +@ cdecl _o_isprint(long) MSVCRT_isprint @ stub _o_ispunct @ stub _o_isspace @ stub _o_isupper @@ -1740,12 +1740,12 @@ @ stub _o_puts @ stub _o_putwc @ stub _o_putwchar -@ stub _o_qsort +@ cdecl _o_qsort(ptr long long ptr) MSVCRT_qsort @ stub _o_qsort_s @ stub _o_raise @ stub _o_rand @ stub _o_rand_s -@ stub _o_realloc +@ cdecl _o_realloc(ptr long) MSVCRT_realloc @ stub _o_remainder @ stub _o_remainderf @ stub _o_remainderl @@ -1778,7 +1778,7 @@ @ stub _o_sqrt @ stub _o_sqrtf @ stub _o_srand -@ stub _o_strcat_s +@ cdecl _o_strcat_s(str long str) MSVCRT_strcat_s @ stub _o_strcoll @ stub _o_strcpy_s @ stub _o_strerror @@ -1793,7 +1793,7 @@ @ stub _o_strtol @ stub _o_strtold @ stub _o_strtoll -@ stub _o_strtoul +@ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ stub _o_strtoull @ stub _o_system @ stub _o_tan @@ -1806,7 +1806,7 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ stub _o_tolower +@ cdecl _o_tolower(long) MSVCRT__tolower @ cdecl _o_toupper(long) MSVCRT__toupper @ stub _o_towlower @ stub _o_towupper -- 2.19.2

2 1

[PATCH] winemaker: Fix --single-target option parsing.
by Huw Davies 13 Mar '19

13 Mar '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winemaker/winemaker | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winemaker/winemaker b/tools/winemaker/winemaker index ec5fb16a68..88ae78ce48 100755 --- a/tools/winemaker/winemaker +++ b/tools/winemaker/winemaker @@ -2702,8 +2702,9 @@ binmode(STDOUT, ":utf8"); target_init(\@global_settings); -foreach(@ARGV) { - my $arg=$_; +my @args = @ARGV; +while (@args>0) { + my $arg=shift @args; # General options if ($arg eq "--nobanner") { $opt_no_banner=1; @@ -2712,7 +2713,7 @@ foreach(@ARGV) { } elsif ($arg eq "--nobackup") { $opt_backup=0; } elsif ($arg eq "--single-target") { - $opt_single_target=shift @ARGV; + $opt_single_target=shift @args; } elsif ($arg eq "--lower-none") { $opt_lower=$OPT_LOWER_NONE; } elsif ($arg eq "--lower-all") { -- 2.17.1

2 1

[PATCH] winebuild: Use the correct section label on macOS.
by Huw Davies 13 Mar '19

13 Mar '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winebuild/build.h | 2 ++ tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 2 +- tools/winebuild/utils.c | 20 ++++++++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 1d4f217ae1..603b6e2b07 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -281,7 +281,9 @@ extern const char *func_declaration( const char *func ); extern const char *asm_globl( const char *func ); extern const char *get_asm_ptr_keyword(void); extern const char *get_asm_string_keyword(void); +extern const char *get_asm_export_section(void); extern const char *get_asm_rodata_section(void); +extern const char *get_asm_rsrc_section(void); extern const char *get_asm_string_section(void); extern void output_function_size( const char *name ); extern void output_gnu_stack_note(void); diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 634c933bfe..bd55bb2fa5 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -441,7 +441,7 @@ void output_resources( DLLSPEC *spec ) /* output the resource directories */ output( "\n/* resources */\n\n" ); - output( "\t.section %s\n", target_platform == PLATFORM_WINDOWS ? ".rsrc" : ".data" ); + output( "\t%s\n", get_asm_rsrc_section() ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_resources:\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index d0c147df59..65c8d144e3 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -384,7 +384,7 @@ void output_exports( DLLSPEC *spec ) if (!nr_exports) return; output( "\n/* export table */\n\n" ); - output( "\t.section %s\n", target_platform == PLATFORM_WINDOWS ? ".edata" : ".data" ); + output( "\t%s\n", get_asm_export_section() ); output( "\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_exports:\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index beff2ab135..a1cc9aabd4 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1201,6 +1201,16 @@ const char *get_asm_string_keyword(void) } } +const char *get_asm_export_section(void) +{ + switch (target_platform) + { + case PLATFORM_APPLE: return ".data"; + case PLATFORM_WINDOWS: return ".section .edata"; + default: return ".section .data"; + } +} + const char *get_asm_rodata_section(void) { switch (target_platform) @@ -1210,6 +1220,16 @@ const char *get_asm_rodata_section(void) } } +const char *get_asm_rsrc_section(void) +{ + switch (target_platform) + { + case PLATFORM_APPLE: return ".data"; + case PLATFORM_WINDOWS: return ".section .rsrc"; + default: return ".section .data"; + } +} + const char *get_asm_string_section(void) { switch (target_platform) -- 2.18.0

1 0

[PATCH 1/6] mfplat: Use newer threadpool environment structure.
by Nikolay Sivov 13 Mar '19

13 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 66f8588f82..e579168770 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -62,7 +62,7 @@ struct work_item struct queue { TP_POOL *pool; - TP_CALLBACK_ENVIRON env; + TP_CALLBACK_ENVIRON_V3 env; CRITICAL_SECTION cs; struct list pending_items; }; @@ -163,10 +163,13 @@ static void init_work_queue(MFASYNC_WORKQUEUE_TYPE queue_type, struct queue *que unsigned int max_thread; queue->pool = CreateThreadpool(NULL); - queue->env.Version = 1; + memset(&queue->env, 0, sizeof(queue->env)); + queue->env.Version = 3; + queue->env.Size = sizeof(queue->env); queue->env.Pool = queue->pool; queue->env.CleanupGroup = CreateThreadpoolCleanupGroup(); queue->env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + queue->env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); @@ -344,7 +347,7 @@ static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) if (!(item = alloc_work_item(queue, result))) return E_OUTOFMEMORY; - work_object = CreateThreadpoolWork(standard_queue_worker, item, &queue->env); + work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&queue->env); SubmitThreadpoolWork(work_object); TRACE("dispatched %p.\n", result); @@ -483,7 +486,7 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit else callback = waiting_item_callback; - item->u.wait_object = CreateThreadpoolWait(callback, item, &queue->env); + item->u.wait_object = CreateThreadpoolWait(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); SetThreadpoolWait(item->u.wait_object, event, NULL); TRACE("dispatched %p.\n", result); @@ -516,7 +519,7 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; - item->u.timer_object = CreateThreadpoolTimer(callback, item, &queue->env); + item->u.timer_object = CreateThreadpoolTimer(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); -- 2.20.1

2 7

[PATCH] ntdll/threadpool: Add support for callback priority.
by Nikolay Sivov 13 Mar '19

13 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/threadpool.c | 17 ++++++--- dlls/ntdll/threadpool.c | 67 ++++++++++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 3bd2d994ec..bf5493cac0 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -517,12 +517,21 @@ static void test_tp_simple(void) memset(&environment3, 0, sizeof(environment3)); environment3.Version = 3; environment3.Pool = pool; - environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; environment3.Size = sizeof(environment3); + + for (i = 0; i < 3; ++i) + { + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_HIGH + i; + status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + + environment3.CallbackPriority = 10; status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); - ok(!status, "TpSimpleTryPost failed with status %x\n", status); - result = WaitForSingleObject(semaphore, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(status == STATUS_INVALID_PARAMETER || broken(!status) /* Vista does not support priorities */, + "TpSimpleTryPost failed with status %x\n", status); /* test with invalid version number */ memset(&environment, 0, sizeof(environment)); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bf7449cdfa..a7ad321a8b 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -123,8 +123,8 @@ struct threadpool LONG objcount; BOOL shutdown; CRITICAL_SECTION cs; - /* pool of work items, locked via .cs */ - struct list pool; + /* Pools of work items, locked via .cs, order matches TP_CALLBACK_PRIORITY - high, normal, low. */ + struct list pools[3]; RTL_CONDITION_VARIABLE update_event; /* information about worker threads, locked via .cs */ int max_workers; @@ -155,6 +155,7 @@ struct threadpool_object PTP_SIMPLE_CALLBACK finalization_callback; BOOL may_run_long; HMODULE race_dll; + TP_CALLBACK_PRIORITY priority; /* information about the group, locked via .group->cs */ struct list group_entry; BOOL is_group_member; @@ -1648,6 +1649,7 @@ static void tp_waitqueue_unlock( struct threadpool_object *wait ) static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) { struct threadpool *pool; + unsigned int i; pool = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*pool) ); if (!pool) @@ -1660,7 +1662,8 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) RtlInitializeCriticalSection( &pool->cs ); pool->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threadpool.cs"); - list_init( &pool->pool ); + for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) + list_init( &pool->pools[i] ); RtlInitializeConditionVariable( &pool->update_event ); pool->max_workers = 500; @@ -1696,6 +1699,8 @@ static void tp_threadpool_shutdown( struct threadpool *pool ) */ static BOOL tp_threadpool_release( struct threadpool *pool ) { + unsigned int i; + if (interlocked_dec( &pool->refcount )) return FALSE; @@ -1703,7 +1708,8 @@ static BOOL tp_threadpool_release( struct threadpool *pool ) assert( pool->shutdown ); assert( !pool->objcount ); - assert( list_empty( &pool->pool ) ); + for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) + assert( list_empty( &pool->pools[i] ) ); pool->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &pool->cs ); @@ -1725,7 +1731,25 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON NTSTATUS status = STATUS_SUCCESS; if (environment) + { + /* Validate environment parameters. */ + if (environment->Version == 3) + { + TP_CALLBACK_ENVIRON_V3 *environment3 = (TP_CALLBACK_ENVIRON_V3 *)environment; + + switch (environment3->CallbackPriority) + { + case TP_CALLBACK_PRIORITY_HIGH: + case TP_CALLBACK_PRIORITY_NORMAL: + case TP_CALLBACK_PRIORITY_LOW: + break; + default: + return STATUS_INVALID_PARAMETER; + } + } + pool = (struct threadpool *)environment->Pool; + } if (!pool) { @@ -1860,6 +1884,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->finalization_callback = NULL; object->may_run_long = 0; object->race_dll = NULL; + object->priority = TP_CALLBACK_PRIORITY_NORMAL; memset( &object->group_entry, 0, sizeof(object->group_entry) ); object->is_group_member = FALSE; @@ -1881,6 +1906,13 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->finalization_callback = environment->FinalizationCallback; object->may_run_long = environment->u.s.LongFunction != 0; object->race_dll = environment->RaceDll; + if (environment->Version == 3) + { + TP_CALLBACK_ENVIRON_V3 *environment_v3 = (TP_CALLBACK_ENVIRON_V3 *)environment; + + object->priority = environment_v3->CallbackPriority; + assert( object->priority < ARRAY_SIZE(pool->pools) ); + } if (environment->ActivationContext) FIXME( "activation context not supported yet\n" ); @@ -1916,6 +1948,11 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa tp_object_release( object ); } +static void tp_object_prio_queue( struct threadpool_object *object ) +{ + list_add_tail( &object->pool->pools[object->priority], &object->pool_entry ); +} + /*********************************************************************** * tp_object_submit (internal) * @@ -1940,7 +1977,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) /* Queue work item and increment refcount. */ interlocked_inc( &object->refcount ); if (!object->num_pending_callbacks++) - list_add_tail( &pool->pool, &object->pool_entry ); + tp_object_prio_queue( object ); /* Count how often the object was signaled. */ if (object->type == TP_OBJECT_TYPE_WAIT && signaled) @@ -2061,6 +2098,20 @@ static BOOL tp_object_release( struct threadpool_object *object ) return TRUE; } +static struct list *threadpool_get_next_item( const struct threadpool *pool ) +{ + struct list *ptr; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) + { + if ((ptr = list_head( &pool->pools[i] ))) + break; + } + + return ptr; +} + /*********************************************************************** * threadpool_worker_proc (internal) */ @@ -2080,7 +2131,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) pool->num_busy_workers--; for (;;) { - while ((ptr = list_head( &pool->pool ))) + while ((ptr = threadpool_get_next_item( pool ))) { struct threadpool_object *object = LIST_ENTRY( ptr, struct threadpool_object, pool_entry ); assert( object->num_pending_callbacks > 0 ); @@ -2089,7 +2140,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) * the end of the pool list. Otherwise remove it from the pool. */ list_remove( &object->pool_entry ); if (--object->num_pending_callbacks) - list_add_tail( &pool->pool, &object->pool_entry ); + tp_object_prio_queue( object ); /* For wait objects check if they were signaled or have timed out. */ if (object->type == TP_OBJECT_TYPE_WAIT) @@ -2230,7 +2281,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) * can be terminated. */ timeout.QuadPart = (ULONGLONG)THREADPOOL_WORKER_TIMEOUT * -10000; if (RtlSleepConditionVariableCS( &pool->update_event, &pool->cs, &timeout ) == STATUS_TIMEOUT && - !list_head( &pool->pool ) && (pool->num_workers > max( pool->min_workers, 1 ) || + !threadpool_get_next_item( pool ) && (pool->num_workers > max( pool->min_workers, 1 ) || (!pool->min_workers && !pool->objcount))) { break; -- 2.20.1

1 0

[PATCH 1/5] quartz/tests: Add some tests for IBasicAudio on the DirectSound renderer.
by Zebediah Figura 13 Mar '19

13 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/dsoundrender.c | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 0d48bec879..dcaedd512d 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -146,6 +146,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE); check_interface(filter, &IID_IPin, FALSE); check_interface(filter, &IID_IQualProp, FALSE); @@ -336,6 +337,70 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_basic_audio(void) +{ + IBaseFilter *filter = create_dsound_render(); + LONG balance, volume; + ITypeInfo *typeinfo; + IBasicAudio *audio; + TYPEATTR *typeattr; + ULONG ref, count; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, &balance); + if (hr != VFW_E_MONO_AUDIO_HW) + { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(balance == 0, "Got balance %d.\n", balance); + + hr = IBasicAudio_put_Balance(audio, DSBPAN_LEFT - 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IBasicAudio_put_Balance(audio, DSBPAN_LEFT); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, &balance); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(balance == DSBPAN_LEFT, "Got balance %d.\n", balance); + } + + hr = IBasicAudio_get_Volume(audio, &volume); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(volume == 0, "Got volume %d.\n", volume); + + hr = IBasicAudio_put_Volume(audio, DSBVOLUME_MIN - 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IBasicAudio_put_Volume(audio, DSBVOLUME_MIN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Volume(audio, &volume); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(volume == DSBVOLUME_MIN, "Got volume %d.\n", volume); + + hr = IBasicAudio_GetTypeInfoCount(audio, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + + hr = IBasicAudio_GetTypeInfo(audio, 0, 0, &typeinfo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(typeattr->typekind == TKIND_DISPATCH, "Got kind %u.\n", typeattr->typekind); + ok(IsEqualGUID(&typeattr->guid, &IID_IBasicAudio), "Got IID %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_Release(typeinfo); + + IBasicAudio_Release(audio); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -415,6 +480,7 @@ START_TEST(dsoundrender) test_enum_pins(); test_find_pin(); test_pin_info(); + test_basic_audio(); test_basefilter(); CoUninitialize(); -- 2.20.1

2 7

[PATCH] hid: Handle overlapped file handles.
by Zebediah Figura 13 Mar '19

13 Mar '19

This fixes a crash in the hid:device tests for me, and likely helps with bug 46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hid/hidd.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 614e7c4bf5..2c26d9260f 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,6 +38,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + return ret; +} + BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) { TRACE("(%p)\n", PreparsedData); @@ -52,7 +64,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); if (ret) { @@ -66,7 +78,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -78,43 +90,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -124,14 +136,14 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -143,5 +155,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } -- 2.20.1

3 3

[PATCH] imm32: Get rid of some casts in attributes helper, document arguments.
by Nikolay Sivov 12 Mar '19

12 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 948ef780f6..b4621412ac 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1231,33 +1231,40 @@ static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *s return ret; } -static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, - LPBYTE target, INT tlen, BOOL unicode ) +/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to + passed mode. String length is in characters, attributes are in byte arrays. */ +static INT CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, + INT str_len, BYTE *dst, INT dst_len, BOOL unicode) { + union + { + const void *str; + const WCHAR *strW; + const char *strA; + } string; INT rc; + string.str = comp_string; + if (is_himc_ime_unicode(data) && !unicode) { - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, sslen, NULL, 0, NULL, NULL); - if (tlen) + rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0, k = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { int len; - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)ssource + i, 1, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); for (; len > 0; --len) { dst[j++] = src[k]; - if (j >= tlen) + if (j >= dst_len) goto end; } ++k; @@ -1268,23 +1275,21 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else if (!is_himc_ime_unicode(data) && unicode) { - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, sslen, NULL, 0); - if (tlen) + rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { - if (IsDBCSLeadByte(((LPSTR)ssource)[i])) + if (IsDBCSLeadByte(string.strA[i])) continue; dst[j++] = src[i]; - if (j >= tlen) + if (j >= dst_len) break; } rc = j; @@ -1292,8 +1297,8 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else { - memcpy( target, source, min(slen,tlen)); - rc = slen; + memcpy(dst, src, min(src_len, dst_len)); + rc = src_len; } return rc; -- 2.20.1

2 1