system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 18:08:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvcrt: Fix mbstowcs_l implementation.

Browse source
This commit is contained in:
Piotr Caban 2010-05-22 22:24:40 +02:00 committed by Alexandre Julliard
parent 7b8243e5e5
commit 2ca3b9e016
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dlls/msvcrt/mbcs.c
View file

@ -1725,22 +1725,29 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str)
MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr,
MSVCRT_size_t count, MSVCRT__locale_t locale)
{
MSVCRT_size_t tmp;
MSVCRT_size_t i, size;
if(!locale)
locale = get_locale();
tmp = _mbstrlen_l(mbstr, locale);
if(tmp>count && wcstr)
tmp = count;
/* Ignore count parameter */
if(!wcstr)
return MultiByteToWideChar(locale->locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1;
tmp = MultiByteToWideChar(locale->locinfo->lc_codepage, 0,
mbstr, tmp, wcstr, count);
for(i=0, size=0; i<count; i++) {
if(mbstr[size] == '\0')
break;
if(tmp<count && wcstr)
wcstr[tmp] = '\0';
size += (MSVCRT_isleadbyte(mbstr[size]) ? 2 : 1);
}
return tmp;
size = MultiByteToWideChar(locale->locinfo->lc_codepage, 0,
mbstr, size, wcstr, count);
if(size<count && wcstr)
wcstr[size] = '\0';
return size;
}
/*********************************************************************