Piotr Caban : msvcrt: Use LC_COLLATE category in strcoll functions.

Alexandre Julliard julliard at winehq.org
Tue Dec 18 13:49:06 CST 2012


Module: wine
Branch: master
Commit: 0c91daee8bd7e65f2354b544fb9bc9c3163f638a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0c91daee8bd7e65f2354b544fb9bc9c3163f638a

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Dec 18 11:56:35 2012 +0100

msvcrt: Use LC_COLLATE category in strcoll functions.

---

 dlls/msvcrt/string.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index f166865..a254158 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -489,7 +489,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t
     else
         locinfo = locale->locinfo;
 
-    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-CSTR_EQUAL;
+    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL;
 }
 
 /*********************************************************************
@@ -512,7 +512,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale
     else
         locinfo = locale->locinfo;
 
-    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE,
+    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE,
             str1, -1, str2, -1)-CSTR_EQUAL;
 }
 
@@ -536,7 +536,7 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c
     else
         locinfo = locale->locinfo;
 
-    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-CSTR_EQUAL;
+    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL;
 }
 
 /*********************************************************************
@@ -559,7 +559,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t
     else
         locinfo = locale->locinfo;
 
-    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE,
+    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE,
             str1, count, str2, count)-CSTR_EQUAL;
 }
 




More information about the wine-cvs mailing list