Commit fa2248cc authored by Bartosz Kosiorek's avatar Bartosz Kosiorek Committed by Alexandre Julliard

msvcrt: Add _mbsnccnt_l implementation.

parent a67a0889
......@@ -1150,7 +1150,7 @@
@ stub _mbsncat_s
@ stub _mbsncat_s_l
@ cdecl _mbsnccnt(str long)
@ stub _mbsnccnt_l
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
@ stub _mbsncmp_l
@ stub _mbsncoll(str str long)
......
......@@ -1507,7 +1507,7 @@
@ stub _mbsncat_s
@ stub _mbsncat_s_l
@ cdecl _mbsnccnt(str long)
@ stub _mbsnccnt_l
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
@ stub _mbsncmp_l
@ stub _mbsncoll(str str long)
......
......@@ -1518,7 +1518,7 @@
@ stub _mbsncat_s
@ stub _mbsncat_s_l
@ cdecl _mbsnccnt(str long)
@ stub _mbsnccnt_l
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
@ stub _mbsncmp_l
@ stub _mbsncoll(str str long)
......
......@@ -822,7 +822,7 @@
@ stub _mbsncat_s
@ stub _mbsncat_s_l
@ cdecl _mbsnccnt(str long)
@ stub _mbsnccnt_l
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
@ stub _mbsncmp_l
@ stub _mbsncoll(str str long)
......
......@@ -800,7 +800,7 @@
@ stub _mbsncat_s
@ stub _mbsncat_s_l
@ cdecl _mbsnccnt(str long)
@ stub _mbsnccnt_l
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
@ stub _mbsncmp_l
@ stub _mbsncoll(str str long)
......
......@@ -2273,18 +2273,30 @@ unsigned char* CDECL _mbsnset(unsigned char* str, unsigned int c, size_t len)
}
/*********************************************************************
* _mbsnccnt(MSVCRT.@)
* _mbsnccnt_l(MSVCRT.@)
* 'c' is for 'character'.
*/
size_t CDECL _mbsnccnt(const unsigned char* str, size_t len)
size_t CDECL _mbsnccnt_l(const unsigned char* str, size_t len, _locale_t locale)
{
size_t ret;
if(get_mbcinfo()->ismbcodepage)
pthreadmbcinfo mbcinfo;
if (!len)
return 0;
if (!MSVCRT_CHECK_PMT(str))
return 0;
if (locale)
mbcinfo = locale->mbcinfo;
else
mbcinfo = get_mbcinfo();
if (mbcinfo->ismbcodepage)
{
ret=0;
while(*str && len-- > 0)
ret = 0;
while (*str && len-- > 0)
{
if(_ismbblead(*str))
if (_ismbblead_l(*str, locale))
{
if (!len)
break;
......@@ -2296,11 +2308,20 @@ size_t CDECL _mbsnccnt(const unsigned char* str, size_t len)
}
return ret;
}
ret=u_strlen(str);
ret = u_strlen(str);
return min(ret, len); /* ASCII CP */
}
/*********************************************************************
* _mbsnccnt(MSVCRT.@)
* 'c' is for 'character'.
*/
size_t CDECL _mbsnccnt(const unsigned char* str, size_t len)
{
return _mbsnccnt_l(str, len, NULL);
}
/*********************************************************************
* _mbsnbcnt_l(MSVCRT.@)
* 'b' is for byte count.
*/
......
......@@ -771,7 +771,7 @@
# stub _mbsncat_s(str long str long)
# stub _mbsncat_s_l(str long str long ptr)
@ cdecl _mbsnccnt(str long)
# stub _mbsnccnt_l(str long ptr)
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
# stub _mbsncmp_l(str str long ptr)
@ stub _mbsncoll(str str long)
......
......@@ -666,7 +666,7 @@
@ stub _mbsncat_s
@ stub _mbsncat_s_l
@ cdecl _mbsnccnt(str long)
@ stub _mbsnccnt_l
@ cdecl _mbsnccnt_l(str long ptr)
@ cdecl _mbsncmp(str str long)
@ stub _mbsncmp_l
@ stub _mbsncoll(str str long)
......@@ -1235,7 +1235,7 @@
@ stub _o__mbsncat_s
@ stub _o__mbsncat_s_l
@ cdecl _o__mbsnccnt(str long) _mbsnccnt
@ stub _o__mbsnccnt_l
@ cdecl _o__mbsnccnt_l(str long ptr) _mbsnccnt_l
@ cdecl _o__mbsncmp(str str long) _mbsncmp
@ stub _o__mbsncmp_l
@ stub _o__mbsncoll
......
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