[PATCH] msvcrt: correctly set EOF flag in fread()

Peter Beutner p.beutner at gmx.net
Fri Feb 17 04:42:08 CST 2006


Setting the EOF flag only if _read() returns zero is not enough as we could also
read something AND hit the end of file.
_read() already sets another internal EOF flag, so just use this too.
Removing todo_wine from the test case.

---

 dlls/msvcrt/file.c       |    2 +-
 dlls/msvcrt/tests/file.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

581f6c8d5f77894d32e7d3d4d844812140d1b2e8
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 7c7df8f..82d07a3 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -2503,7 +2503,7 @@ MSVCRT_size_t MSVCRT_fread(void *ptr, MS
     /* expose feof condition in the flags
      * MFC tests file->_flag for feof, and doesn't not call feof())
      */
-    if (pread == 0)
+    if ( MSVCRT_fdesc[file->_file].wxflag & WX_ATEOF)
         file->_flag |= MSVCRT__IOEOF;
     else if (pread == -1)
     {
diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index 086c37f..bcc60fd 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -125,7 +125,7 @@ static void test_fileops( void )
     /* sizeof(buffer) > content of file */
     ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n");
     /* feof should be set now */
-    todo_wine ok(feof(file), "feof after fread failed\n");
+    ok(feof(file), "feof after fread failed\n");
     fclose (file);
 
     unlink ("fdopen.tst");
-- 
1.2.0




More information about the wine-patches mailing list