Piotr Caban : msvcr60: Fix _mbscoll implementation.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Oct 2 09:21:48 CDT 2015
Module: wine
Branch: master
Commit: aa612612b759e9041b9c7059a640b02c1cb57de6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa612612b759e9041b9c7059a640b02c1cb57de6
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Oct 1 18:29:10 2015 +0200
msvcr60: Fix _mbscoll implementation.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
---
dlls/msvcrt/mbcs.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index ea650f4..e7adaad 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -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)
{
+#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);
+#endif
}
/*********************************************************************
@@ -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)
{
+#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);
+#endif
}
/*********************************************************************
More information about the wine-cvs
mailing list