Piotr Caban : msvcrt/tests: Fix tolower test failures.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Sep 14 09:44:34 CDT 2015
Module: wine
Branch: master
Commit: b408b5a9a47159a8d7a424e59fabd471f68b61ff
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b408b5a9a47159a8d7a424e59fabd471f68b61ff
Author: Piotr Caban <piotr at codeweavers.com>
Date: Sat Sep 12 13:15:27 2015 +0200
msvcrt/tests: Fix tolower test failures.
---
dlls/msvcrt/tests/string.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index d247ba6..7733a7c 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -2608,6 +2608,7 @@ static void test_wctomb(void)
static void test_tolower(void)
{
+ WCHAR chw, lower;
char ch, lch;
int ret, len;
@@ -2638,7 +2639,10 @@ static void test_tolower(void)
ch = 0xF4;
errno = 0xdeadbeef;
ret = p_tolower(ch);
- len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1);
+ if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) ||
+ LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 ||
+ (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1)
+ len = 0;
if(len)
ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret);
else
@@ -2649,7 +2653,10 @@ static void test_tolower(void)
ch = 0xD0;
errno = 0xdeadbeef;
ret = p_tolower(ch);
- len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1);
+ if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) ||
+ LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 ||
+ (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1)
+ len = 0;
if(len)
ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret);
else
More information about the wine-cvs
mailing list