wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

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 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

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

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 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 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 strchr implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 45be36130f5bc5732e2bb704f1a97e4fa4da14d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45be36130f5bc5732e2bb704… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:33 2020 +0200 msvcrt: Copy strchr 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 fe86f14f57..4038ed41cd 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2284,7 +2284,11 @@ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) */ char* __cdecl MSVCRT_strchr(const char *str, int c) { - return strchr(str, c); + do + { + if (*str == (char)c) return (char*)str; + } while (*str++); + return NULL; } /*********************************************************************

1 0

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

22 Jul '20

Module: wine Branch: master Commit: f6763553660d3df7b0f8710476505bdd3cf389b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6763553660d3df7b0f87104… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:35 2020 +0200 msvcrt: Copy strcat implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 11 +++++++++++ dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index aae66d828c..dddc8a6bd1 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -463,7 +463,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 68d1ee3f0f..12699a71fa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1795,7 +1795,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 13abe6ad64..785baaef61 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2153,7 +2153,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7181184938..83daf454b6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2363,7 +2363,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index d4114a24fe..9e8c9020eb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -809,7 +809,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c1b1c68f1f..cd780ae7d9 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -805,7 +805,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 916245cb26..4a5e0875c2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1475,7 +1475,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b2967858bc..5401cd2a9c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1448,7 +1448,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51ecb095db..36284cf14a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1417,7 +1417,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8842e0791e..fe86f14f57 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1116,6 +1116,17 @@ int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) return MSVCRT_ERANGE; } +/********************************************************************* + * strcat (MSVCRT.@) + */ +char* __cdecl MSVCRT_strcat( char *dst, const char *src ) +{ + char *d = dst; + while (*d) d++; + while ((*d++ = *src++)); + return dst; +} + /********************************************************************* * strncat_s (MSVCRT.@) */ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 8c775c61a4..c8ed824adf 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -761,7 +761,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2577649421..6dc73d47fd 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2494,7 +2494,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp

1 0

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

22 Jul '20

Module: wine Branch: master Commit: 41a5da9b763c2d7009cdbc84cdcab0f7453fe13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a5da9b763c2d7009cdbc84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:28 2020 +0200 msvcrt: Copy memset 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 8612780722..8842e0791e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2263,7 +2263,9 @@ void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) */ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) { - return memset(dst, c, n); + volatile unsigned char *d = dst; /* avoid gcc optimizations */ + while (n--) *d++ = c; + return dst; } /*********************************************************************

1 0

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

22 Jul '20

Module: wine Branch: master Commit: f02193738c88bea8fefb3f8d2e79c5e9941f6b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f02193738c88bea8fefb3f8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:26 2020 +0200 msvcrt: Copy memmove 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 | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fe2cf6abe5..8612780722 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2230,19 +2230,32 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) } /********************************************************************* - * memcpy (MSVCRT.@) + * memmove (MSVCRT.@) */ -void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) +void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) { - return memmove(dst, src, n); + volatile unsigned char *d = dst; /* avoid gcc optimizations */ + const unsigned char *s = src; + + if ((MSVCRT_size_t)dst - (MSVCRT_size_t)src >= n) + { + while (n--) *d++ = *s++; + } + else + { + d += n - 1; + s += n - 1; + while (n--) *d-- = *s--; + } + return dst; } /********************************************************************* - * memmove (MSVCRT.@) + * memcpy (MSVCRT.@) */ -void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) +void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) { - return memmove(dst, src, n); + return MSVCRT_memmove(dst, src, n); } /*********************************************************************

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020