[KERNEL32]

- Add missing location friendly names
- Correctly handle location ids larger than USHORT_MAX in NLS_GetGeoFriendlyName

svn path=/trunk/; revision=66912
This commit is contained in:
Thomas Faber 2015-03-27 11:12:22 +00:00
parent f75a13a609
commit 597f0e753c
2 changed files with 5 additions and 0 deletions

View file

@ -425,4 +425,8 @@ BEGIN
21242+NLSRC_OFFSET "Midway Islands"
30967+NLSRC_OFFSET "Sint Maarten (Dutch part)"
31706+NLSRC_OFFSET "Saint Martin (French part)"
(7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste"
(10028789+NLSRC_OFFSET)&0xffff "Åland Islands"
(161832015+NLSRC_OFFSET)&0xffff "Saint-Barthélemy"
(161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands"
END

View file

@ -3004,6 +3004,7 @@ NLS_GetGeoFriendlyName(GEOID Location, LPWSTR szFriendlyName, int cchData)
/* FIXME: move *.nls resources out of kernel32 into locale.nls */
Location += NLSRC_OFFSET;
Location &= 0xFFFF;
if(cchData == 0)
return GetLocalisedText(Location, NULL, 0);