Commit f20f4dee authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcrt: Don't use strncmpW in wcsncmp.

parent 1ca971a2
...@@ -414,6 +414,21 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) ...@@ -414,6 +414,21 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str )
} }
/********************************************************************* /*********************************************************************
* wcsncmp (MSVCRT.@)
*/
int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n)
{
if (!n)
return 0;
while(--n && *str1 && (*str1 == *str2))
{
str1++;
str2++;
}
return *str1 - *str2;
}
/*********************************************************************
* _wcsncoll_l (MSVCRT.@) * _wcsncoll_l (MSVCRT.@)
*/ */
int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2,
...@@ -427,7 +442,7 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s ...@@ -427,7 +442,7 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s
locinfo = locale->locinfo; locinfo = locale->locinfo;
if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) if(!locinfo->lc_handle[MSVCRT_LC_COLLATE])
return strncmpW(str1, str2, count); return MSVCRT_wcsncmp(str1, str2, count);
return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0,
str1, MSVCRT_wcsnlen(str1, count), str1, MSVCRT_wcsnlen(str1, count),
str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL; str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL;
...@@ -2644,14 +2659,6 @@ __int64 CDECL MSVCRT__wtoi64(const MSVCRT_wchar_t *str) ...@@ -2644,14 +2659,6 @@ __int64 CDECL MSVCRT__wtoi64(const MSVCRT_wchar_t *str)
} }
/********************************************************************* /*********************************************************************
* wcsncmp (MSVCRT.@)
*/
int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, int n)
{
return strncmpW(str1, str2, n);
}
/*********************************************************************
* _wcsxfrm_l (MSVCRT.@) * _wcsxfrm_l (MSVCRT.@)
*/ */
MSVCRT_size_t CDECL MSVCRT__wcsxfrm_l(MSVCRT_wchar_t *dest, const MSVCRT_wchar_t *src, MSVCRT_size_t CDECL MSVCRT__wcsxfrm_l(MSVCRT_wchar_t *dest, const MSVCRT_wchar_t *src,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment