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

MSVCRT_fclose() mustn't use the _flag field from the file structure 

after _close() has been called.
When _open_osfhandle() is used by MFC's CStdioFile, it expects write
access even though it doesn't set the necessary flag bit.
This commit is contained in:
Adam Gundy 2003-03-30 03:06:30 +00:00 committed by Alexandre Julliard
parent da9720c726
commit 2f5e5f3d29
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msvcrt/file.c
View File

@ -1124,10 +1124,13 @@ int _wcreat(const MSVCRT_wchar_t *path, int flags)
*/ */
int _open_osfhandle(long hand, int flags) int _open_osfhandle(long hand, int flags)
{ {
/* _O_RDONLY (0) always matches, so set the read flag*/ /* _O_RDONLY (0) always matches, so set the read flag
* MFC's CStdioFile clears O_RDONLY (0)! if it wants to write to the
* file, so set the write flag
*/
/* FIXME: handle more flags */ /* FIXME: handle more flags */
int fd= msvcrt_alloc_fd((HANDLE)hand,flags|MSVCRT__IOREAD); int fd= msvcrt_alloc_fd((HANDLE)hand,flags|MSVCRT__IOREAD|MSVCRT__IOWRT);
TRACE(":handle (%ld) fd (%d) flags 0x%08x\n",hand,fd, flags |MSVCRT__IOREAD); TRACE(":handle (%ld) fd (%d) flags 0x%08x\n",hand,fd, flags |MSVCRT__IOREAD|MSVCRT__IOWRT);
return fd; return fd;
} }
@ -1556,9 +1559,11 @@ void MSVCRT_clearerr(MSVCRT_FILE* file)
*/ */
int MSVCRT_fclose(MSVCRT_FILE* file) int MSVCRT_fclose(MSVCRT_FILE* file)
{ {
int r; int r, flag;
flag = file->_flag;
r=_close(file->_file); r=_close(file->_file);
return ((r==MSVCRT_EOF) || (file->_flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0); return ((r==MSVCRT_EOF) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0);
} }
/********************************************************************* /*********************************************************************