ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: LCMapString should include the terminating NULL also for LCMAP_SORTKEY.

Browse Source
This commit is contained in:
Alexandre Julliard 2009-01-19 13:46:30 +01:00
parent 6d75522fb4
commit 317ad64985
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/kernel32/locale.c
View File

@ -2371,6 +2371,8 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen,
ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen);
if (ret == 0) if (ret == 0)
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
else
ret++;
return ret; return ret;
} }
@ -2510,6 +2512,8 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen,
ret = wine_get_sortkey(flags, srcW, srclenW, dst, dstlen); ret = wine_get_sortkey(flags, srcW, srclenW, dst, dstlen);
if (ret == 0) if (ret == 0)
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
else
ret++;
goto map_string_exit; goto map_string_exit;
} }

4
dlls/kernel32/tests/locale.c
View File

@ -1227,9 +1227,11 @@ static void test_LCMapStringA(void)
ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY,
upper_case, -1, buf, sizeof(buf)); upper_case, -1, buf, sizeof(buf));
ok(ret, "LCMapStringA must succeed\n"); ok(ret, "LCMapStringA must succeed\n");
ok(buf[ret-1] == 0, "LCMapStringA not null-terminated\n");
ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY,
upper_case, lstrlenA(upper_case), buf2, sizeof(buf2)); upper_case, lstrlenA(upper_case), buf2, sizeof(buf2));
ok(ret, "LCMapStringA must succeed\n"); ok(ret2, "LCMapStringA must succeed\n");
ok(buf2[ret2-1] == 0, "LCMapStringA not null-terminated\n" );
ok(ret == ret2, "lengths of sort keys must be equal\n"); ok(ret == ret2, "lengths of sort keys must be equal\n");
ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n"); ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n");