[3/3] msvcrt: Added _fflush_nolock() implementation

[Iván Matellanes]

---
 dlls/msvcr100/msvcr100.spec |  2 +-
 dlls/msvcr110/msvcr110.spec |  2 +-
 dlls/msvcr80/msvcr80.spec   |  2 +-
 dlls/msvcr90/msvcr90.spec   |  2 +-
 dlls/msvcrt/file.c          | 24 +++++++++++++++++++-----
 dlls/msvcrt/msvcrt.h        |  1 +
 include/msvcrt/stdio.h      |  1 +
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 406e9e7..76c43a7 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -799,7 +799,7 @@
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
 @ cdecl _fdopen(long str) MSVCRT__fdopen
-@ stub _fflush_nolock
+@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
 @ cdecl _fgetchar() MSVCRT__fgetchar
 @ stub _fgetwc_nolock
 @ cdecl _fgetwchar() MSVCRT__fgetwchar
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 0c62d69..92d505d 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1147,7 +1147,7 @@
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
 @ cdecl _fdopen(long str) MSVCRT__fdopen
-@ stub _fflush_nolock
+@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
 @ cdecl _fgetchar() MSVCRT__fgetchar
 @ stub _fgetwc_nolock
 @ cdecl _fgetwchar() MSVCRT__fgetwchar
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 7123a06..6f920fe 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -466,7 +466,7 @@
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
 @ cdecl _fdopen(long str) MSVCRT__fdopen
-@ stub _fflush_nolock
+@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
 @ cdecl _fgetchar() MSVCRT__fgetchar
 @ stub _fgetwc_nolock
 @ cdecl _fgetwchar() MSVCRT__fgetwchar
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 41ce183..7c0ea47 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -448,7 +448,7 @@
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
 @ cdecl _fdopen(long str) MSVCRT__fdopen
-@ stub _fflush_nolock
+@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
 @ cdecl _fgetchar() MSVCRT__fgetchar
 @ stub _fgetwc_nolock
 @ cdecl _fgetwchar() MSVCRT__fgetwchar
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 9a0effd..97a9edb 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -921,22 +921,36 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file)
 {
     if(!file) {
         msvcrt_flush_all_buffers(MSVCRT__IOWRT);
+    } else if(file->_flag & MSVCRT__IOWRT || file->_flag & MSVCRT__IOREAD) {
+        int ret;
+
+        MSVCRT__lock_file(file);
+        ret = MSVCRT__fflush_nolock(file);
+        MSVCRT__unlock_file(file);
+
+        return ret;
+    }
+    return 0;
+}
+
+/*********************************************************************
+ *		_fflush_nolock (MSVCRT.@)
+ */
+int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file)
+{
+    if(!file) {
+        msvcrt_flush_all_buffers(MSVCRT__IOWRT);
     } else if(file->_flag & MSVCRT__IOWRT) {
         int res;
 
-        MSVCRT__lock_file(file);
         res = msvcrt_flush_buffer(file);
-
         if(!res && (file->_flag & MSVCRT__IOCOMMIT))
             res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0;
-        MSVCRT__unlock_file(file);
 
         return res;
     } else if(file->_flag & MSVCRT__IOREAD) {
-        MSVCRT__lock_file(file);
         file->_cnt = 0;
         file->_ptr = file->_base;
-        MSVCRT__unlock_file(file);
 
         return 0;
     }
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index b5cf8b7..619f843 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -929,6 +929,7 @@ MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSV
 MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*);
 int __cdecl      MSVCRT_fclose(MSVCRT_FILE*);
 int __cdecl      MSVCRT__fclose_nolock(MSVCRT_FILE*);
+int __cdecl      MSVCRT__fflush_nolock(MSVCRT_FILE*);
 void __cdecl     MSVCRT_terminate(void);
 MSVCRT_FILE* __cdecl MSVCRT__iob_func(void);
 MSVCRT_clock_t __cdecl MSVCRT_clock(void);
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index 0170d2e..c701ac5 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -130,6 +130,7 @@ int    __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list);
 size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*);
 size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*);
 int    __cdecl _fclose_nolock(FILE*);
+int    __cdecl _fflush_nolock(FILE*);
 
 void   __cdecl clearerr(FILE*);
 int    __cdecl fclose(FILE*);
-- 
1.9.1