ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Separate modifier from charset before detecting the charset codepage.

This commit is contained in:
Dmitry Timoshkov 2008-02-08 20:03:39 +08:00 committed by Alexandre Julliard
parent 01af8501b9
commit 667dad2331
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/kernel32/locale.c
View File

@ -351,6 +351,8 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name )
static const WCHAR latnW[] = {'-','L','a','t','n',0}; static const WCHAR latnW[] = {'-','L','a','t','n',0};
WCHAR *p; WCHAR *p;
TRACE("%s\n", debugstr_w(str));
name->country = name->charset = name->script = name->modifier = NULL; name->country = name->charset = name->script = name->modifier = NULL;
name->lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); name->lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT );
name->matches = 0; name->matches = 0;
@ -395,7 +397,6 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name )
{ {
*p++ = 0; *p++ = 0;
name->charset = p; name->charset = p;
name->codepage = find_charset( name->charset );
p = strchrW( p, '@' ); p = strchrW( p, '@' );
} }
if (p) if (p)
@ -404,6 +405,9 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name )
name->modifier = p; name->modifier = p;
} }
if (name->charset)
name->codepage = find_charset( name->charset );
/* rebuild a Windows name if possible */ /* rebuild a Windows name if possible */
if (name->charset) goto done; /* can't specify charset in Windows format */ if (name->charset) goto done; /* can't specify charset in Windows format */