msvcrt: Don't set error in wcstombs_s_l if no characters to convert.

Signed-off-by: Daniel Lehman <dlehman@esri.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
41789724 · Daniel Lehman · Alexandre Julliard · 51b75e9a · 41789724 · 41789724
Commit 41789724 authored Feb 03, 2020 by Daniel Lehman Committed by Alexandre Julliard Feb 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

string.c dlls/msvcrt/tests/string.c +1 -1

wcs.c dlls/msvcrt/wcs.c +2 -2

No files found.
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -2300,7 +2300,7 @@ static void test__wcstombs_s_l(void)
        { L"text",   _TRUNCATE, "",     1, 1,  STRUNCATE, NULL, FALSE, TRUE },
        { L"text",   5,         "",     3, 0,  ERANGE,    NULL, TRUE },

-        { L"",       0,         NULL,   0, 1,  0,         "English_United States.1252", TRUE, TRUE },
+        { L"",       0,         NULL,   0, 1,  0,         "English_United States.1252" },
        { L"\xfffd", 1,         NULL,   0, 0,  EILSEQ,    "English_United States.1252", TRUE },
        { L"\xfffd", 1,         "",     1, 0,  EILSEQ,    "English_United States.1252", TRUE },
        { L"\xfffd", 1,         "",     6, 0,  EILSEQ,    "English_United States.1252", TRUE },

--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -459,12 +459,12 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst

    if(!mbstr) {
        tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
-                *wcstr, -1, NULL, 0, NULL, &used_default)-1;
+                *wcstr, -1, NULL, 0, NULL, &used_default);
        if(!tmp || used_default) {
            *MSVCRT__errno() = MSVCRT_EILSEQ;
            return -1;
        }
-        return tmp;
+        return tmp-1;
    }

    while(**wcstr) {