Piotr Caban : msvcrt: Fix mbsrtowcs behavior when no out buffer is passed.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 16 10:36:45 CDT 2016
Module: wine
Branch: master
Commit: 4f5a68412b56aa80cb70dcaeea8fb3e8f89c3831
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5a68412b56aa80cb70dcaeea8fb3e8f89c3831
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon May 16 13:29:34 2016 +0200
msvcrt: Fix mbsrtowcs behavior when no out buffer is passed.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/mbcs.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 2c73de0..47478a3 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -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;
}
More information about the wine-cvs
mailing list