Module: wine Branch: master Commit: c99d14d04de1e3958b6f293f79422a40367308ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c99d14d04de1e3958b6f293f7...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Oct 17 15:23:37 2018 +0200
msvcrt: Don't forward strpbrk 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 d39d8d8..1579415 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1813,7 +1813,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4df968d..029620f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2171,7 +2171,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5e21169..89002ed 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2381,7 +2381,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 28a9ddc..bda8160 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -821,7 +821,7 @@ @ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 3b7f1cf..124b73b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -817,7 +817,7 @@ @ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8f35c54..7aebe34 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1493,7 +1493,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9c6a13..eb70ff9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1466,7 +1466,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 16f1790..d963f7c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1434,7 +1434,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 513f3b2..cbbb65b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2052,3 +2052,11 @@ MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) { return strcspn( str, reject ); } + +/********************************************************************* + * strpbrk (MSVCRT.@) + */ +char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) +{ + return strpbrk(str, accept); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8838302..404da75 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2512,7 +2512,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr