Commit d2763e43 authored by Jactry Zeng's avatar Jactry Zeng Committed by Alexandre Julliard

msvcrt: Added _wcsicoll_l implementation.

parent dafa7611
...@@ -1485,7 +1485,7 @@ ...@@ -1485,7 +1485,7 @@
@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
@ stub _wcsicmp_l @ stub _wcsicmp_l
@ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
@ stub _wcsicoll_l @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l
@ cdecl _wcslwr(wstr) msvcrt._wcslwr @ cdecl _wcslwr(wstr) msvcrt._wcslwr
@ stub _wcslwr_l @ stub _wcslwr_l
@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s
......
...@@ -1848,7 +1848,7 @@ ...@@ -1848,7 +1848,7 @@
@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
@ stub _wcsicmp_l @ stub _wcsicmp_l
@ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
@ stub _wcsicoll_l @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l
@ cdecl _wcslwr(wstr) msvcrt._wcslwr @ cdecl _wcslwr(wstr) msvcrt._wcslwr
@ stub _wcslwr_l @ stub _wcslwr_l
@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s
......
...@@ -1145,7 +1145,7 @@ ...@@ -1145,7 +1145,7 @@
@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
@ stub _wcsicmp_l @ stub _wcsicmp_l
@ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
@ stub _wcsicoll_l @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l
@ cdecl _wcslwr(wstr) msvcrt._wcslwr @ cdecl _wcslwr(wstr) msvcrt._wcslwr
@ stub _wcslwr_l @ stub _wcslwr_l
@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s
......
...@@ -1139,7 +1139,7 @@ ...@@ -1139,7 +1139,7 @@
@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
@ stub _wcsicmp_l @ stub _wcsicmp_l
@ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
@ stub _wcsicoll_l @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l
@ cdecl _wcslwr(wstr) msvcrt._wcslwr @ cdecl _wcslwr(wstr) msvcrt._wcslwr
@ stub _wcslwr_l @ stub _wcslwr_l
@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s
......
...@@ -1104,7 +1104,7 @@ ...@@ -1104,7 +1104,7 @@
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
# stub _wcsicmp_l(wstr wstr ptr) # stub _wcsicmp_l(wstr wstr ptr)
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
# stub _wcsicoll_l(wstr wstr ptr) @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l
@ cdecl _wcslwr(wstr) ntdll._wcslwr @ cdecl _wcslwr(wstr) ntdll._wcslwr
# stub _wcslwr_l(wstr ptr) # stub _wcslwr_l(wstr ptr)
@ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s
......
...@@ -78,12 +78,27 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str ...@@ -78,12 +78,27 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str
} }
/********************************************************************* /*********************************************************************
* _wcsicoll_l (MSVCRT.@)
*/
int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale)
{
MSVCRT_pthreadlocinfo locinfo;
if(!locale)
locinfo = get_locinfo();
else
locinfo = locale->locinfo;
return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE,
str1, -1, str2, -1)-CSTR_EQUAL;
}
/*********************************************************************
* _wcsicoll (MSVCRT.@) * _wcsicoll (MSVCRT.@)
*/ */
INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )
{ {
return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], return MSVCRT__wcsicoll_l(str1, str2, NULL);
NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
......
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