ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fix mbsrtowcs behavior when no out buffer is passed. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-05-16 13:29:34 +02:00 committed by Alexandre Julliard
parent 1b072058ac
commit 4f5a68412b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/msvcrt/mbcs.c
View File

@ -2344,26 +2344,29 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr,
MSVCRT_mbstate_t s = (state ? *state : 0);
MSVCRT_wchar_t tmpdst;
MSVCRT_size_t ret = 0;
const char *p;
if(!MSVCRT_CHECK_PMT(pmbstr != NULL))
return -1;
p = *pmbstr;
while(!wcstr || count>ret) {
int ch_len = MSVCRT_mbrtowc(&tmpdst, *pmbstr, 2, &s);
int ch_len = MSVCRT_mbrtowc(&tmpdst, p, 2, &s);
if(wcstr)
wcstr[ret] = tmpdst;
if(ch_len < 0) {
return -1;
}else if(ch_len == 0) {
*pmbstr = NULL;
if(wcstr) *pmbstr = NULL;
return ret;
}
*pmbstr += ch_len;
p += ch_len;
ret++;
}
if(wcstr) *pmbstr = p;
return ret;
}