Module: wine Branch: master Commit: 66b38682ebc8e1e4e280a06210042f3ca0567bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b38682ebc8e1e4e280a0621...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Oct 17 15:23:04 2018 +0200
msvcrt: Don't forward wcscmp 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 61cc0ea..cdb46a3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1857,7 +1857,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bcd6eed..81dcecd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2215,7 +2215,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 87c85ae..338eb69 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2450,7 +2450,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index b9b6278..c074378 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -852,7 +852,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c5c1533..f760979 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -848,7 +848,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 994fdce..6b65d34 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1537,7 +1537,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8f82504..f55bf6d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1510,7 +1510,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 56ff74a..6ca3e51 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1483,7 +1483,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0e4019f..9d861d9 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2555,3 +2555,11 @@ MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, { return MSVCRT__wcsxfrm_l(dest, src, len, NULL); } + +/********************************************************************* + * wcscmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) +{ + return strcmpW(str1, str2); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1577de6..3e1cb55 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2557,7 +2557,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s