Module: wine Branch: master Commit: 9c319baa6670219e4ea6c6ae35f238c087ef2094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c319baa6670219e4ea6c6ae35...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Nov 7 12:51:51 2012 +0100
msvcrt: Fixed __p___mb_cur_max tests.
---
dlls/msvcrt/tests/locale.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 73eeb91..6b09cdf 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -745,6 +745,10 @@ static void test__Gettnames(void) static void test___mb_cur_max_func(void) { int mb_cur_max; + CPINFO cp; + + setlocale(LC_ALL, "C"); + GetCPInfo(CP_ACP, &cp);
/* for newer Windows */ if(!p___mb_cur_max_func) @@ -768,7 +772,13 @@ static void test___mb_cur_max_func(void) win_skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); - ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + if (cp.MaxCharSize != 1) { + todo_wine ok(mb_cur_max == cp.MaxCharSize, "mb_cur_max = %d, expected %d\n", + mb_cur_max, cp.MaxCharSize); + } + else { + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + }
/* some old Windows don't set chinese */ if (!setlocale(LC_ALL, "chinese"))