Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
* Sync GetLocaleInfoW with Wine 1.5.26.
CORE-7281

svn path=/trunk/; revision=59614
This commit is contained in:
Amine Khaldi 2013-08-01 16:15:11 +00:00
parent 4146ef0e85
commit 00c23e8433
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/kernel32/winnls/string/lang.c
View file

@ -754,6 +754,10 @@ INT WINAPI GetLocaleInfoA( LCID lcid, LCTYPE lctype, LPSTR buffer, INT len )
return ret; return ret;
} }
static int get_value_base_by_lctype( LCTYPE lctype )
{
return lctype == LOCALE_ILANGUAGE || lctype == LOCALE_IDEFAULTLANGUAGE ? 16 : 10;
}
/****************************************************************************** /******************************************************************************
* GetLocaleInfoW (KERNEL32.@) * GetLocaleInfoW (KERNEL32.@)
@ -807,7 +811,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len )
if (ret > 0) if (ret > 0)
{ {
WCHAR *end; WCHAR *end;
UINT number = strtolW( tmp, &end, 10 ); UINT number = strtolW( tmp, &end, get_value_base_by_lctype( lctype ) );
if (*end) /* invalid number */ if (*end) /* invalid number */
{ {
SetLastError( ERROR_INVALID_FLAGS ); SetLastError( ERROR_INVALID_FLAGS );
@ -880,7 +884,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len )
if (!tmp) return 0; if (!tmp) return 0;
memcpy( tmp, p + 1, *p * sizeof(WCHAR) ); memcpy( tmp, p + 1, *p * sizeof(WCHAR) );
tmp[*p] = 0; tmp[*p] = 0;
number = strtolW( tmp, &end, 10 ); number = strtolW( tmp, &end, get_value_base_by_lctype( lctype ) );
if (!*end) if (!*end)
memcpy( buffer, &number, sizeof(number) ); memcpy( buffer, &number, sizeof(number) );
else /* invalid number */ else /* invalid number */