Akihiro Sagawa : msvcrt: Add support for _flushall to clear all input buffer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cf7479ca85924eb754857ea2ff8509606f10c1d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cf7479ca85924eb754857ea2ff...

Author: Akihiro Sagawa 
Date:   Mon Mar 12 21:14:07 2012 +0900

msvcrt: Add support for _flushall to clear all input buffer.

---

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

diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index b057f9e..1c56eee 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -780,7 +780,7 @@ static int msvcrt_flush_all_buffers(int mask)
  */
 int CDECL MSVCRT__flushall(void)
 {
-    return msvcrt_flush_all_buffers(MSVCRT__IOWRT);
+    return msvcrt_flush_all_buffers(MSVCRT__IOWRT | MSVCRT__IOREAD);
 }

/*********************************************************************
@@ -789,7 +789,7 @@ int CDECL MSVCRT__flushall(void)
 int CDECL MSVCRT_fflush(MSVCRT_FILE* file)
 {
     if(!file) {
-        MSVCRT__flushall();
+        msvcrt_flush_all_buffers(MSVCRT__IOWRT);
     } else if(file->_flag & MSVCRT__IOWRT) {
         int res;

diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index 6d745d9..0f94083 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -635,7 +635,7 @@ static void test_fflush( void )
   ok(ret >= 0, "unexpected ret %d\n", ret);
   memset(buf2, '?', sizeof(buf2));
   fread(buf2, 1, sizeof(buf2), tempfh);
-  todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]);
+  ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]);

fclose(tempfh);