marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files.

oldstable
Piotr Caban 2013-03-20 10:40:45 +01:00 committed by Alexandre Julliard
parent cde73251d8
commit 6eeb000c90
2 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
dlls/msvcrt/file.c
View File

@ -3205,60 +3205,50 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file)
/*********************************************************************
* fgetwc (MSVCRT.@)
*
* In MSVCRT__O_TEXT mode, multibyte characters are read from the file, dropping
* the CR from CR/LF combinations
*/
MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file)
{
int c;
MSVCRT_wint_t ret;
int ch;
MSVCRT__lock_file(file);
if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT))
{
MSVCRT_wchar_t wc;
unsigned int i;
int j;
char *chp, *wcp;
wcp = (char *)&wc;
for(i=0; i<sizeof(wc); i++)
{
if (file->_cnt>0)
{
file->_cnt--;
chp = file->_ptr++;
wcp[i] = *chp;
}
else
{
j = MSVCRT__filbuf(file);
if(file->_cnt<=0)
{
file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR;
file->_cnt = 0;
MSVCRT__lock_file(file);
MSVCRT__unlock_file(file);
return MSVCRT_WEOF;
}
wcp[i] = j;
if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16))
|| !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) {
char *p;
for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) {
ch = MSVCRT_fgetc(file);
if(ch == MSVCRT_EOF) {
ret = MSVCRT_WEOF;
break;
}
*p = (char)ch;
}
}
}else {
char mbs[MSVCRT_MB_LEN_MAX];
int len = 0;
MSVCRT__unlock_file(file);
return wc;
}
c = MSVCRT_fgetc(file);
if ((get_locinfo()->mb_cur_max > 1) && MSVCRT_isleadbyte(c))
{
FIXME("Treat Multibyte characters\n");
ch = MSVCRT_fgetc(file);
if(ch != MSVCRT_EOF) {
mbs[0] = (char)ch;
if(MSVCRT_isleadbyte((unsigned char)mbs[0])) {
ch = MSVCRT_fgetc(file);
if(ch != MSVCRT_EOF) {
mbs[1] = (char)ch;
len = 2;
}
}else {
len = 1;
}
}
if(!len || MSVCRT_mbtowc(&ret, mbs, len)==-1)
ret = MSVCRT_WEOF;
}
MSVCRT__unlock_file(file);
if (c == MSVCRT_EOF)
return MSVCRT_WEOF;
else
return (MSVCRT_wint_t)c;
MSVCRT__unlock_file(file);
return ret;
}
/*********************************************************************

1
dlls/msvcrt/msvcrt.h
View File

@ -945,6 +945,7 @@ int __cdecl _getch(void);
int __cdecl _ismbblead(unsigned int);
int __cdecl _ismbclegal(unsigned int c);
int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str);
int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t);
MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t);
MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *);
MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *);