msvcrt: Correctly set EOF flag in fread().

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.

msvcrt: Correctly set EOF flag in fread().
72017cc9 · Peter Beutner · Alexandre Julliard · b786ea58 · 72017cc9 · 72017cc9
Commit 72017cc9 authored Feb 17, 2006 by Peter Beutner Committed by Alexandre Julliard Feb 17, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

file.c dlls/msvcrt/file.c +1 -1

file.c dlls/msvcrt/tests/file.c +1 -1

No files found.
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -2503,7 +2503,7 @@ MSVCRT_size_t MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, M
    /* 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)
    {

--- 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");