September 2020 - Wine-commits

Zhiyi Zhang : user32: Always wait for the desktop process to be ready in load_desktop_driver().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 23ce18d5e5a31bf2712c2951a45cfda4747e0c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ce18d5e5a31bf2712c2951… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 1 15:03:26 2020 +0800 user32: Always wait for the desktop process to be ready in load_desktop_driver(). Having a __wine_display_device_guid property in the desktop window only guarantees that the window is created. Explorer.exe still has to finish setting up virtual desktop, display settings etc. load_desktop_driver() needs to make sure that the desktop initialization is done before allowing applications to call user32 driver functions. Otherwise, they might get incorrect data. This race condition became apparent after aadae4d1ea173dfa30e09d6cc816bb174e35f90d, which adds ~100ms to the initialization process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49762 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6d916c7d65..abd8a34cce 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -59,17 +59,14 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + UINT guid_atom; USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ + SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - if (!guid_atom) - { - SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); - } + guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); memcpy( key, key_pathW, sizeof(key_pathW) ); if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; strcatW( key, displayW );

1 0

Paul Gofman : kernel32: Implement SetXStateFeaturesMask().
by Alexandre Julliard 01 Sep '20

01 Sep '20

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 : kernel32: Implement GetXStateFeaturesMask().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 85a33ff731bf82e229a2c6aa386d36fa4a90da65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a33ff731bf82e229a2c6aa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 1 12:21:44 2020 +0300 kernel32: Implement GetXStateFeaturesMask(). 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 | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 34 +++++++++++++++ dlls/ntdll/exception.c | 11 +++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 48 +++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + include/winbase.h | 1 + 11 files changed, 100 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85a33ff731bf82e229a2…

1 0

Paul Gofman : kernel32: Implement CopyContext().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 81a08cea79afccdf4daddda5936c05a30849f83a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81a08cea79afccdf4daddda5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 1 12:21:45 2020 +0300 kernel32: Implement CopyContext(). 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 | 56 ++++ dlls/ntdll/exception.c | 85 ++++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 365 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + include/winbase.h | 1 + 11 files changed, 512 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81a08cea79afccdf4dad…

1 0

Alexandre Julliard : ntdll: Call the thread entry point through BaseThreadInitThunk().
by Alexandre Julliard 01 Sep '20

01 Sep '20

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

