libwine: get_sortkey to return consistent length with and without dstlen.

Signed-off-by: Brendan McGrath <brendan@redmandi.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

libwine: get_sortkey to return consistent length with and without dstlen.
5d577ae9 · Brendan McGrath · Alexandre Julliard · 7c1e0ef7 · 5d577ae9 · 5d577ae9
Commit 5d577ae9 authored Mar 05, 2019 by Brendan McGrath Committed by Alexandre Julliard Mar 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

locale.c dlls/kernel32/tests/locale.c +0 -1

sortkey.c libs/wine/sortkey.c +2 -2

No files found.
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2366,7 +2366,6 @@ static void test_LCMapStringA(void)
    ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY,
                       upper_case, lstrlenA(upper_case), NULL, 0);
    ok(ret2, "LCMapStringA must succeed\n");
-    todo_wine
    ok(ret == ret2, "lengths of sort keys must be equal (%d vs %d)\n", ret, ret2);

    /* test LCMAP_SORTKEY | NORM_IGNORECASE */

--- a/libs/wine/sortkey.c
+++ b/libs/wine/sortkey.c
@@ -79,8 +79,8 @@ int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dst
    }

    if (!dstlen) /* compute length */
-        /* 4 * '\1' + 1 * '\0' + key length */
-        return key_len[0] + key_len[1] + key_len[2] + key_len[3] + 4 + 1;
+        /* 4 * '\1' + key length */
+        return key_len[0] + key_len[1] + key_len[2] + key_len[3] + 4;

    if (dstlen < key_len[0] + key_len[1] + key_len[2] + key_len[3] + 4 + 1)
        return 0; /* overflow */