marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: EnumTimeFormatsA() doesn't support TIME_NOSECONDS. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2015-11-10 17:40:08 +03:00 committed by Alexandre Julliard
parent 982c3ede72
commit 6f35351f81
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/kernel32/lcformat.c
View File

@ -1930,6 +1930,12 @@ BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags)
{
char buf[256];
if (flags & ~LOCALE_USE_CP_ACP)
{
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
if (!proc)
{
SetLastError(ERROR_INVALID_PARAMETER);

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

@ -3520,14 +3520,13 @@ static void test_EnumTimeFormatsW(void)
/* EnumTimeFormatsA doesn't support this flag */
ret = EnumTimeFormatsA(enum_datetime_procA, lcid, TIME_NOSECONDS);
todo_wine {
ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret,
GetLastError());
ret = EnumTimeFormatsA(NULL, lcid, TIME_NOSECONDS);
ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret,
GetLastError());
}
/* And it's not supported by GetLocaleInfoA either */
ret = GetLocaleInfoA(lcid, LOCALE_SSHORTTIME, buf, sizeof(buf)/sizeof(buf[0]));
ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "GetLocaleInfoA(LOCALE_SSHORTTIME) ret %d, error %d\n", ret,