Alexandre Julliard : ntdll: Call the process entry point through RtlUserThreadStart().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: c2c330532e96cc0cf5ba30f784d195fea90a4366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c330532e96cc0cf5ba30f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 12:49:07 2020 +0200 ntdll: Call the process entry point through RtlUserThreadStart(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 8 +++++++- dlls/ntdll/thread.c | 4 ++-- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 24 ++++++++++++------------ dlls/ntdll/unix/signal_arm64.c | 25 +++++++++++++------------ dlls/ntdll/unix/signal_i386.c | 16 +++++++--------- dlls/ntdll/unix/signal_x86_64.c | 13 ++++++------- dlls/ntdll/unix/thread.c | 3 +-- dlls/ntdll/unix/unix_private.h | 2 +- 9 files changed, 50 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2c330532e96cc0cf5ba…

1 0

Alexandre Julliard : kernel32: Remove the no longer used __wine_start_process() function.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: f7e4fd0cf8f5237614474a6e5dcdad24a6a1dcdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e4fd0cf8f5237614474a6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 13:02:47 2020 +0200 kernel32: Remove the no longer used __wine_start_process() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 3 -- dlls/kernel32/process.c | 75 --------------------------------------------- dlls/ntdll/loader.c | 8 ----- 3 files changed, 86 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e1c1319375..0111f0e446 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1693,6 +1693,3 @@ # Unix files @ cdecl wine_get_unix_file_name(wstr) @ cdecl wine_get_dos_file_name(str) - -# Init code -@ cdecl -norelay -private __wine_start_process() diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9d725e1a43..ff4e79ff2b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -59,7 +59,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(process); -WINE_DECLARE_DEBUG_CHANNEL(relay); typedef struct { @@ -85,80 +84,6 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', #define PDB32_WIN32S_PROC 0x8000 /* Win32s process */ -#ifdef __i386__ -extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ); -__ASM_GLOBAL_FUNC( call_process_entry, - "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 *12(%ebp)\n\t" - "leal -4(%ebp),%esp\n\t" - "popl %ebx\n\t" - __ASM_CFI(".cfi_same_value %ebx\n\t") - "popl %ebp\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret" ) - -__ASM_GLOBAL_FUNC( __wine_start_process, - "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("start_process") ) -#else -static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) -{ - return entry( peb ); -} -#endif - -/*********************************************************************** - * __wine_start_process - * - * Startup routine of a new process. Runs on the new process stack. - */ -#ifdef __i386__ -void CDECL start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) -#else -void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) -#endif -{ - if (!entry) - { - ERR( "%s doesn't have an entry point, it cannot be executed\n", - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); - ExitThread( 1 ); - } - - TRACE_(relay)( "\1Starting process %s (entryproc=%p)\n", - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); - - __TRY - { - ExitThread( call_process_entry( peb, entry )); - } - __EXCEPT(UnhandledExceptionFilter) - { - TerminateProcess( GetCurrentProcess(), GetExceptionCode() ); - } - __ENDTRY - abort(); /* should not be reached */ -} - - /*********************************************************************** * wait_input_idle * diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6d2115644f..96fa0566cf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -59,7 +59,6 @@ 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; @@ -4002,13 +4001,6 @@ static void process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } - RtlInitAnsiString( &func_name, "__wine_start_process" ); - if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name, - 0, (void **)&kernel32_start_process )) != STATUS_SUCCESS) - { - 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)

1 0

Alexandre Julliard : ntdll: Get rid of the server_init_process_done() Unix library callback.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 9e973954fdfd2f9e22545bb6311053c835861193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e973954fdfd2f9e22545bb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 13:03:44 2020 +0200 ntdll: Get rid of the server_init_process_done() Unix library callback. This time without setting Eip to 0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 -- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 +---- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 96fa0566cf..7370857cfd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4073,8 +4073,6 @@ static void process_init(void) teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; - - unix_funcs->server_init_process_done( kernel32_start_process ); } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ff75581286..6f25f4ae87 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1368,7 +1368,6 @@ static struct unix_funcs unix_funcs = get_locales, virtual_release_address_space, exec_process, - server_init_process_done, set_show_dot_files, load_so_dll, load_builtin_dll, @@ -1401,6 +1400,7 @@ static void start_main_thread(void) init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); + server_init_process_done(); } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index e5d1e235eb..cc8b519b98 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1453,7 +1453,7 @@ void server_init_process(void) /*********************************************************************** * server_init_process_done */ -void CDECL server_init_process_done( void *relay ) +void server_init_process_done(void) { PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = get_exe_nt_header(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 26da1ac8c9..ce3c14d259 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,7 +117,6 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; -extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; @@ -167,6 +166,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; extern void server_init_process(void) DECLSPEC_HIDDEN; +extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 4c352c0a4b..6857e31c7d 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 101 +#define NTDLL_UNIXLIB_VERSION 102 struct unix_funcs { @@ -84,9 +84,6 @@ struct unix_funcs /* thread/process functions */ NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ); - /* server functions */ - void (CDECL *server_init_process_done)( void *relay ); - /* file functions */ void (CDECL *set_show_dot_files)( BOOL enable );

1 0

Zebediah Figura : d3dcompiler/tests: Add more tests for SM4 constant packing.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: beb1bbb78cc661c94f7e5928ec1cdacce8c9eed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb1bbb78cc661c94f7e5928… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 12 19:33:36 2020 -0500 d3dcompiler/tests: Add more tests for SM4 constant packing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 72b64eb81d..cdffc80668 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -564,6 +564,7 @@ static void test_reflection(void) " float b;\n" " float c;\n" " } s;\n" + /* In direct contradiction to the documentation, this does not align. */ " bool g;\n" " float h[2];\n" " int i;\n" @@ -572,6 +573,10 @@ static void test_reflection(void) " row_major float3x1 l;\n" "#pragma pack_matrix(row_major)\n" " float3x1 o;\n" + " float4 p;\n" + " float q;\n" + " struct r_name {float a;} r;\n" + " column_major float3x1 t;\n" "};\n" "\n" "float m;\n" @@ -585,15 +590,21 @@ static void test_reflection(void) { D3D11_SHADER_VARIABLE_DESC var_desc; D3D11_SHADER_TYPE_DESC type_desc; + const D3D11_SHADER_TYPE_DESC *field_types; }; - static const D3D11_SHADER_TYPE_DESC field_types[] = + static const D3D11_SHADER_TYPE_DESC s_field_types[] = { {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 16, "float"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 20, "float"}, }; + static const D3D11_SHADER_TYPE_DESC r_field_types[] = + { + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + }; + static const struct shader_variable globals_vars = {{"m", 0, 4, D3D_SVF_USED}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}; static const struct shader_variable params_vars = @@ -604,7 +615,7 @@ static void test_reflection(void) {{"b", 4, 8}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 2, 0, 0, 0, "float2"}}, {{"c", 16, 16}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, {{"d", 32, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, - {{"s", 48, 24}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 6, 0, 3, 0, "<unnamed>"}}, + {{"s", 48, 24}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 6, 0, ARRAY_SIZE(s_field_types), 0, "<unnamed>"}, s_field_types}, {{"g", 72, 4}, {D3D_SVC_SCALAR, D3D_SVT_BOOL, 1, 1, 0, 0, 0, "bool"}}, {{"h", 80, 20}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 0, 0, "float"}}, {{"i", 100, 4}, {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 0, 0, "int"}}, @@ -612,6 +623,10 @@ static void test_reflection(void) {{"k", 112, 12}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, {{"l", 128, 36}, {D3D_SVC_MATRIX_ROWS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, {{"o", 176, 36, D3D_SVF_USED}, {D3D_SVC_MATRIX_ROWS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, + {{"p", 224, 16}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, + {{"q", 240, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, + {{"r", 256, 4}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 1, 0, ARRAY_SIZE(r_field_types), 0, "r_name"}, r_field_types}, + {{"t", 260, 12}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, }; static const struct @@ -623,7 +638,7 @@ static void test_reflection(void) { {{"$Globals", D3D_CT_CBUFFER, 1, 16}, &globals_vars}, {{"$Params", D3D_CT_CBUFFER, 1, 16}, &params_vars}, - {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 224}, buffer_vars}, + {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 272}, buffer_vars}, }; todo_wine vs_code = compile_shader(vs_source, "vs_5_0"); @@ -669,16 +684,13 @@ static void test_reflection(void) sprintf(prefix, "Test %u, %u", i, j); check_type_desc(prefix, &type_desc, &expect->type_desc); - if (!strcmp(type_desc.Name, "<unnamed>")) + for (k = 0; k < type_desc.Members; ++k) { - for (k = 0; k < ARRAY_SIZE(field_types); ++k) - { - field = type->lpVtbl->GetMemberTypeByIndex(type, k); - hr = field->lpVtbl->GetDesc(field, &type_desc); - ok(hr == S_OK, "Test %u, %u, %u: got hr %#x.\n", i, j, k, hr); - sprintf(prefix, "Test %u, %u, %u", i, j, k); - check_type_desc(prefix, &type_desc, &field_types[k]); - } + field = type->lpVtbl->GetMemberTypeByIndex(type, k); + hr = field->lpVtbl->GetDesc(field, &type_desc); + ok(hr == S_OK, "Test %u, %u, %u: got hr %#x.\n", i, j, k, hr); + sprintf(prefix, "Test %u, %u, %u", i, j, k); + check_type_desc(prefix, &type_desc, &vs_buffers[i].vars[j].field_types[k]); } } }

1 0

Zebediah Figura : d3dcompiler/tests: Add tests for constant buffer binding descriptors.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 37d8d163e31e7b99e30f305a3de328844b721522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d8d163e31e7b99e30f305a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 12 19:33:37 2020 -0500 d3dcompiler/tests: Add tests for constant buffer binding descriptors. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 38 ++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index cdffc80668..63f8f3156b 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -552,6 +552,8 @@ static void test_reflection(void) static const char vs_source[] = "typedef uint uint_t;\n" + "float m;\n" + "\n" "cbuffer b1\n" "{\n" " float a;\n" @@ -579,11 +581,14 @@ static void test_reflection(void) " column_major float3x1 t;\n" "};\n" "\n" - "float m;\n" + "cbuffer b5 : register(b5)\n" + "{\n" + " float4 u;\n" + "}\n" "\n" "float4 main(uniform float4 n) : SV_POSITION\n" "{\n" - " return o._31 + m + n;\n" + " return o._31 + m + n + u;\n" "}"; struct shader_variable @@ -628,6 +633,8 @@ static void test_reflection(void) {{"r", 256, 4}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 1, 0, ARRAY_SIZE(r_field_types), 0, "r_name"}, r_field_types}, {{"t", 260, 12}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, }; + static const struct shader_variable b5_vars = + {{"u", 0, 16, D3D_SVF_USED}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; static const struct { @@ -639,6 +646,15 @@ static void test_reflection(void) {{"$Globals", D3D_CT_CBUFFER, 1, 16}, &globals_vars}, {{"$Params", D3D_CT_CBUFFER, 1, 16}, &params_vars}, {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 272}, buffer_vars}, + {{"b5", D3D_CT_CBUFFER, 1, 16}, &b5_vars}, + }; + + static const D3D11_SHADER_INPUT_BIND_DESC vs_bindings[] = + { + {"$Globals", D3D_SIT_CBUFFER, 0, 1}, + {"$Params", D3D_SIT_CBUFFER, 1, 1}, + {"b1", D3D_SIT_CBUFFER, 2, 1}, + {"b5", D3D_SIT_CBUFFER, 5, 1, D3D_SIF_USERPACKED}, }; todo_wine vs_code = compile_shader(vs_source, "vs_5_0"); @@ -695,6 +711,24 @@ static void test_reflection(void) } } + for (i = 0; i < ARRAY_SIZE(vs_bindings); ++i) + { + D3D11_SHADER_INPUT_BIND_DESC desc; + + hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); + todo_wine ok(hr == S_OK, "Test %u: got hr %#x.\n", i, hr); + if (hr != S_OK) + break; + ok(!strcmp(desc.Name, vs_bindings[i].Name), "Test %u: got name %s.\n", i, debugstr_a(desc.Name)); + ok(desc.Type == vs_bindings[i].Type, "Test %u: got type %#x.\n", i, desc.Type); + ok(desc.BindPoint == vs_bindings[i].BindPoint, "Test %u: got bind point %u.\n", i, desc.BindPoint); + ok(desc.BindCount == vs_bindings[i].BindCount, "Test %u: got bind count %u.\n", i, desc.BindCount); + ok(desc.uFlags == vs_bindings[i].uFlags, "Test %u: got flags %#x.\n", i, desc.uFlags); + ok(desc.ReturnType == vs_bindings[i].ReturnType, "Test %u: got return type %#x.\n", i, desc.ReturnType); + ok(desc.Dimension == vs_bindings[i].Dimension, "Test %u: got dimension %#x.\n", i, desc.Dimension); + ok(desc.NumSamples == vs_bindings[i].NumSamples, "Test %u: got multisample count %u.\n", i, desc.NumSamples); + } + ID3D10Blob_Release(vs_code); refcount = reflection->lpVtbl->Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0