[ros-diffs] [tfaber] 66912: [KERNEL32] - Add missing location friendly names - Correctly handle location ids larger than USHORT_MAX in NLS_GetGeoFriendlyName

[tfaber]

Author: tfaber
Date: Fri Mar 27 11:12:22 2015
New Revision: 66912

URL: http://svn.reactos.org/svn/reactos?rev=66912&view=rev
Log:
[KERNEL32]
- Add missing location friendly names
- Correctly handle location ids larger than USHORT_MAX in NLS_GetGeoFriendlyName

Modified:
    trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc
    trunk/reactos/dll/win32/kernel32/winnls/string/lang.c

Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc?rev=66912&r1=66911&r2=66912&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc       [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc       [iso-8859-1] 
Fri Mar 27 11:12:22 2015
@@ -425,4 +425,8 @@
     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

Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/string/lang.c?rev=66912&r1=66911&r2=66912&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c       [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c       [iso-8859-1] 
Fri Mar 27 11:12:22 2015
@@ -3004,6 +3004,7 @@
 
     /* FIXME: move *.nls resources out of kernel32 into locale.nls */
     Location += NLSRC_OFFSET;
+    Location &= 0xFFFF;
 
     if(cchData == 0)
         return GetLocalisedText(Location, NULL, 0);