drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround bug in LocaleNameToLCID on Windows 10 

* nlsfuncs.cc (__get_lcid_from_locale): Handle LocaleNameToLCID
	returning LOCALE_CUSTOM_UNSPECIFIED instead of failing in case of
	an unsupported locale on Windows 10.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-10-30 20:13:26 +01:00
parent 4a407e9037
commit 677eea00a6
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-10-30 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__get_lcid_from_locale): Handle LocaleNameToLCID
returning LOCALE_CUSTOM_UNSPECIFIED instead of failing in case of
an unsupported locale on Windows 10.
2015-10-30 Corinna Vinschen <corinna@vinschen.de> 2015-10-30 Corinna Vinschen <corinna@vinschen.de>
* exceptions.cc (sigpacket::process): Avoid potentially double unlocking * exceptions.cc (sigpacket::process): Avoid potentially double unlocking

19
winsup/cygwin/nlsfuncs.cc
View File

@ -1,6 +1,6 @@
/* nlsfuncs.cc: NLS helper functions /* nlsfuncs.cc: NLS helper functions
Copyright 2010, 2011, 2012, 2013 Red Hat, Inc. Copyright 2010, 2011, 2012, 2013, 2015 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -88,7 +88,9 @@ __get_lcid_from_locale (const char *name)
*c = '-'; *c = '-';
mbstowcs (wlocale, locale, ENCODING_LEN + 1); mbstowcs (wlocale, locale, ENCODING_LEN + 1);
lcid = LocaleNameToLCID (wlocale, 0); lcid = LocaleNameToLCID (wlocale, 0);
if (lcid == 0) /* Bug on Windows 10: LocaleNameToLCID returns LOCALE_CUSTOM_UNSPECIFIED
for unknown locales. */
if (lcid == 0 || lcid == LOCALE_CUSTOM_UNSPECIFIED)
{ {
/* Unfortunately there are a couple of locales for which no form /* Unfortunately there are a couple of locales for which no form
without a Script part per RFC 4646 exists. without a Script part per RFC 4646 exists.
@ -127,24 +129,29 @@ __get_lcid_from_locale (const char *name)
{ {
/* Vista/2K8 is missing sr-ME and sr-RS. It has only the /* Vista/2K8 is missing sr-ME and sr-RS. It has only the
deprecated sr-CS. So we map ME and RS to CS here. */ deprecated sr-CS. So we map ME and RS to CS here. */
if (lcid == 0) if (lcid == 0 || lcid == LOCALE_CUSTOM_UNSPECIFIED)
lcid = LocaleNameToLCID (L"sr-Cyrl-CS", 0); lcid = LocaleNameToLCID (L"sr-Cyrl-CS", 0);
/* "@latin" modifier for the sr_XY locales changes /* "@latin" modifier for the sr_XY locales changes
collation behaviour so lcid should accommodate that collation behaviour so lcid should accommodate that
by being set to the Latin sublang. */ by being set to the Latin sublang. */
if (lcid != 0 && has_modifier ("@latin")) if (lcid != 0 && lcid != LOCALE_CUSTOM_UNSPECIFIED
&& has_modifier ("@latin"))
lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) - 1); lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) - 1);
} }
else if (!strncmp (locale, "uz-", 3)) else if (!strncmp (locale, "uz-", 3))
{ {
/* Equivalent for "@cyrillic" modifier in uz_UZ locale */ /* Equivalent for "@cyrillic" modifier in uz_UZ locale */
if (lcid != 0 && has_modifier ("@cyrillic")) if (lcid != 0 && lcid != LOCALE_CUSTOM_UNSPECIFIED
&& has_modifier ("@cyrillic"))
lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) + 1); lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) + 1);
} }
break; break;
} }
} }
last_lcid = lcid ?: (LCID) -1; if (lcid && lcid != LOCALE_CUSTOM_UNSPECIFIED)
last_lcid = lcid;
else
last_lcid = (LCID) -1;
debug_printf ("LCID=%04y", last_lcid); debug_printf ("LCID=%04y", last_lcid);
return last_lcid; return last_lcid;
} }

3
winsup/cygwin/release/2.3.0
View File

@ -57,3 +57,6 @@ Bug Fixes
- Fix sigwait(3) to return errno instead of -1 and never to return with EINTR. - Fix sigwait(3) to return errno instead of -1 and never to return with EINTR.
- Fix pthread_kill(3) to return errno instead of -1. - Fix pthread_kill(3) to return errno instead of -1.
- Workaround a bug in Windows 10 NLS handling.
Addresses: https://cygwin.com/ml/cygwin/2015-10/msg00547.html