From 6f8bea3049f5194277f7189778732b01e389009e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= Date: Wed, 4 Sep 2019 17:27:24 +0300 Subject: [PATCH] kernel32/locale: Don't fail with non-NULL args when the Unix codepage falls back to UTF-8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Ivăncescu Signed-off-by: Alexandre Julliard --- dlls/kernel32/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2698b3d8e92..7710cc9cb7c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2727,9 +2727,13 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, ret = wine_cp_wcstombs( unix_cptable, flags, src, srclen, dst, dstlen, defchar, used ? &used_tmp : NULL ); if (used) *used = used_tmp; - break; } - /* fall through */ + else + { + ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); + if (used) *used = FALSE; + } + break; case CP_UTF8: if (defchar || used) {