Module: wine Branch: master Commit: c69de2c27c0002ca9ccd227d3a6c2e69f68c7eef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69de2c27c0002ca9ccd227d3...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Oct 17 15:23:08 2018 +0200
msvcrt: Don't forward wcsrchr 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/wcs.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 cdb46a3..2ee8953 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1871,7 +1871,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81dcecd..3a42bb8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2229,7 +2229,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 338eb69..bbdb774 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2464,7 +2464,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c074378..96e9b8e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -862,7 +862,7 @@ @ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f760979..ef9fdb8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -858,7 +858,7 @@ @ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b65d34..94fc2c3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1551,7 +1551,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f55bf6d..c467c9d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1524,7 +1524,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6ca3e51..ded47de 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1497,7 +1497,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9d861d9..7717336 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2439,6 +2439,14 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch return strchrW(str, ch); }
+/********************************************************************* + * wcsrchr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcsrchr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) +{ + return strrchrW(str, ch); +} + /*********************************************************************** * wcslen (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3e1cb55..c26d103 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2571,7 +2571,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn