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

kernelbase: Reimplement Internal_EnumTimeFormats() using the locale.nls data. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-04-07 11:23:20 +02:00
parent 8576c3e131
commit 25595a0abe
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/kernel32/locale.c
View File

@ -55,8 +55,8 @@ extern BOOL WINAPI Internal_EnumLanguageGroupLocales( LANGGROUPLOCALE_ENUMPROCW
extern BOOL WINAPI Internal_EnumSystemCodePages( CODEPAGE_ENUMPROCW proc, DWORD flags, BOOL unicode ); extern BOOL WINAPI Internal_EnumSystemCodePages( CODEPAGE_ENUMPROCW proc, DWORD flags, BOOL unicode );
extern BOOL WINAPI Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_ENUMPROCW proc, DWORD flags, extern BOOL WINAPI Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_ENUMPROCW proc, DWORD flags,
LONG_PTR param, BOOL unicode ); LONG_PTR param, BOOL unicode );
extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, const NLS_LOCALE_DATA *locale,
BOOL unicode, BOOL ex, LPARAM lparam ); DWORD flags, BOOL unicode, BOOL ex, LPARAM lparam );
extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags,
LONG_PTR param, BOOL unicode ); LONG_PTR param, BOOL unicode );
@ -350,7 +350,8 @@ BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags )
SetLastError(ERROR_INVALID_FLAGS); SetLastError(ERROR_INVALID_FLAGS);
return FALSE; return FALSE;
} }
return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, 0 ); return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, NlsValidateLocale( &lcid, 0 ),
flags, FALSE, FALSE, 0 );
} }
/****************************************************************************** /******************************************************************************

46
dlls/kernelbase/locale.c
View File

@ -3888,14 +3888,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_E
/************************************************************************** /**************************************************************************
* Internal_EnumTimeFormats (kernelbase.@) * Internal_EnumTimeFormats (kernelbase.@)
*/ */
BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc,
const NLS_LOCALE_DATA *locale, DWORD flags,
BOOL unicode, BOOL ex, LPARAM lparam ) BOOL unicode, BOOL ex, LPARAM lparam )
{ {
WCHAR buffer[256]; WCHAR buffer[256];
LCTYPE lctype; INT ret = TRUE;
INT ret; const DWORD *array;
DWORD pos, i;
if (!proc) if (!proc || !locale)
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return FALSE; return FALSE;
@ -3903,10 +3905,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc,
switch (flags & ~LOCALE_USE_CP_ACP) switch (flags & ~LOCALE_USE_CP_ACP)
{ {
case 0: case 0:
lctype = LOCALE_STIMEFORMAT; if (!get_locale_info( locale, 0, LOCALE_STIMEFORMAT, buffer, ARRAY_SIZE(buffer) )) return FALSE;
pos = locale->stimeformat;
break; break;
case TIME_NOSECONDS: case TIME_NOSECONDS:
lctype = LOCALE_SSHORTTIME; if (!get_locale_info( locale, 0, LOCALE_SSHORTTIME, buffer, ARRAY_SIZE(buffer) )) return FALSE;
pos = locale->sshorttime;
break; break;
default: default:
FIXME( "Unknown time format %lx\n", flags ); FIXME( "Unknown time format %lx\n", flags );
@ -3914,16 +3918,21 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc,
return FALSE; return FALSE;
} }
lctype |= flags & LOCALE_USE_CP_ACP; array = (const DWORD *)(locale_strings + pos + 1);
if (unicode) for (i = 0; ret && i < locale_strings[pos]; i++)
ret = GetLocaleInfoW( lcid, lctype, buffer, ARRAY_SIZE(buffer) );
else
ret = GetLocaleInfoA( lcid, lctype, (char *)buffer, sizeof(buffer) );
if (ret)
{ {
if (ex) ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam ); if (i) memcpy( buffer, locale_strings + array[i] + 1,
else proc( buffer ); (locale_strings[array[i]] + 1) * sizeof(WCHAR) );
if (ex) ret = ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam );
else if (unicode) ret = proc( buffer );
else
{
char buffA[256];
WideCharToMultiByte( get_locale_codepage( locale, flags ), 0, buffer, -1,
buffA, ARRAY_SIZE(buffA), NULL, NULL );
ret = proc( (WCHAR *)buffA );
}
} }
return TRUE; return TRUE;
} }
@ -4408,7 +4417,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD
*/ */
BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags )
{ {
return Internal_EnumTimeFormats( proc, lcid, flags, TRUE, FALSE, 0 ); return Internal_EnumTimeFormats( proc, NlsValidateLocale( &lcid, 0 ), flags, TRUE, FALSE, 0 );
} }
@ -4418,8 +4427,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lci
BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsEx( TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsEx( TIMEFMT_ENUMPROCEX proc, const WCHAR *locale,
DWORD flags, LPARAM lparam ) DWORD flags, LPARAM lparam )
{ {
LCID lcid = LocaleNameToLCID( locale, 0 ); LCID lcid;
return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, TRUE, TRUE, lparam ); return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, get_locale_by_name( locale, &lcid ),
flags, TRUE, TRUE, lparam );
} }