Commit 8c24ef78 authored by Shachar Shemesh's avatar Shachar Shemesh Committed by Alexandre Julliard

System default locale in Windows determines the ANSI encoding

(LC_CTYPE on Unix).
parent 0a8c92b4
......@@ -505,13 +505,13 @@ static int charset_cmp( const void *name, const void *entry )
/***********************************************************************
* init_default_lcid
*/
static LCID init_default_lcid( UINT *unix_cp )
static LCID init_default_lcid( UINT *unix_cp, const char *env_str )
{
char *buf, *lang,*country,*charset,*dialect,*next;
LCID ret = 0;
if ((lang = getenv( "LC_ALL" )) ||
(lang = getenv( "LANGUAGE" )) ||
(env_str && (lang = getenv( env_str ))) ||
(lang = getenv( "LANG" )))
{
if (!strcmp(lang,"POSIX") || !strcmp(lang,"C")) goto done;
......@@ -2483,11 +2483,13 @@ void LOCALE_Init(void)
const union cptable *unix_cp );
UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp = ~0U;
LCID lcid = init_default_lcid( &unix_cp );
LCID lcid = init_default_lcid( &unix_cp, NULL );
NtSetDefaultLocale( FALSE, lcid );
NtSetDefaultLocale( TRUE, lcid );
lcid = init_default_lcid( &unix_cp, "LC_CTYPE" );
NtSetDefaultLocale( FALSE, lcid );
ansi_cp = get_lcid_codepage(lcid);
GetLocaleInfoW( lcid, LOCALE_IDEFAULTMACCODEPAGE | LOCALE_RETURN_NUMBER,
(LPWSTR)&mac_cp, sizeof(mac_cp)/sizeof(WCHAR) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment