Module: wine Branch: master Commit: 97782484414ff5a32b26c8bcaccd22cc6b8bc2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=97782484414ff5a32b26c8bcac...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Jan 25 15:07:37 2013 +0100
msvcrt: Fixed _Gettnames test on Win8.
---
dlls/msvcrt/tests/locale.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 3bb7fdc..257e3c8 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -656,6 +656,7 @@ static void test__Gettnames(void) char data[1]; } *ret; int size; + char buf[64];
if(!setlocale(LC_ALL, "english")) return; @@ -712,7 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, MMMM dd, yyyy"), "ret->str[41] = %s\n", ret->str[41]); + ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, + buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret);
if(!setlocale(LC_TIME, "german"))