August 2016 - Wine-Commits - list.winehq.org

André Hentschel : ntdll: Bump Win 10 version to 14393.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 24031fef653e8f5ad34a2bf4117a7cd516a32eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=24031fef653e8f5ad34a2bf41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 19 16:17:36 2016 +0200 ntdll: Bump Win 10 version to 14393. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 41b44f5..b6cafc6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -187,7 +187,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x2800, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 82dc870..91478fc 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x2800,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Sebastian Lackner : ws2_32: Do not spawn a separate thread for each async task.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: d638653f07b948da3a149fa8c72c837836971e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d638653f07b948da3a149fa8c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Aug 21 19:55:43 2016 +0200 ws2_32: Do not spawn a separate thread for each async task. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/async.c | 61 +++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 573349f..56c60fc 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); struct async_query_header { + LPARAM (*func)( struct async_query_header *query ); HWND hWnd; UINT uMsg; void *sbuf; @@ -128,13 +129,6 @@ static int list_dup(char** l_src, char* ref, int item_size) return (p - ref); } -static DWORD finish_query( struct async_query_header *query, LPARAM lparam ) -{ - PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); - HeapFree( GetProcessHeap(), 0, query ); - return 0; -} - /* ----- hostent */ static LPARAM copy_he(void *base, int size, const struct WS_hostent *he) @@ -162,20 +156,20 @@ static LPARAM copy_he(void *base, int size, const struct WS_hostent *he) return MAKELPARAM( needed, 0 ); } -static DWORD WINAPI async_gethostbyname(LPVOID arg) +static LPARAM async_gethostbyname( struct async_query_header *query ) { - struct async_query_gethostbyname *aq = arg; + struct async_query_gethostbyname *aq = CONTAINING_RECORD( query, struct async_query_gethostbyname, query ); struct WS_hostent *he = WS_gethostbyname( aq->host_name ); - return finish_query( &aq->query, copy_he( aq->query.sbuf, aq->query.sbuflen, he )); + return copy_he( query->sbuf, query->sbuflen, he ); } -static DWORD WINAPI async_gethostbyaddr(LPVOID arg) +static LPARAM async_gethostbyaddr( struct async_query_header *query ) { - struct async_query_gethostbyaddr *aq = arg; + struct async_query_gethostbyaddr *aq = CONTAINING_RECORD( query, struct async_query_gethostbyaddr, query ); struct WS_hostent *he = WS_gethostbyaddr( aq->host_addr, aq->host_len, aq->host_type ); - return finish_query( &aq->query, copy_he( aq->query.sbuf, aq->query.sbuflen, he )); + return copy_he( query->sbuf, query->sbuflen, he ); } /* ----- protoent */ @@ -200,20 +194,20 @@ static LPARAM copy_pe(void *base, int size, const struct WS_protoent* pe) return MAKELPARAM( needed, 0 ); } -static DWORD WINAPI async_getprotobyname(LPVOID arg) +static LPARAM async_getprotobyname( struct async_query_header *query ) { - struct async_query_getprotobyname *aq = arg; + struct async_query_getprotobyname *aq = CONTAINING_RECORD( query, struct async_query_getprotobyname, query ); struct WS_protoent *pe = WS_getprotobyname( aq->proto_name ); - return finish_query( &aq->query, copy_pe( aq->query.sbuf, aq->query.sbuflen, pe )); + return copy_pe( query->sbuf, query->sbuflen, pe ); } -static DWORD WINAPI async_getprotobynumber(LPVOID arg) +static LPARAM async_getprotobynumber( struct async_query_header *query ) { - struct async_query_getprotobynumber *aq = arg; + struct async_query_getprotobynumber *aq = CONTAINING_RECORD( query, struct async_query_getprotobynumber, query ); struct WS_protoent *pe = WS_getprotobynumber( aq->proto_number ); - return finish_query( &aq->query, copy_pe( aq->query.sbuf, aq->query.sbuflen, pe )); + return copy_pe( query->sbuf, query->sbuflen, pe ); } /* ----- servent */ @@ -240,20 +234,29 @@ static LPARAM copy_se(void *base, int size, const struct WS_servent* se) return MAKELPARAM( needed, 0 ); } -static DWORD WINAPI async_getservbyname(LPVOID arg) +static LPARAM async_getservbyname( struct async_query_header *query ) { - struct async_query_getservbyname *aq = arg; + struct async_query_getservbyname *aq = CONTAINING_RECORD( query, struct async_query_getservbyname, query ); struct WS_servent *se = WS_getservbyname( aq->serv_name, aq->serv_proto ); - return finish_query( &aq->query, copy_se( aq->query.sbuf, aq->query.sbuflen, se )); + return copy_se( query->sbuf, query->sbuflen, se ); } -static DWORD WINAPI async_getservbyport(LPVOID arg) +static LPARAM async_getservbyport( struct async_query_header *query ) { - struct async_query_getservbyport *aq = arg; + struct async_query_getservbyport *aq = CONTAINING_RECORD( query, struct async_query_getservbyport, query ); struct WS_servent *se = WS_getservbyport( aq->serv_port, aq->serv_proto ); - return finish_query( &aq->query, copy_se( aq->query.sbuf, aq->query.sbuflen, se )); + return copy_se( query->sbuf, query->sbuflen, se ); +} + + +static void WINAPI async_worker( TP_CALLBACK_INSTANCE *instance, void *context ) +{ + struct async_query_header *query = context; + LPARAM lparam = query->func( query ); + PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); + HeapFree( GetProcessHeap(), 0, query ); } @@ -264,30 +267,28 @@ static DWORD WINAPI async_getservbyport(LPVOID arg) * with no thread support. This relies on the fact that PostMessage() does * not actually call the windowproc before the function returns. */ -static HANDLE run_query( HWND hWnd, UINT uMsg, LPTHREAD_START_ROUTINE func, +static HANDLE run_query( HWND hWnd, UINT uMsg, LPARAM (*func)(struct async_query_header *), struct async_query_header *query, void *sbuf, INT sbuflen ) { static LONG next_handle = 0xdead; - HANDLE thread; ULONG handle; do handle = LOWORD( InterlockedIncrement( &next_handle )); while (!handle); /* avoid handle 0 */ + query->func = func; query->hWnd = hWnd; query->uMsg = uMsg; query->handle = UlongToHandle( handle ); query->sbuf = sbuf; query->sbuflen = sbuflen; - thread = CreateThread( NULL, 0, func, query, 0, NULL ); - if (!thread) + if (!TrySubmitThreadpoolCallback( async_worker, query, NULL )) { SetLastError( WSAEWOULDBLOCK ); HeapFree( GetProcessHeap(), 0, query ); return 0; } - CloseHandle( thread ); return UlongToHandle( handle ); }

1 0

Austin English : ntdll: Forward DecodeSystemPointer/ EncodeSystemPointer to DecodePointer/EncodePointer.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 0f137a0b89f5ead1ce9b0420c0f1562e8991f346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f137a0b89f5ead1ce9b0420c… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 19 03:27:18 2016 -0500 ntdll: Forward DecodeSystemPointer/EncodeSystemPointer to DecodePointer/EncodePointer. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/ntdll/ntdll.spec | 4 ++-- include/winbase.h | 6 ++++-- tools/make_specfiles | 1 + 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec index 471ee42..587b06b 100644 --- a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec +++ b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall Beep(long long) kernel32.Beep @ stdcall DecodePointer(ptr) kernel32.DecodePointer -@ stub DecodeSystemPointer +@ stdcall DecodeSystemPointer(ptr) kernel32.DecodeSystemPointer @ stdcall EncodePointer(ptr) kernel32.EncodePointer -@ stub EncodeSystemPointer +@ stdcall EncodeSystemPointer(ptr) kernel32.EncodeSystemPointer diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 239965f..2d82c71 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -355,7 +355,7 @@ @ stdcall DebugBreakProcess(long) @ stdcall DebugSetProcessKillOnExit(long) @ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer -# @ stub DecodeSystemPointer ( -> ntdll.RtlDecodeSystemPointer) +@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceA(long str str) @ stdcall DefineDosDeviceW(long wstr wstr) @ stdcall DelayLoadFailureHook(str str) @@ -390,7 +390,7 @@ @ stdcall DuplicateHandle(long long long ptr long long long) # @ stub EnableThreadProfiling @ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer -# @ stub EncodeSystemPointer ( -> ntdll.RtlEncodeSystemPointer) +@ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer @ stdcall EndUpdateResourceA(long long) @ stdcall EndUpdateResourceW(long long) @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e35ef8b..de9404c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -101,7 +101,7 @@ @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid @ stdcall DebugBreak() kernel32.DebugBreak @ stdcall DecodePointer(ptr) kernel32.DecodePointer -@ stub DecodeSystemPointer +@ stdcall DecodeSystemPointer(ptr) kernel32.DecodeSystemPointer @ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW @ stdcall DeleteAce(ptr long) advapi32.DeleteAce @ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection @@ -120,7 +120,7 @@ @ stdcall DuplicateToken(long long ptr) advapi32.DuplicateToken @ stdcall DuplicateTokenEx(long long ptr long long ptr) advapi32.DuplicateTokenEx @ stdcall EncodePointer(ptr) kernel32.EncodePointer -@ stub EncodeSystemPointer +@ stdcall EncodeSystemPointer(ptr) kernel32.EncodeSystemPointer @ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection @ stdcall EnumCalendarInfoExEx(ptr wstr long wstr long long) kernel32.EnumCalendarInfoExEx @ stdcall EnumCalendarInfoExW(ptr long long long) kernel32.EnumCalendarInfoExW diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5f8ee54..244a721 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -519,7 +519,7 @@ @ stub RtlDeactivateActivationContextUnsafeFast @ stub RtlDebugPrintTimes @ stdcall RtlDecodePointer(ptr) -# @ stub RtlDecodeSystemPointer +@ stdcall RtlDecodeSystemPointer(ptr) RtlDecodePointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) @ stub RtlDefaultNpAcl @@ -562,7 +562,7 @@ @ stdcall RtlEmptyAtomTable(ptr long) # @ stub RtlEnableEarlyCriticalSectionEventCreation @ stdcall RtlEncodePointer(ptr) -# @ stub RtlEncodeSystemPointer +@ stdcall RtlEncodeSystemPointer(ptr) RtlEncodePointer @ stdcall -arch=win32 -ret64 RtlEnlargedIntegerMultiply(long long) @ stdcall -arch=win32 RtlEnlargedUnsignedDivide(int64 long ptr) @ stdcall -arch=win32 -ret64 RtlEnlargedUnsignedMultiply(long long) diff --git a/include/winbase.h b/include/winbase.h index 99e3107..521d2da 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1819,7 +1819,8 @@ WINBASEAPI BOOL WINAPI DebugActiveProcessStop(DWORD); WINBASEAPI void WINAPI DebugBreak(void); WINBASEAPI BOOL WINAPI DebugBreakProcess(HANDLE); WINBASEAPI BOOL WINAPI DebugSetProcessKillOnExit(BOOL); -WINBASEAPI PVOID WINAPI DecodePointer(PVOID); +WINBASEAPI void * WINAPI DecodePointer(void *); +WINBASEAPI void * WINAPI DecodeSystemPointer(void *); WINADVAPI BOOL WINAPI DecryptFileA(LPCSTR,DWORD); WINADVAPI BOOL WINAPI DecryptFileW(LPCWSTR,DWORD); #define DecryptFile WINELIB_NAME_AW(DecryptFile) @@ -1853,7 +1854,8 @@ WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); -WINBASEAPI PVOID WINAPI EncodePointer(PVOID); +WINBASEAPI void * WINAPI EncodePointer(void *); +WINBASEAPI void * WINAPI EncodeSystemPointer(void *); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR); WINADVAPI BOOL WINAPI EncryptFileW(LPCWSTR); #define EncryptFile WINELIB_NAME_AW(EncryptFile) diff --git a/tools/make_specfiles b/tools/make_specfiles index d658f30..947cde7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -177,6 +177,7 @@ my @dll_groups = "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-xstate-l2-1-0", "api-ms-win-core-errorhandling-l1-1-2", + "api-ms-win-core-util-l1-1-0", ], [ "kernel32",

1 0

Colin Finck : rpcrt4: Add a test for RpcBindingServerFromClient (todo_wine ).
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: b59c53fbffc1519d55224ad294c26d9148296cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59c53fbffc1519d55224ad29… Author: Colin Finck <mail(a)colinfinck.de> Date: Fri Aug 19 11:52:58 2016 +0200 rpcrt4: Add a test for RpcBindingServerFromClient (todo_wine). Signed-off-by: Colin Finck <mail(a)colinfinck.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0b31d3d..2653f7a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -744,6 +744,35 @@ void __cdecl s_context_handle_test(void) pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if2.InterfaceId, 0); } + + binding = NULL; + status = RpcBindingServerFromClient(NULL, &binding); + + todo_wine + { + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(binding != NULL, "binding is NULL\n"); + } + + if (status == RPC_S_OK && binding != NULL) + { + unsigned char* string_binding = NULL; + unsigned char* computer_name = NULL; + + status = RpcBindingToStringBindingA(binding, &string_binding); + + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(string_binding != NULL, "string_binding is NULL\n"); + + status = RpcStringBindingParseA(string_binding, NULL, NULL, &computer_name, NULL, NULL); + + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(computer_name != NULL, "computer_name is NULL\n"); + + RpcStringFreeA(&string_binding); + RpcStringFreeA(&computer_name); + RpcBindingFree(&binding); + } } void __cdecl s_get_numbers(int length, int size, pints_t n[])

