Module: wine Branch: master Commit: f43ae5e8034c1c9afd339e1aa1be8d013eb0f68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f43ae5e8034c1c9afd339e1aa...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Oct 17 15:23:29 2018 +0200
msvcrt: Don't forward strcspn to ntdll.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 61f72f0..d39d8d8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1802,7 +1802,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4edad71..4df968d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2160,7 +2160,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7d18e14..5e21169 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2370,7 +2370,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ac2eb95..28a9ddc 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -814,7 +814,7 @@ @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 20a37eb..3b7f1cf 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -810,7 +810,7 @@ @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 544483c..8f35c54 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1482,7 +1482,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 40dc508..a9c6a13 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1455,7 +1455,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5db436a..16f1790 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e0e620f..513f3b2 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2044,3 +2044,11 @@ int __cdecl MSVCRT__memicmp(const char *s1, const char *s2, MSVCRT_size_t len) { return MSVCRT__memicmp_l(s1, s2, len, NULL); } + +/********************************************************************* + * strcspn (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) +{ + return strcspn( str, reject ); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bc650ff..8838302 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2501,7 +2501,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime