[PATCH 2/3] msvcrt: Added _mbsnicoll and _mbsnicoll_l implementation.

[Jactry Zeng]

-------------- next part --------------
From f7e9c2f9f1c74ca1998f0dac623744b8cbb10aa3 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <jactry92 at gmail.com>
Date: Fri, 19 Apr 2013 13:03:28 +0800
Subject: msvcrt: Added _mbsnicoll and _mbsnicoll_l implementation.

---
 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr110/msvcr110.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/mbcs.c          |   17 +++++++++++++++++
 dlls/msvcrt/msvcrt.spec     |    4 ++--
 include/msvcrt/mbstring.h   |    1 +
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 24e1822..25b81a7 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1157,7 +1157,7 @@
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
 @ stub _mbsnicmp_l
 @ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
-@ stub _mbsnicoll_l
+@ cdecl _mbsnicoll_l(str str long ptr) msvcrt._mbsnicoll_l
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ stub _mbsninc_l
 @ stub _mbsnlen
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 944ef9a..6fe90dd 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1519,7 +1519,7 @@
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
 @ stub _mbsnicmp_l
 @ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
-@ stub _mbsnicoll_l
+@ cdecl _mbsnicoll_l(str str long ptr) msvcrt._mbsnicoll_l
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ stub _mbsninc_l
 @ stub _mbsnlen
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 2c9bf2d..38d010f 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -813,7 +813,7 @@
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
 @ stub _mbsnicmp_l
 @ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
-@ stub _mbsnicoll_l
+@ cdecl _mbsnicoll_l(str str long ptr) msvcrt._mbsnicoll_l
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ stub _mbsninc_l
 @ stub _mbsnlen
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 21dd1c0..8d90fc6 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -806,7 +806,7 @@
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
 @ stub _mbsnicmp_l
 @ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
-@ stub _mbsnicoll_l
+@ cdecl _mbsnicoll_l(str str long ptr) msvcrt._mbsnicoll_l
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ stub _mbsninc_l
 @ stub _mbsnlen
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 060eb32..0b3b723 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -783,6 +783,23 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, MS
 }
 
 /*********************************************************************
+ *              _mbsnicoll(MSVCRT.@)
+ */
+int CDECL _mbsnicoll(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t count)
+{
+    return _mbsnbicoll_l(str1, str2, count, NULL);
+}
+
+/*********************************************************************
+ *              _mbsnicoll_l
+ */
+int CDECL _mbsnicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t count,
+		       MSVCRT__locale_t locale)
+{
+    return _mbsnbicoll_l(str1, str2, count, locale);
+}
+
+/*********************************************************************
  *              _mbsicoll_l(MSVCRT.@)
  */
 int CDECL _mbsicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT__locale_t locale)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 51b74c6..4dc41aa 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -781,8 +781,8 @@
 # stub _mbsnextc_l(str ptr)
 @ cdecl _mbsnicmp(str str long)
 # stub _mbsnicmp_l(str str long ptr)
-@ stub _mbsnicoll(str str long)
-# stub _mbsnicoll_l(str str long ptr)
+@ cdecl _mbsnicoll(str str long)
+@ cdecl _mbsnicoll_l(str str long ptr)
 @ cdecl _mbsninc(str long)
 # stub _mbsninc_l(str long ptr)
 # stub _mbsnlen(str long)
diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h
index cbd353b..3b6f116 100644
--- a/include/msvcrt/mbstring.h
+++ b/include/msvcrt/mbstring.h
@@ -97,6 +97,7 @@ unsigned char* __cdecl _mbsncpy(unsigned char*,const unsigned char*,size_t);
 unsigned int   __cdecl _mbsnextc (const unsigned char*);
 int            __cdecl _mbsnicmp(const unsigned char*,const unsigned char*,size_t);
 int            __cdecl _mbsnicoll(const unsigned char*,const unsigned char*,size_t);
+int            __cdecl _mbsnicoll_l(const unsigned char*, const unsigned char*, size_t, _locale_t);
 unsigned char* __cdecl _mbsninc(const unsigned char*,size_t);
 unsigned char* __cdecl _mbsnset(unsigned char*,unsigned int,size_t);
 unsigned char* __cdecl _mbspbrk(const unsigned char*,const unsigned char*);
-- 
1.7.9.5