From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 5b16178b335..3b936321506 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -248,7 +248,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim) len = 0; while (*a) { - len += MultiByteToWideChar(CP_ACP, 0, *a, -1, NULL, 0); + len += convert_acp_utf8_to_wcs(*a, NULL, 0); a++; } @@ -261,7 +261,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim) p = ret; while (*a) { - p += MultiByteToWideChar(CP_ACP, 0, *a, strlen(*a), p, len - (p - ret)); + p += convert_acp_utf8_to_wcs(*a, p, len - (p - ret)); *p++ = delim; a++; } @@ -469,7 +469,7 @@ intptr_t WINAPIV _execle(const char* name, const char* arg0, ...) const char * const *envp; intptr_t ret; - if (!(nameW = msvcrt_wstrdupa(name))) return -1; + if (!(nameW = wstrdupa_utf8(name))) return -1; va_start(ap, arg0); args = msvcrt_valisttos_aw(arg0, ap, ' '); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6969