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

libwine: Fix the wctomb validity check for codepages where the default chars don't convert to each other.

This commit is contained in:
Alexandre Julliard 2009-07-24 10:40:32 +02:00
parent c6570a50f8
commit 464c956a0a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/wine/wctomb.c
View File

@ -69,9 +69,9 @@ WCHAR compose( const WCHAR *str )
static inline int is_valid_sbcs_mapping( const struct sbcs_table *table, int flags,
WCHAR wch, unsigned char ch )
{
if (flags & WC_NO_BEST_FIT_CHARS) return (table->cp2uni[ch] == wch);
if (ch != (unsigned char)table->info.def_char) return 1;
return (wch == table->info.def_unicode_char);
if ((flags & WC_NO_BEST_FIT_CHARS) || ch == (unsigned char)table->info.def_char)
return (table->cp2uni[ch] == wch);
return 1;
}
/* query necessary dst length for src string */
@ -262,8 +262,7 @@ static int wcstombs_sbcs_slow( const struct sbcs_table *table, int flags,
static inline int is_valid_dbcs_mapping( const struct dbcs_table *table, int flags,
WCHAR wch, unsigned short ch )
{
if (ch == table->info.def_char && wch != table->info.def_unicode_char) return 0;
if (flags & WC_NO_BEST_FIT_CHARS)
if ((flags & WC_NO_BEST_FIT_CHARS) || ch == table->info.def_char)
{
/* check if char maps back to the same Unicode value */
if (ch & 0xff00)