ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 13831:14550 from trunk

Browse Source 
svn path=/branches/xmlbuildsystem/; revision=14575
This commit is contained in:
Casper Hornstrup
2005-04-10 14:32:30 +00:00
parent af941b419a 2cb97d1370
commit 6d5cdde45c
1089 changed files with 131731 additions and 74063 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/tools/unicode/mbtowc.c
+8 -6
View File
@@ -22,6 +22,8 @@
#include "wine/unicode.h"
typedef unsigned char uchar;
/* get the decomposition of a Unicode char */
int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
{
@@ -256,25 +258,25 @@ int wine_cp_mbstowcs( const union cptable *table, int flags,
{
if (flags & MB_ERR_INVALID_CHARS)
{
if (check_invalid_chars_sbcs( &table->sbcs, src, srclen )) return -2;
if (check_invalid_chars_sbcs( &table->sbcs, (const uchar*)src, srclen )) return -2;
}
if (!(flags & MB_COMPOSITE))
{
if (!dstlen) return srclen;
return mbstowcs_sbcs( &table->sbcs, src, srclen, dst, dstlen );
return mbstowcs_sbcs( &table->sbcs, (const uchar*)src, srclen, dst, dstlen );
}
return mbstowcs_sbcs_decompose( &table->sbcs, src, srclen, dst, dstlen );
return mbstowcs_sbcs_decompose( &table->sbcs, (const uchar*)src, srclen, dst, dstlen );
}
else /* mbcs */
{
if (flags & MB_ERR_INVALID_CHARS)
{
if (check_invalid_chars_dbcs( &table->dbcs, src, srclen )) return -2;
if (check_invalid_chars_dbcs( &table->dbcs, (const uchar*)src, srclen )) return -2;
}
if (!(flags & MB_COMPOSITE))
return mbstowcs_dbcs( &table->dbcs, src, srclen, dst, dstlen );
return mbstowcs_dbcs( &table->dbcs, (const uchar*)src, srclen, dst, dstlen );
else
return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen );
return mbstowcs_dbcs_decompose( &table->dbcs, (const uchar*)src, srclen, dst, dstlen );
}
}
reactos/tools/unicode/string.c
+1
View File
@@ -20,6 +20,7 @@
#include <limits.h>
#include <stdio.h>
#include <ctype.h>
#include "wine/unicode.h"
reactos/tools/unicode/wctomb.c
+1 -1
View File
@@ -196,7 +196,7 @@ static int wcstombs_sbcs_slow( const struct sbcs_table *table, int flags,
int tmp;
WCHAR composed;
if (!defchar) defchar = &table_default;
if (!defchar) defchar = (const char*)&table_default;
if (!used) used = &tmp; /* avoid checking on every char */
*used = 0;