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

msvcrt: Make FILE->_flag reading functions thread safe.

Browse Source
This commit is contained in:
Piotr Caban 2011-05-20 13:22:29 +02:00 committed by Alexandre Julliard
parent dd30302268
commit ae15a4b6bc
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/msvcrt/file.c
View File

@ -1198,7 +1198,10 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size)
void CDECL MSVCRT_clearerr(MSVCRT_FILE* file) void CDECL MSVCRT_clearerr(MSVCRT_FILE* file)
{ {
TRACE(":file (%p) fd (%d)\n",file,file->_file); TRACE(":file (%p) fd (%d)\n",file,file->_file);
MSVCRT__lock_file(file);
file->_flag &= ~(MSVCRT__IOERR | MSVCRT__IOEOF); file->_flag &= ~(MSVCRT__IOERR | MSVCRT__IOEOF);
MSVCRT__unlock_file(file);
} }
/********************************************************************* /*********************************************************************
@ -1338,8 +1341,15 @@ __int64 CDECL MSVCRT__filelengthi64(int fd)
*/ */
int CDECL MSVCRT__fileno(MSVCRT_FILE* file) int CDECL MSVCRT__fileno(MSVCRT_FILE* file)
{ {
int ret;
TRACE(":FILE* (%p) fd (%d)\n",file,file->_file); TRACE(":FILE* (%p) fd (%d)\n",file,file->_file);
return file->_file;
MSVCRT__lock_file(file);
ret = file->_file;
MSVCRT__unlock_file(file);
return ret;
} }
/********************************************************************* /*********************************************************************
@ -2589,7 +2599,13 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file)
*/ */
int CDECL MSVCRT_feof(MSVCRT_FILE* file) int CDECL MSVCRT_feof(MSVCRT_FILE* file)
{ {
return file->_flag & MSVCRT__IOEOF; int ret;
MSVCRT__lock_file(file);
ret = file->_flag & MSVCRT__IOEOF;
MSVCRT__unlock_file(file);
return ret;
} }
/********************************************************************* /*********************************************************************
@ -2597,7 +2613,13 @@ int CDECL MSVCRT_feof(MSVCRT_FILE* file)
*/ */
int CDECL MSVCRT_ferror(MSVCRT_FILE* file) int CDECL MSVCRT_ferror(MSVCRT_FILE* file)
{ {
return file->_flag & MSVCRT__IOERR; int ret;
MSVCRT__lock_file(file);
ret = file->_flag & MSVCRT__IOERR;
MSVCRT__unlock_file(file);
return ret;
} }
/********************************************************************* /*********************************************************************