1 0

Colin Finck : include: Add a prototype for RpcBindingServerFromClient.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 8c900c8fb251ad15845980f15c9cb826fc9fa868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c900c8fb251ad15845980f15… Author: Colin Finck <mail(a)colinfinck.de> Date: Fri Aug 19 11:52:57 2016 +0200 include: Add a prototype for RpcBindingServerFromClient. Signed-off-by: Colin Finck <mail(a)colinfinck.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcdce.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/rpcdce.h b/include/rpcdce.h index f5f031c..ee01d88 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -338,6 +338,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingReset( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE* ServerBinding ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetOption( RPC_BINDING_HANDLE Binding, ULONG Option, ULONG_PTR OptionValue );

1 0

Sebastian Lackner : ntdll: Do not call group cancel callback for finished simple callbacks.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: a9f648ef6969c7732cfb289160b77593e198eab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f648ef6969c7732cfb28916… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 20 22:38:43 2016 +0200 ntdll: Do not call group cancel callback for finished simple callbacks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 20 ++++++++++++++++++++ dlls/ntdll/threadpool.c | 33 +++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 7eccb23..af0b667 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -705,6 +705,14 @@ static void test_tp_work_scheduler(void) pTpReleasePool(pool); } +static void CALLBACK simple_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +{ + HANDLE *semaphores = userdata; + trace("Running simple release callback\n"); + ReleaseSemaphore(semaphores, 1, NULL); + Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ +} + static void CALLBACK work_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) { HANDLE semaphore = userdata; @@ -1008,6 +1016,18 @@ static void test_tp_group_cancel(void) ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); pTpReleaseCleanupGroupMembers(group, TRUE, NULL); + /* terminated simple callbacks should not trigger the group cancel callback */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + environment.CleanupGroupCancelCallback = unexpected_group_cancel_cleanup_cb; + status = pTpSimpleTryPost(simple_release_cb, semaphores[1], &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + pTpReleaseCleanupGroupMembers(group, TRUE, semaphores); + /* test cancellation callback for objects with multiple instances */ work = NULL; memset(&environment, 0, sizeof(environment)); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index a572869..04790aa 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1885,11 +1885,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa } if (is_simple_callback) - { - tp_object_prepare_shutdown( object ); - object->shutdown = TRUE; tp_object_release( object ); - } } /*********************************************************************** @@ -2185,6 +2181,13 @@ static void CALLBACK threadpool_worker_proc( void *param ) RtlEnterCriticalSection( &pool->cs ); pool->num_busy_workers--; + /* Simple callbacks are automatically shutdown after execution. */ + if (object->type == TP_OBJECT_TYPE_SIMPLE) + { + tp_object_prepare_shutdown( object ); + object->shutdown = TRUE; + } + object->num_running_callbacks--; if (!object->num_pending_callbacks && !object->num_running_callbacks) RtlWakeAllConditionVariable( &object->group_finished_event ); @@ -2598,18 +2601,20 @@ VOID WINAPI TpReleaseCleanupGroupMembers( TP_CLEANUP_GROUP *group, BOOL cancel_p { tp_object_wait( object, TRUE ); - /* Execute group cancellation callback if defined, and if this was actually a group cancel. */ - if ((object->type == TP_OBJECT_TYPE_SIMPLE || !object->shutdown) && - cancel_pending && object->group_cancel_callback) + if (!object->shutdown) { - TRACE( "executing group cancel callback %p(%p, %p)\n", - object->group_cancel_callback, object->userdata, userdata ); - object->group_cancel_callback( object->userdata, userdata ); - TRACE( "callback %p returned\n", object->group_cancel_callback ); - } + /* Execute group cancellation callback if defined, and if this was actually a group cancel. */ + if (cancel_pending && object->group_cancel_callback) + { + TRACE( "executing group cancel callback %p(%p, %p)\n", + object->group_cancel_callback, object->userdata, userdata ); + object->group_cancel_callback( object->userdata, userdata ); + TRACE( "callback %p returned\n", object->group_cancel_callback ); + } - if (object->type != TP_OBJECT_TYPE_SIMPLE && !object->shutdown) - tp_object_release( object ); + if (object->type != TP_OBJECT_TYPE_SIMPLE) + tp_object_release( object ); + } object->shutdown = TRUE; tp_object_release( object );

1 0

Sebastian Lackner : ntdll: Group cancel callbacks should be executed after waiting for pending callbacks.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: be7bcdc0f94d306109140dbfd06635c26e9eb14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7bcdc0f94d306109140dbfd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 20 21:23:48 2016 +0200 ntdll: Group cancel callbacks should be executed after waiting for pending callbacks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 65 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/threadpool.c | 29 +++++++++---------- 2 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index f59a15c..7eccb23 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -835,6 +835,18 @@ static void CALLBACK simple_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void ReleaseSemaphore(semaphores[1], 1, NULL); } +static void CALLBACK work_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) +{ + HANDLE *semaphores = userdata; + DWORD result; + + trace("Running work group cancel callback\n"); + + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 200); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); +} + static void CALLBACK group_cancel_cleanup_release_cb(void *object, void *userdata) { HANDLE *semaphores = userdata; @@ -844,6 +856,15 @@ static void CALLBACK group_cancel_cleanup_release_cb(void *object, void *userdat ReleaseSemaphore(semaphores[0], 1, NULL); } +static void CALLBACK group_cancel_cleanup_release2_cb(void *object, void *userdata) +{ + HANDLE *semaphores = userdata; + trace("Running group cancel cleanup release2 callback\n"); + group_cancel_tid = GetCurrentThreadId(); + ok(object == userdata, "expected %p, got %p\n", userdata, object); + ReleaseSemaphore(semaphores[0], 1, NULL); +} + static void CALLBACK group_cancel_cleanup_increment_cb(void *object, void *userdata) { trace("Running group cancel cleanup increment callback\n"); @@ -872,6 +893,11 @@ static void CALLBACK unexpected_wait_cb(TP_CALLBACK_INSTANCE *instance, void *us ok(0, "Unexpected callback\n"); } +static void CALLBACK unexpected_group_cancel_cleanup_cb(void *object, void *userdata) +{ + ok(0, "Unexpected callback\n"); +} + static void test_tp_group_cancel(void) { TP_CALLBACK_ENVIRON environment; @@ -943,6 +969,45 @@ static void test_tp_group_cancel(void) ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %x, got %x\n", GetCurrentThreadId(), group_cancel_tid); + /* test if cancellation callbacks are executed before or after wait */ + work = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + environment.CleanupGroupCancelCallback = group_cancel_cleanup_release2_cb; + status = pTpAllocWork(&work, work_group_cancel_cb, semaphores, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + pTpPostWork(work); + pTpPostWork(work); + + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + group_cancel_tid = 0xdeadbeef; + pTpReleaseCleanupGroupMembers(group, TRUE, semaphores); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(group_cancel_tid == GetCurrentThreadId(), "expected tid %x, got %x\n", + GetCurrentThreadId(), group_cancel_tid); + + /* group cancel callback is not executed if object is destroyed while waiting */ + work = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + environment.CleanupGroupCancelCallback = unexpected_group_cancel_cleanup_cb; + status = pTpAllocWork(&work, work_release_cb, semaphores[1], &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + pTpPostWork(work); + + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + pTpReleaseCleanupGroupMembers(group, TRUE, NULL); + /* test cancellation callback for objects with multiple instances */ work = NULL; memset(&environment, 0, sizeof(environment)); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 61f6ea0..a572869 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1948,7 +1948,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) * * Cancels all currently pending callbacks for a specific object. */ -static void tp_object_cancel( struct threadpool_object *object, BOOL group_cancel, PVOID userdata ) +static void tp_object_cancel( struct threadpool_object *object ) { struct threadpool *pool = object->pool; LONG pending_callbacks = 0; @@ -1965,15 +1965,6 @@ static void tp_object_cancel( struct threadpool_object *object, BOOL group_cance } RtlLeaveCriticalSection( &pool->cs ); - /* Execute group cancellation callback if defined, and if this was actually a group cancel. */ - if (group_cancel && object->group_cancel_callback) - { - TRACE( "executing group cancel callback %p(%p, %p)\n", - object->group_cancel_callback, object->userdata, userdata ); - object->group_cancel_callback( object->userdata, userdata ); - TRACE( "callback %p returned\n", object->group_cancel_callback ); - } - while (pending_callbacks--) tp_object_release( object ); } @@ -2598,7 +2589,7 @@ VOID WINAPI TpReleaseCleanupGroupMembers( TP_CLEANUP_GROUP *group, BOOL cancel_p { LIST_FOR_EACH_ENTRY( object, &members, struct threadpool_object, group_entry ) { - tp_object_cancel( object, TRUE, userdata ); + tp_object_cancel( object ); } } @@ -2607,6 +2598,16 @@ VOID WINAPI TpReleaseCleanupGroupMembers( TP_CLEANUP_GROUP *group, BOOL cancel_p { tp_object_wait( object, TRUE ); + /* Execute group cancellation callback if defined, and if this was actually a group cancel. */ + if ((object->type == TP_OBJECT_TYPE_SIMPLE || !object->shutdown) && + cancel_pending && object->group_cancel_callback) + { + TRACE( "executing group cancel callback %p(%p, %p)\n", + object->group_cancel_callback, object->userdata, userdata ); + object->group_cancel_callback( object->userdata, userdata ); + TRACE( "callback %p returned\n", object->group_cancel_callback ); + } + if (object->type != TP_OBJECT_TYPE_SIMPLE && !object->shutdown) tp_object_release( object ); @@ -2900,7 +2901,7 @@ VOID WINAPI TpWaitForTimer( TP_TIMER *timer, BOOL cancel_pending ) TRACE( "%p %d\n", timer, cancel_pending ); if (cancel_pending) - tp_object_cancel( this, FALSE, NULL ); + tp_object_cancel( this ); tp_object_wait( this, FALSE ); } @@ -2914,7 +2915,7 @@ VOID WINAPI TpWaitForWait( TP_WAIT *wait, BOOL cancel_pending ) TRACE( "%p %d\n", wait, cancel_pending ); if (cancel_pending) - tp_object_cancel( this, FALSE, NULL ); + tp_object_cancel( this ); tp_object_wait( this, FALSE ); } @@ -2928,6 +2929,6 @@ VOID WINAPI TpWaitForWork( TP_WORK *work, BOOL cancel_pending ) TRACE( "%p %u\n", work, cancel_pending ); if (cancel_pending) - tp_object_cancel( this, FALSE, NULL ); + tp_object_cancel( this ); tp_object_wait( this, FALSE ); }

1 0

Sebastian Lackner : ntdll: Call group cancel callback with the correct arguments.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: a8830a24783feebc63ea0b83391053a8cd14d635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8830a24783feebc63ea0b833… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 20 21:23:24 2016 +0200 ntdll: Call group cancel callback with the correct arguments. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 54 ++++++++++++++++++++++++++++++++++++------- dlls/ntdll/threadpool.c | 7 +++--- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 7672d63..f59a15c 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -813,21 +813,25 @@ static void test_tp_group_wait(void) static DWORD group_cancel_tid; -static void CALLBACK group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +static void CALLBACK simple_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; NTSTATUS status; DWORD result; + int i; - trace("Running group cancel callback\n"); + trace("Running simple group cancel callback\n"); status = pTpCallbackMayRunLong(instance); ok(status == STATUS_TOO_MANY_THREADS || broken(status == 1) /* Win Vista / 2008 */, "expected STATUS_TOO_MANY_THREADS, got %08x\n", status); ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + for (i = 0; i < 4; i++) + { + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } ReleaseSemaphore(semaphores[1], 1, NULL); } @@ -836,6 +840,7 @@ static void CALLBACK group_cancel_cleanup_release_cb(void *object, void *userdat HANDLE *semaphores = userdata; trace("Running group cancel cleanup release callback\n"); group_cancel_tid = GetCurrentThreadId(); + ok(object == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", object); ReleaseSemaphore(semaphores[0], 1, NULL); } @@ -846,7 +851,23 @@ static void CALLBACK group_cancel_cleanup_increment_cb(void *object, void *userd InterlockedIncrement((LONG *)userdata); } -static void CALLBACK unexpected_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +static void CALLBACK unexpected_simple_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +{ + ok(0, "Unexpected callback\n"); +} + +static void CALLBACK unexpected_work_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) +{ + ok(0, "Unexpected callback\n"); +} + +static void CALLBACK unexpected_timer_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_TIMER *timer) +{ + ok(0, "Unexpected callback\n"); +} + +static void CALLBACK unexpected_wait_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, + TP_WAIT *wait, TP_WAIT_RESULT result) { ok(0, "Unexpected callback\n"); } @@ -858,12 +879,14 @@ static void test_tp_group_cancel(void) LONG userdata, userdata2; HANDLE semaphores[2]; NTSTATUS status; + TP_TIMER *timer; + TP_WAIT *wait; TP_WORK *work; TP_POOL *pool; DWORD result; int i; - semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); + semaphores[0] = CreateSemaphoreA(NULL, 0, 4, NULL); ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); @@ -885,7 +908,7 @@ static void test_tp_group_cancel(void) memset(&environment, 0, sizeof(environment)); environment.Version = 1; environment.Pool = pool; - status = pTpSimpleTryPost(group_cancel_cb, semaphores, &environment); + status = pTpSimpleTryPost(simple_group_cancel_cb, semaphores, &environment); ok(!status, "TpSimpleTryPost failed with status %x\n", status); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); @@ -895,9 +918,24 @@ static void test_tp_group_cancel(void) environment.Pool = pool; environment.CleanupGroup = group; environment.CleanupGroupCancelCallback = group_cancel_cleanup_release_cb; - status = pTpSimpleTryPost(unexpected_cb, NULL, &environment); + status = pTpSimpleTryPost(unexpected_simple_cb, (void *)0xdeadbeef, &environment); ok(!status, "TpSimpleTryPost failed with status %x\n", status); + work = NULL; + status = pTpAllocWork(&work, unexpected_work_cb, (void *)0xdeadbeef, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + + timer = NULL; + status = pTpAllocTimer(&timer, unexpected_timer_cb, (void *)0xdeadbeef, &environment); + ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(timer != NULL, "expected timer != NULL\n"); + + wait = NULL; + status = pTpAllocWait(&wait, unexpected_wait_cb, (void *)0xdeadbeef, &environment); + ok(!status, "TpAllocWait failed with status %x\n", status); + ok(wait != NULL, "expected wait != NULL\n"); + group_cancel_tid = 0xdeadbeef; pTpReleaseCleanupGroupMembers(group, TRUE, semaphores); result = WaitForSingleObject(semaphores[1], 1000); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index eea5a88..61f6ea0 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1966,10 +1966,11 @@ static void tp_object_cancel( struct threadpool_object *object, BOOL group_cance RtlLeaveCriticalSection( &pool->cs ); /* Execute group cancellation callback if defined, and if this was actually a group cancel. */ - if (pending_callbacks && group_cancel && object->group_cancel_callback) + if (group_cancel && object->group_cancel_callback) { - TRACE( "executing group cancel callback %p(%p, %p)\n", object->group_cancel_callback, object, userdata ); - object->group_cancel_callback( object, userdata ); + TRACE( "executing group cancel callback %p(%p, %p)\n", + object->group_cancel_callback, object->userdata, userdata ); + object->group_cancel_callback( object->userdata, userdata ); TRACE( "callback %p returned\n", object->group_cancel_callback ); }

1 0

Sebastian Lackner : ntdll/tests: Add tests for releasing threadpool objects during TpReleaseCleanupGroupMembers.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 51447083920885defa679d88579e13f838a2494c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51447083920885defa679d885… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 20 21:22:54 2016 +0200 ntdll/tests: Add tests for releasing threadpool objects during TpReleaseCleanupGroupMembers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 109 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 9b4b522..7672d63 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1,7 +1,7 @@ /* * Unit test suite for thread pool functions * - * Copyright 2015 Sebastian Lackner + * Copyright 2015-2016 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -705,6 +705,112 @@ static void test_tp_work_scheduler(void) pTpReleasePool(pool); } +static void CALLBACK work_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) +{ + HANDLE semaphore = userdata; + trace("Running work release callback\n"); + ReleaseSemaphore(semaphore, 1, NULL); + Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ + pTpReleaseWork(work); +} + +static void CALLBACK timer_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_TIMER *timer) +{ + HANDLE semaphore = userdata; + trace("Running timer release callback\n"); + ReleaseSemaphore(semaphore, 1, NULL); + Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ + pTpReleaseTimer(timer); +} + +static void CALLBACK wait_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, + TP_WAIT *wait, TP_WAIT_RESULT result) +{ + HANDLE semaphore = userdata; + trace("Running wait release callback\n"); + ReleaseSemaphore(semaphore, 1, NULL); + Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ + pTpReleaseWait(wait); +} + +static void test_tp_group_wait(void) +{ + TP_CALLBACK_ENVIRON environment; + TP_CLEANUP_GROUP *group; + LARGE_INTEGER when; + HANDLE semaphore; + NTSTATUS status; + TP_TIMER *timer; + TP_WAIT *wait; + TP_WORK *work; + TP_POOL *pool; + DWORD result; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + /* allocate a cleanup group */ + group = NULL; + status = pTpAllocCleanupGroup(&group); + ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(group != NULL, "expected pool != NULL\n"); + + /* release work object during TpReleaseCleanupGroupMembers */ + work = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + status = pTpAllocWork(&work, work_release_cb, semaphore, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + pTpPostWork(work); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + pTpReleaseCleanupGroupMembers(group, FALSE, NULL); + + /* release timer object during TpReleaseCleanupGroupMembers */ + timer = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + status = pTpAllocTimer(&timer, timer_release_cb, semaphore, &environment); + ok(!status, "TpAllocTimer failed with status %x\n", status); + ok(timer != NULL, "expected timer != NULL\n"); + when.QuadPart = 0; + pTpSetTimer(timer, &when, 0, 0); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + pTpReleaseCleanupGroupMembers(group, FALSE, NULL); + + /* release wait object during TpReleaseCleanupGroupMembers */ + wait = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + status = pTpAllocWait(&wait, wait_release_cb, semaphore, &environment); + ok(!status, "TpAllocWait failed with status %x\n", status); + ok(wait != NULL, "expected wait != NULL\n"); + when.QuadPart = 0; + pTpSetWait(wait, INVALID_HANDLE_VALUE, &when); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + pTpReleaseCleanupGroupMembers(group, FALSE, NULL); + + /* cleanup */ + pTpReleaseCleanupGroup(group); + pTpReleasePool(pool); + CloseHandle(semaphore); +} + static DWORD group_cancel_tid; static void CALLBACK group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) @@ -1679,6 +1785,7 @@ START_TEST(threadpool) test_tp_simple(); test_tp_work(); test_tp_work_scheduler(); + test_tp_group_wait(); test_tp_group_cancel(); test_tp_instance(); test_tp_disassociate();

1 0

Sebastian Lackner : ntdll: Allow to release threadpool objects while waiting for group.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: master Commit: 53db77b5d7a16865069dd4eca83864bf48bbcc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53db77b5d7a16865069dd4eca… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 20 21:22:29 2016 +0200 ntdll: Allow to release threadpool objects while waiting for group. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 51 +++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 5d5b49d..eea5a88 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -2,7 +2,7 @@ * Thread pooling * * Copyright (c) 2006 Robert Shearman - * Copyright (c) 2014-2015 Sebastian Lackner + * Copyright (c) 2014-2016 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -327,7 +327,7 @@ static inline struct threadpool_instance *impl_from_TP_CALLBACK_INSTANCE( TP_CAL static void CALLBACK threadpool_worker_proc( void *param ); static void tp_object_submit( struct threadpool_object *object, BOOL signaled ); -static void tp_object_shutdown( struct threadpool_object *object ); +static void tp_object_prepare_shutdown( struct threadpool_object *object ); static BOOL tp_object_release( struct threadpool_object *object ); static struct threadpool *default_threadpool = NULL; @@ -1886,7 +1886,8 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa if (is_simple_callback) { - tp_object_shutdown( object ); + tp_object_prepare_shutdown( object ); + object->shutdown = TRUE; tp_object_release( object ); } } @@ -2001,19 +2002,16 @@ static void tp_object_wait( struct threadpool_object *object, BOOL group_wait ) } /*********************************************************************** - * tp_object_shutdown (internal) + * tp_object_prepare_shutdown (internal) * - * Marks a threadpool object for shutdown (which means that no further - * tasks can be submitted). + * Prepares a threadpool object for shutdown. */ -static void tp_object_shutdown( struct threadpool_object *object ) +static void tp_object_prepare_shutdown( struct threadpool_object *object ) { if (object->type == TP_OBJECT_TYPE_TIMER) tp_timerqueue_unlock( object ); else if (object->type == TP_OBJECT_TYPE_WAIT) tp_waitqueue_unlock( object ); - - object->shutdown = TRUE; } /*********************************************************************** @@ -2574,23 +2572,18 @@ VOID WINAPI TpReleaseCleanupGroupMembers( TP_CLEANUP_GROUP *group, BOOL cancel_p assert( object->group == this ); assert( object->is_group_member ); - /* Simple callbacks are very special. The user doesn't hold any reference, so - * they would be released too early. Add one additional temporary reference. */ - if (object->type == TP_OBJECT_TYPE_SIMPLE) + if (interlocked_inc( &object->refcount ) == 1) { - if (interlocked_inc( &object->refcount ) == 1) - { - /* Object is basically already destroyed, but group reference - * was not deleted yet. We can safely ignore this object. */ - interlocked_dec( &object->refcount ); - list_remove( &object->group_entry ); - object->is_group_member = FALSE; - continue; - } + /* Object is basically already destroyed, but group reference + * was not deleted yet. We can safely ignore this object. */ + interlocked_dec( &object->refcount ); + list_remove( &object->group_entry ); + object->is_group_member = FALSE; + continue; } object->is_group_member = FALSE; - tp_object_shutdown( object ); + tp_object_prepare_shutdown( object ); } /* Move members to a new temporary list */ @@ -2612,6 +2605,11 @@ VOID WINAPI TpReleaseCleanupGroupMembers( TP_CLEANUP_GROUP *group, BOOL cancel_p LIST_FOR_EACH_ENTRY_SAFE( object, next, &members, struct threadpool_object, group_entry ) { tp_object_wait( object, TRUE ); + + if (object->type != TP_OBJECT_TYPE_SIMPLE && !object->shutdown) + tp_object_release( object ); + + object->shutdown = TRUE; tp_object_release( object ); } } @@ -2638,7 +2636,8 @@ VOID WINAPI TpReleaseTimer( TP_TIMER *timer ) TRACE( "%p\n", timer ); - tp_object_shutdown( this ); + tp_object_prepare_shutdown( this ); + this->shutdown = TRUE; tp_object_release( this ); } @@ -2651,7 +2650,8 @@ VOID WINAPI TpReleaseWait( TP_WAIT *wait ) TRACE( "%p\n", wait ); - tp_object_shutdown( this ); + tp_object_prepare_shutdown( this ); + this->shutdown = TRUE; tp_object_release( this ); } @@ -2664,7 +2664,8 @@ VOID WINAPI TpReleaseWork( TP_WORK *work ) TRACE( "%p\n", work ); - tp_object_shutdown( this ); + tp_object_prepare_shutdown( this ); + this->shutdown = TRUE; tp_object_release( this ); }

1 0