Skip to content

W
wine-cw
Commit aa612612 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcr60: Fix _mbscoll implementation.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com>
parent a887a87a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
dlls/msvcrt/mbcs.c
View file @ aa612612
...@@ -829,7 +829,12 @@ int CDECL _mbsnbicoll(const unsigned char *str1, const unsigned char *str2, MSVC ...@@ -829,7 +829,12 @@ int CDECL _mbsnbicoll(const unsigned char *str1, const unsigned char *str2, MSVC
*/ */
int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp)
{ {
#if _MSVCR_VER>=60 && _MSVCR_VER<=71
return CompareStringA(get_mbcinfo()->mblcid, NORM_IGNORECASE,
(const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL;
#else
return _mbsnbicoll_l(str, cmp, -1, NULL); return _mbsnbicoll_l(str, cmp, -1, NULL);
#endif
} }
/********************************************************************* /*********************************************************************
...@@ -870,7 +875,12 @@ int CDECL _mbsnbcoll(const unsigned char *str1, const unsigned char *str2, MSVCR ...@@ -870,7 +875,12 @@ int CDECL _mbsnbcoll(const unsigned char *str1, const unsigned char *str2, MSVCR
*/ */
int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp)
{ {
#if _MSVCR_VER>=60 && _MSVCR_VER<=71
return CompareStringA(get_mbcinfo()->mblcid, 0,
(const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL;
#else
return _mbsnbcoll_l(str, cmp, -1, NULL); return _mbsnbcoll_l(str, cmp, -1, NULL);
#endif
} }
/********************************************************************* /*********************************************************************
......
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