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

Piotr Caban : msvcrt: Copy strlen implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 770d3b8623c008c68c0751c442cd1ea26c01bd2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=770d3b8623c008c68c0751c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:40 2020 +0200 msvcrt: Copy strlen implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4038ed41cd..f646cee9df 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1266,7 +1266,9 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, */ MSVCRT_size_t __cdecl MSVCRT_strlen(const char *str) { - return strlen(str); + const char *s = str; + while (*s) s++; + return s - str; } /******************************************************************

1 0

Piotr Caban : msvcrt: Copy strncat implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 3b0fb2b175f96ba8e2c20e80be27ee348fc7547c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0fb2b175f96ba8e2c20e80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:42 2020 +0200 msvcrt: Copy strncat implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f646cee9df..9e747a1a0c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1171,7 +1171,11 @@ int CDECL MSVCRT_strncat_s( char* dst, MSVCRT_size_t elem, const char* src, MSVC */ char* __cdecl MSVCRT_strncat(char *dst, const char *src, MSVCRT_size_t len) { - return strncat(dst, src, len); + char *d = dst; + while (*d) d++; + for ( ; len && *src; d++, src++, len--) *d = *src; + *d = 0; + return dst; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy strpbrk implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: d9c9d21d66a760a8173d9a74248aa8fd96fadf03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c9d21d66a760a8173d9a74… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:45 2020 +0200 msvcrt: Copy strpbrk implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9e747a1a0c..3a6e6b668c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2505,7 +2505,8 @@ MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) */ char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) { - return strpbrk(str, accept); + for (; *str; str++) if (strchr( accept, *str )) return (char*)str; + return NULL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy strrchr implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: a511c0937c622b01daf0a43871366419a6eb03ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a511c0937c622b01daf0a438… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:56 2020 +0200 msvcrt: Copy strrchr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3a6e6b668c..30b2525692 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2302,7 +2302,9 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) */ char* __cdecl MSVCRT_strrchr(const char *str, int c) { - return strrchr(str, c); + char *ret = NULL; + do { if (*str == (char)c) ret = (char*)str; } while (*str++); + return ret; } /*********************************************************************

1 0

Alexandre Julliard : ntdll: Avoid private Unix functions in RtlExitUserThread().
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: d41b1c28c378c531cc9c66639bfa16778972281d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d41b1c28c378c531cc9c6663… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 13:04:54 2020 +0200 ntdll: Avoid private Unix functions in RtlExitUserThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 19 ++----------------- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/process.c | 8 +++++++- dlls/ntdll/unix/thread.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 3 +-- dlls/ntdll/unixlib.h | 4 +--- 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 2fc240ae29..297a1b79ef 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -81,26 +81,11 @@ void WINAPI RtlExitUserThread( ULONG status ) { ULONG last; - if (status) /* send the exit code to the server (0 is already the default) */ - { - SERVER_START_REQ( terminate_thread ) - { - req->handle = wine_server_obj_handle( GetCurrentThread() ); - req->exit_code = status; - wine_server_call( req ); - } - SERVER_END_REQ; - } - NtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread, &last, sizeof(last), NULL ); - if (last) - { - LdrShutdownProcess(); - unix_funcs->exit_process( status ); - } + if (last) RtlExitUserProcess( status ); LdrShutdownThread(); RtlFreeThreadActivationContextStack(); - for (;;) unix_funcs->exit_thread( status ); + for (;;) NtTerminateThread( GetCurrentThread(), status ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3f3a10155d..dc4a579132 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1404,8 +1404,6 @@ static struct unix_funcs unix_funcs = virtual_locked_recvmsg, virtual_release_address_space, virtual_set_large_address_space, - exit_thread, - exit_process, exec_process, wine_server_call, server_send_fd, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 83c67737f8..9854f13aba 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1002,6 +1002,7 @@ done: */ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) { + static BOOL clean_exit; NTSTATUS ret; BOOL self; @@ -1013,7 +1014,12 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = reply->self; } SERVER_END_REQ; - if (self && handle) abort_process( exit_code ); + if (self) + { + if (!handle) clean_exit = TRUE; + else if (clean_exit) exit_process( exit_code ); + else abort_process( exit_code ); + } return ret; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3b451a2257..8ade2d9c78 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -298,7 +298,7 @@ void abort_process( int status ) /*********************************************************************** * exit_thread */ -void CDECL exit_thread( int status ) +static void exit_thread( int status ) { static void *prev_teb; TEB *teb; @@ -322,7 +322,7 @@ void CDECL exit_thread( int status ) /*********************************************************************** * exit_process */ -void CDECL exit_process( int status ) +void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); signal_exit_thread( get_unix_exit_code( status ), exit ); @@ -525,7 +525,7 @@ NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) } SERVER_END_REQ; } - if (self) abort_thread( exit_code ); + if (self) exit_thread( exit_code ); return ret; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 60883bfa39..50f27c6d68 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -120,8 +120,6 @@ extern NTSTATUS CDECL server_handle_to_fd( HANDLE handle, unsigned int access, i unsigned int *options ) DECLSPEC_HIDDEN; extern void CDECL server_release_fd( HANDLE handle, int unix_fd ) DECLSPEC_HIDDEN; extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; -extern void CDECL DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; -extern void CDECL DECLSPEC_NORETURN exit_process( int status ) 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; @@ -181,6 +179,7 @@ extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_process( int status ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN; extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 84e1a27977..118f38a248 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 90 +#define NTDLL_UNIXLIB_VERSION 91 struct unix_funcs { @@ -97,8 +97,6 @@ struct unix_funcs void (CDECL *virtual_set_large_address_space)(void); /* thread/process functions */ - void (CDECL *exit_thread)( int status ); - void (CDECL *exit_process)( int status ); NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ); /* server functions */

1 0

Alexandre Julliard : ntdll: Implement NtSetInformationProcess(ProcessThreadStackAllocation).
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 1372d8fc2cac3466d759500063a50d86f03dc94a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1372d8fc2cac3466d7595000… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:15:55 2020 +0200 ntdll: Implement NtSetInformationProcess(ProcessThreadStackAllocation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 22 ++++++++++++++++ include/winternl.h | 16 ++++++++++++ 3 files changed, 102 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e5137ef5a4..6fdd2b6e59 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2081,6 +2081,69 @@ static void test_mapprotection(void) pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); } +static void test_threadstack(void) +{ + PROCESS_STACK_ALLOCATION_INFORMATION info = { 0x100000, 0, (void *)0xdeadbeef }; + PROCESS_STACK_ALLOCATION_INFORMATION_EX info_ex = { 0 }; + MEMORY_BASIC_INFORMATION meminfo; + SIZE_T retlen; + NTSTATUS status; + + info.ReserveSize = 0x100000; + info.StackBase = (void *)0xdeadbeef; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info, sizeof(info) ); + ok( !status, "NtSetInformationProcess failed %08x\n", status ); + ok( info.StackBase != (void *)0xdeadbeef, "stackbase not set\n" ); + + status = pNtQueryVirtualMemory( GetCurrentProcess(), info.StackBase, MemoryBasicInformation, + &meminfo, sizeof(meminfo), &retlen ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( meminfo.AllocationBase == info.StackBase, "wrong base %p/%p\n", + meminfo.AllocationBase, info.StackBase ); + ok( meminfo.RegionSize == info.ReserveSize, "wrong size %lx/%lx\n", + meminfo.RegionSize, info.ReserveSize ); + ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State ); + ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect ); + ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type ); + + info_ex.AllocInfo = info; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, + &info_ex, sizeof(info_ex) ); + if (status != STATUS_INVALID_PARAMETER) + { + ok( !status, "NtSetInformationProcess failed %08x\n", status ); + ok( info_ex.AllocInfo.StackBase != info.StackBase, "stackbase not set\n" ); + status = pNtQueryVirtualMemory( GetCurrentProcess(), info_ex.AllocInfo.StackBase, + MemoryBasicInformation, &meminfo, sizeof(meminfo), &retlen ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( meminfo.AllocationBase == info_ex.AllocInfo.StackBase, "wrong base %p/%p\n", + meminfo.AllocationBase, info_ex.AllocInfo.StackBase ); + ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %lx/%lx\n", + meminfo.RegionSize, info_ex.AllocInfo.ReserveSize ); + ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State ); + ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect ); + ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type ); + VirtualFree( info_ex.AllocInfo.StackBase, 0, MEM_FREE ); + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, + &info, sizeof(info) - 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, + &info, sizeof(info) + 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, + &info_ex, sizeof(info_ex) - 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, + &info_ex, sizeof(info_ex) + 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status ); + } + else win_skip( "ProcessThreadStackAllocation ex not supported\n" ); + + VirtualFree( info.StackBase, 0, MEM_FREE ); +} + static void test_queryvirtualmemory(void) { NTSTATUS status; @@ -2621,6 +2684,7 @@ START_TEST(info) test_query_process_debug_flags(argc, argv); test_query_process_image_info(); test_mapprotection(); + test_threadstack(); /* NtQueryInformationThread */ test_thread_info(); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 9854f13aba..bde46264d0 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1580,6 +1580,28 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, } break; + case ProcessThreadStackAllocation: + { + void *addr = NULL; + SIZE_T reserve; + PROCESS_STACK_ALLOCATION_INFORMATION *stack = info; + if (size == sizeof(PROCESS_STACK_ALLOCATION_INFORMATION_EX)) + stack = &((PROCESS_STACK_ALLOCATION_INFORMATION_EX *)info)->AllocInfo; + else if (size != sizeof(*stack)) return STATUS_INFO_LENGTH_MISMATCH; + + reserve = stack->ReserveSize; + ret = NtAllocateVirtualMemory( GetCurrentProcess(), &addr, stack->ZeroBits, &reserve, + MEM_RESERVE, PAGE_READWRITE ); + if (!ret) + { +#ifdef VALGRIND_STACK_REGISTER + VALGRIND_STACK_REGISTER( addr, (char *)addr + reserve ); +#endif + stack->StackBase = addr; + } + break; + } + default: FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", handle, class, info, size ); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/winternl.h b/include/winternl.h index b3fbb90fef..81eb417bb5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1313,6 +1313,22 @@ typedef struct _PROCESS_PRIORITY_CLASS { UCHAR PriorityClass; } PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS; +typedef struct _PROCESS_STACK_ALLOCATION_INFORMATION +{ + SIZE_T ReserveSize; + SIZE_T ZeroBits; + PVOID StackBase; +} PROCESS_STACK_ALLOCATION_INFORMATION, *PPROCESS_STACK_ALLOCATION_INFORMATION; + +typedef struct _PROCESS_STACK_ALLOCATION_INFORMATION_EX +{ + ULONG PreferredNode; + ULONG Reserved0; + ULONG Reserved1; + ULONG Reserved2; + PROCESS_STACK_ALLOCATION_INFORMATION AllocInfo; +} PROCESS_STACK_ALLOCATION_INFORMATION_EX, *PPROCESS_STACK_ALLOCATION_INFORMATION_EX; + typedef struct _RTL_HEAP_DEFINITION { ULONG Length; /* = sizeof(RTL_HEAP_DEFINITION) */

1 0

Alexandre Julliard : ntdll: Avoid private Unix functions in RtlCreateUserStack().
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 131e53a1fc2cd7156b56402c97d53af8da72399e URL: https://source.winehq.org/git/wine.git/?a=commit;h=131e53a1fc2cd7156b56402c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:16:22 2020 +0200 ntdll: Avoid private Unix functions in RtlCreateUserStack(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 3 ++- dlls/ntdll/unixlib.h | 3 +-- dlls/ntdll/virtual.c | 32 +++++++++++++++++++++++++++++++- 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 18adb55c22..adb1ed871b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4016,7 +4016,7 @@ void __wine_process_init(void) RemoveEntryList( &wm->ldr.InMemoryOrderLinks ); InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderLinks ); - unix_funcs->virtual_alloc_thread_stack( &stack, 0, 0, NULL ); + RtlCreateUserStack( 0, 0, 0, 0x10000, 0x10000, &stack ); teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dc4a579132..22ba928541 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1400,7 +1400,6 @@ static struct unix_funcs unix_funcs = get_build_id, get_host_version, virtual_map_section, - virtual_alloc_thread_stack, virtual_locked_recvmsg, virtual_release_address_space, virtual_set_large_address_space, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 50f27c6d68..7b4d34dead 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -108,7 +108,6 @@ extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern ssize_t CDECL virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void CDECL virtual_set_large_address_space(void) DECLSPEC_HIDDEN; @@ -196,6 +195,8 @@ extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, + SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 67c58642a7..f3fec7c29c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2735,7 +2735,8 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS CDECL virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) +NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, + SIZE_T *pthread_size ) { struct file_view *view; NTSTATUS status; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 118f38a248..a706b174b4 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 91 +#define NTDLL_UNIXLIB_VERSION 92 struct unix_funcs { @@ -91,7 +91,6 @@ struct unix_funcs NTSTATUS (CDECL *virtual_map_section)( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, pe_image_info_t *image_info ); - NTSTATUS (CDECL *virtual_alloc_thread_stack)( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ); ssize_t (CDECL *virtual_locked_recvmsg)( int fd, struct msghdr *hdr, int flags ); void (CDECL *virtual_release_address_space)(void); void (CDECL *virtual_set_large_address_space)(void); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1f582ffe60..3ba4b8afbc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -44,6 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(virtual); NTSTATUS WINAPI RtlCreateUserStack( SIZE_T commit, SIZE_T reserve, ULONG zero_bits, SIZE_T commit_align, SIZE_T reserve_align, INITIAL_TEB *stack ) { + PROCESS_STACK_ALLOCATION_INFORMATION alloc; + NTSTATUS status; + TRACE("commit %#lx, reserve %#lx, zero_bits %u, commit_align %#lx, reserve_align %#lx, stack %p\n", commit, reserve, zero_bits, commit_align, reserve_align, stack); @@ -60,7 +63,34 @@ NTSTATUS WINAPI RtlCreateUserStack( SIZE_T commit, SIZE_T reserve, ULONG zero_bi reserve = (reserve + reserve_align - 1) & ~(reserve_align - 1); commit = (commit + commit_align - 1) & ~(commit_align - 1); - return unix_funcs->virtual_alloc_thread_stack( stack, reserve, commit, NULL ); + if (reserve < commit) reserve = commit; + if (reserve < 0x100000) reserve = 0x100000; + reserve = (reserve + 0xffff) & ~0xffff; /* round to 64K boundary */ + + alloc.ReserveSize = reserve; + alloc.ZeroBits = zero_bits; + status = NtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, + &alloc, sizeof(alloc) ); + if (!status) + { + void *addr = alloc.StackBase; + SIZE_T size = page_size; + + NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_NOACCESS ); + addr = (char *)alloc.StackBase + page_size; + NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + addr = (char *)alloc.StackBase + 2 * page_size; + size = reserve - 2 * page_size; + NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE ); + + /* note: limit is lower than base since the stack grows down */ + stack->OldStackBase = 0; + stack->OldStackLimit = 0; + stack->DeallocationStack = alloc.StackBase; + stack->StackBase = (char *)alloc.StackBase + reserve; + stack->StackLimit = (char *)alloc.StackBase + 2 * page_size; + } + return status; }

1 0

Alexandre Julliard : ntdll: Call virtual_set_large_address_space() directly from the Unix side.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 9018a377355fb2906d06b50008d04761491bbfd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9018a377355fb2906d06b500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:27:33 2020 +0200 ntdll: Call virtual_set_large_address_space() directly from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 -- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 5 +---- dlls/ntdll/unixlib.h | 3 +-- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index adb1ed871b..bf8d71adeb 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4008,8 +4008,6 @@ void __wine_process_init(void) NtTerminateProcess( GetCurrentProcess(), status ); } - unix_funcs->virtual_set_large_address_space(); - /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderLinks ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderLinks ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 22ba928541..57b1a7e3a5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1402,7 +1402,6 @@ static struct unix_funcs unix_funcs = virtual_map_section, virtual_locked_recvmsg, virtual_release_address_space, - virtual_set_large_address_space, exec_process, wine_server_call, server_send_fd, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 21817ad159..fadfcc2f9f 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1471,6 +1471,7 @@ void CDECL server_init_process_done( void *relay ) #ifdef __APPLE__ send_server_task_port(); #endif + if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) virtual_set_large_address_space(); /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7b4d34dead..db7ffbf8a9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -110,7 +110,6 @@ extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsig ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; extern ssize_t CDECL virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; -extern void CDECL virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, @@ -209,6 +208,7 @@ extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HI extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; extern void virtual_set_force_exec( BOOL enable ) DECLSPEC_HIDDEN; +extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f3fec7c29c..883e5cff92 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3383,11 +3383,8 @@ void CDECL virtual_release_address_space(void) * * Enable use of a large address space when allowed by the application. */ -void CDECL virtual_set_large_address_space(void) +void virtual_set_large_address_space(void) { - IMAGE_NT_HEADERS *nt = get_exe_nt_header(); - - if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; /* no large address space on win9x */ if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index a706b174b4..715af51686 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 92 +#define NTDLL_UNIXLIB_VERSION 93 struct unix_funcs { @@ -93,7 +93,6 @@ struct unix_funcs ULONG protect, pe_image_info_t *image_info ); ssize_t (CDECL *virtual_locked_recvmsg)( int fd, struct msghdr *hdr, int flags ); void (CDECL *virtual_release_address_space)(void); - void (CDECL *virtual_set_large_address_space)(void); /* thread/process functions */ NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status );

1 0

Dmitry Timoshkov : usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 24e09ac5823083bfd2e283e8b19e96a60d745e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=24e09ac5823083bfd2e283e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 21 18:57:00 2020 +0800 usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts. Use same check as ScriptShapeOpenType() does, fixes painting of non-latin characters in Wordpad using MS Sans Serif font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 322091c547..a6664279b5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3607,10 +3607,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; + fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ + if (!psa->fNoGlyphIndex && *psc && ((ScriptCache *)*psc)->sfnt) + fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */ if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) return E_OUTOFMEMORY;

1 0

Paul Gofman : kernel32: Zero initialize module data in fetch_module().
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 3d54677586eb0a9f379839cd06c04d03fde380f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d54677586eb0a9f379839cd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 22 16:06:12 2020 +0300 kernel32: Zero initialize module data in fetch_module(). Otherwise unitialized name string pointers may be freed in CreateToolhelp32Snapshot(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49590 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/toolhelp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index d55e8185f2..d072ccaefc 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -108,9 +108,9 @@ static BOOL fetch_module( DWORD process, DWORD flags, LDR_DATA_TABLE_ENTRY **ldr while (curr != head) { if (!*num) - *ldr_mod = HeapAlloc( GetProcessHeap(), 0, sizeof(LDR_DATA_TABLE_ENTRY) ); + *ldr_mod = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LDR_DATA_TABLE_ENTRY) ); else - *ldr_mod = HeapReAlloc( GetProcessHeap(), 0, *ldr_mod, + *ldr_mod = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *ldr_mod, (*num + 1) * sizeof(LDR_DATA_TABLE_ENTRY) ); if (!*ldr_mod) break; if (!ReadProcessMemory( hProcess,

1 0