September 2020 - Wine-Commits

Alexandre Julliard : ntdll: Call the thread entry point through BaseThreadInitThunk().
by Alexandre Julliard Sept. 1, 2020

Sept. 1, 2020

Module: wine Branch: master Commit: 1a9558cf9bda654950e389532b400023ecbd81c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9558cf9bda654950e38953… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 12:48:04 2020 +0200 ntdll: Call the thread entry point through BaseThreadInitThunk(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/thread.c | 18 ++++++++++++++++++ dlls/kernel32/thread.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 8 ++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 37 ++++++++++++++++--------------------- 6 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 38eb1d5ece..e1c1319375 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -182,7 +182,7 @@ @ stub BaseProcessInitPostImport # @ stub BaseQueryModuleData # @ stub BaseSetLastNTError -# @ stub BaseThreadInitThunk +@ stdcall -fastcall BaseThreadInitThunk(long ptr ptr) @ stub BaseUpdateAppcompatCache # @ stub BaseVerifyUnicodeString # @ stub Basep8BitStringToDynamicUnicodeString diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index bd9fe7fece..a6c923dc06 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1176,10 +1176,24 @@ static void test_SetThreadContext(void) CloseHandle( thread ); } +static DWORD WINAPI test_stack( void *arg ) +{ + DWORD *stack = (DWORD *)(((DWORD)&arg & ~0xfff) + 0x1000); + + ok( stack == NtCurrentTeb()->Tib.StackBase, "wrong stack %p/%p\n", + stack, NtCurrentTeb()->Tib.StackBase ); + ok( !stack[-1], "wrong data %p = %08x\n", stack - 1, stack[-1] ); + ok( stack[-2] == (DWORD)arg, "wrong data %p = %08x\n", stack - 2, stack[-2] ); + ok( stack[-3] == (DWORD)test_stack, "wrong data %p = %08x\n", stack - 3, stack[-3] ); + ok( !stack[-4], "wrong data %p = %08x\n", stack - 4, stack[-4] ); + return 0; +} + static void test_GetThreadContext(void) { CONTEXT ctx; BOOL ret; + HANDLE thread; memset(&ctx, 0xcc, sizeof(ctx)); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; @@ -1188,6 +1202,10 @@ static void test_GetThreadContext(void) ok(ctx.ContextFlags == CONTEXT_DEBUG_REGISTERS, "ContextFlags = %x\n", ctx.ContextFlags); ok(!ctx.Dr0, "Dr0 = %x\n", ctx.Dr0); ok(!ctx.Dr1, "Dr0 = %x\n", ctx.Dr0); + + thread = CreateThread( NULL, 0, test_stack, (void *)0x1234, 0, NULL ); + WaitForSingleObject( thread, 1000 ); + CloseHandle( thread ); } static void test_GetThreadSelectorEntry(void) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 7fdec7b2ff..6e82a1e8c4 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -31,9 +31,38 @@ #include "winerror.h" #include "winternl.h" +#include "wine/asm.h" #include "kernel_private.h" +#ifdef __i386__ +__ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "movl 8(%ebp),%ebx\n\t" + /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ + "pushl 4(%ebp)\n\t" + "pushl %ebx\n\t" + "call *%edx\n\t" + "movl %eax,(%esp)\n\t" + "call " __ASM_STDCALL( "RtlExitUserThread", 4 )) +#endif + +/*********************************************************************** + * BaseThreadInitThunk (KERNEL32.@) + */ +void __fastcall BaseThreadInitThunk( DWORD unknown, LPTHREAD_START_ROUTINE entry, void *arg ) +{ + RtlExitUserThread( entry( arg ) ); +} + + /*********************************************************************** * FreeLibraryAndExitThread (KERNEL32.@) */ diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 57fc75cef4..6d2115644f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -58,6 +58,7 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *); +void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) = NULL; static void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void *); const struct unix_funcs *unix_funcs = NULL; @@ -4008,6 +4009,13 @@ static void process_init(void) MESSAGE( "wine: could not find __wine_start_process in kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } + RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); + if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name, + 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) + { + MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } init_locale( wm->ldr.DllBase ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 86bdc9d44f..58e118011b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -82,6 +82,7 @@ extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; +extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) DECLSPEC_HIDDEN; extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN; extern void init_directories(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ab34f0ba96..d718acd9d8 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -105,37 +105,32 @@ void WINAPI RtlExitUserThread( ULONG status ) */ #ifdef __i386__ __ASM_STDCALL_FUNC( RtlUserThreadStart, 8, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl %ebx\n\t" /* arg */ - "pushl %eax\n\t" /* entry */ - "call " __ASM_NAME("call_thread_func") ) - -/* wrapper for apps that don't declare the thread function correctly */ -extern DWORD call_thread_func_wrapper( PRTL_THREAD_START_ROUTINE entry, void *arg ); -__ASM_GLOBAL_FUNC(call_thread_func_wrapper, + "movl %ebx,8(%esp)\n\t" /* arg */ + "movl %eax,4(%esp)\n\t" /* entry */ + "jmp " __ASM_NAME("call_thread_func") ) + +/* wrapper to call BaseThreadInitThunk */ +extern void DECLSPEC_NORETURN call_thread_func_wrapper( void *thunk, PRTL_THREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC( call_thread_func_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "subl $4,%esp\n\t" - "pushl 12(%ebp)\n\t" - "call *8(%ebp)\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret" ) + "subl $4,%esp\n\t" + "andl $~0xf,%esp\n\t" + "xorl %ecx,%ecx\n\t" + "movl 12(%ebp),%edx\n\t" + "movl 16(%ebp),%eax\n\t" + "movl %eax,(%esp)\n\t" + "call *8(%ebp)" ) void DECLSPEC_HIDDEN call_thread_func( PRTL_THREAD_START_ROUTINE entry, void *arg ) { __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - RtlExitUserThread( call_thread_func_wrapper( entry, arg )); + call_thread_func_wrapper( pBaseThreadInitThunk, entry, arg ); } __EXCEPT(call_unhandled_exception_filter) { @@ -151,7 +146,7 @@ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - RtlExitUserThread( ((LPTHREAD_START_ROUTINE)entry)( arg )); + pBaseThreadInitThunk( 0, (LPTHREAD_START_ROUTINE)entry, arg ); } __EXCEPT(call_unhandled_exception_filter) {

1 0

Paul Gofman : kernel32: Implement SetXStateFeaturesMask().
by Alexandre Julliard Sept. 1, 2020

Sept. 1, 2020

Module: wine Branch: master Commit: 541b06747ae4a64d0e39ed010b256b9326490701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=541b06747ae4a64d0e39ed01… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 1 12:21:43 2020 +0300 kernel32: Implement SetXStateFeaturesMask(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 41 +++++++++++- dlls/ntdll/exception.c | 10 +++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 77 ++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + include/winbase.h | 1 + 11 files changed, 131 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=541b06747ae4a64d0e39…

1 0

Paul Gofman : wbemprox: Provide semi-stub implementation for client_security_QueryBlanket().
by Alexandre Julliard Sept. 1, 2020

Sept. 1, 2020

Module: wine Branch: master Commit: 9dea12d87d550291afc37fa5bcd1ee56eda2c78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dea12d87d550291afc37fa5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 22:01:25 2020 +0300 wbemprox: Provide semi-stub implementation for client_security_QueryBlanket(). Horizon Zero Dawn fails to query system memory size if CoQueryProxyBlanket() fails for wbem services. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 20 ++++++++++++++++++-- dlls/wbemprox/tests/query.c | 7 +++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 3a0963e1f6..ab7146db2d 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -88,8 +88,24 @@ static HRESULT WINAPI client_security_QueryBlanket( void **pAuthInfo, DWORD *pCapabilities ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("semi-stub.\n"); + + if (pAuthnSvc) + *pAuthnSvc = RPC_C_AUTHN_NONE; + if (pAuthzSvc) + *pAuthzSvc = RPC_C_AUTHZ_NONE; + if (pServerPrincName) + *pServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_NONE; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = 0; + + return WBEM_NO_ERROR; } static HRESULT WINAPI client_security_SetBlanket( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 17942cd89a..74fdfaa9bc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1713,6 +1713,7 @@ START_TEST(query) BSTR path = SysAllocString( L"ROOT\\CIMV2" ); IWbemLocator *locator; IWbemServices *services; + DWORD authn_svc; HRESULT hr; CoInitialize( NULL ); @@ -1728,6 +1729,12 @@ START_TEST(query) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoQueryProxyBlanket( (IUnknown *)services, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + + hr = CoQueryProxyBlanket( (IUnknown *)services, &authn_svc, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr );

1 0