Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 18:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CRT]

Browse source 
* Update fgetwc().
* Fixes some msvcrt tests.
CORE-8080

svn path=/trunk/; revision=63273
This commit is contained in:
Amine Khaldi 2014-05-13 13:11:22 +00:00
parent 3904749e7d
commit 065ed0c860
1 changed files with 35 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
reactos/lib/sdk/crt/stdio/file.c
View file

@ -2634,60 +2634,50 @@ char * CDECL fgets(char *s, int size, FILE* file)
/*********************************************************************
* fgetwc (MSVCRT.@)
*
* In _O_TEXT mode, multibyte characters are read from the file, dropping
* the CR from CR/LF combinations
*/
wint_t CDECL fgetwc(FILE* file)
{
int c;
wint_t ret;
int ch;
_lock_file(file);
if (!(get_ioinfo(file->_file)->wxflag & WX_TEXT))
{
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 = _filbuf(file);
if(file->_cnt<=0)
{
file->_flag |= (file->_cnt == 0) ? _IOEOF : _IOERR;
file->_cnt = 0;
_unlock_file(file);
return WEOF;
}
wcp[i] = j;
}
}
if((get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16))
|| !(get_ioinfo(file->_file)->wxflag & WX_TEXT)) {
char *p;
_unlock_file(file);
return wc;
for(p=(char*)&ret; (wint_t*)p<&ret+1; p++) {
ch = fgetc(file);
if(ch == EOF) {
ret = WEOF;
break;
}
*p = (char)ch;
}
}else {
char mbs[MB_LEN_MAX];
int len = 0;
ch = fgetc(file);
if(ch != EOF) {
mbs[0] = (char)ch;
if(isleadbyte((unsigned char)mbs[0])) {
ch = fgetc(file);
if(ch != EOF) {
mbs[1] = (char)ch;
len = 2;
}
}else {
len = 1;
}
}
if(!len || mbtowc(&ret, mbs, len)==-1)
ret = WEOF;
}
c = fgetc(file);
if ((__mb_cur_max > 1) && isleadbyte(c))
{
FIXME("Treat Multibyte characters\n");
}
_unlock_file(file);
if (c == EOF)
return WEOF;
else
return (wint_t)c;
_unlock_file(file);
return ret;
}
/*********************************************************************