[1/4] msvcrt: Added _fputc_nolock implementation

[Iván Matellanes]

---
 dlls/msvcr100/msvcr100.spec |  1 +
 dlls/msvcr110/msvcr110.spec |  1 +
 dlls/msvcr120/msvcr120.spec |  1 +
 dlls/msvcr80/msvcr80.spec   |  1 +
 dlls/msvcr90/msvcr90.spec   |  1 +
 dlls/msvcrt/file.c          | 18 ++++++++++++++----
 dlls/msvcrt/msvcrt.h        |  1 +
 include/msvcrt/stdio.h      |  1 +
 8 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 80d5bc9..9ad987d 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -830,6 +830,7 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
+@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
 @ cdecl _fputchar(long) MSVCRT__fputchar
 @ stub _fputwc_nolock
 @ cdecl _fputwchar(long) MSVCRT__fputwchar
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 283f5fd..a17d0d0 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1178,6 +1178,7 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
+@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
 @ cdecl _fputchar(long) MSVCRT__fputchar
 @ stub _fputwc_nolock
 @ cdecl _fputwchar(long) MSVCRT__fputwchar
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 46a5268..88753eb 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1176,6 +1176,7 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
+@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
 @ cdecl _fputchar(long) MSVCRT__fputchar
 @ stub _fputwc_nolock
 @ cdecl _fputwchar(long) MSVCRT__fputwchar
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index a48e42b..ee50c4f 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -497,6 +497,7 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
+@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
 @ cdecl _fputchar(long) MSVCRT__fputchar
 @ stub _fputwc_nolock
 @ cdecl _fputwchar(long) MSVCRT__fputwchar
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index e9abf00..acce962 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -479,6 +479,7 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
+@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
 @ cdecl _fputchar(long) MSVCRT__fputchar
 @ stub _fputwc_nolock
 @ cdecl _fputwchar(long) MSVCRT__fputwchar
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index fefab94..bf00fbc 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -3980,25 +3980,35 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename,
  */
 int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file)
 {
+    int ret;
+
+    MSVCRT__lock_file(file);
+    ret = MSVCRT__fputc_nolock(c, file);
+    MSVCRT__unlock_file(file);
+
+    return ret;
+}
+
+/*********************************************************************
+ *		_fputc_nolock (MSVCRT.@)
+ */
+int CDECL MSVCRT__fputc_nolock(int c, MSVCRT_FILE* file)
+{
   int res;
 
-  MSVCRT__lock_file(file);
   if(file->_cnt>0) {
     *file->_ptr++=c;
     file->_cnt--;
     if (c == '\n')
     {
       res = msvcrt_flush_buffer(file);
-      MSVCRT__unlock_file(file);
       return res ? res : c;
     }
     else {
-      MSVCRT__unlock_file(file);
       return c & 0xff;
     }
   } else {
     res = MSVCRT__flsbuf(c, file);
-    MSVCRT__unlock_file(file);
     return res;
   }
 }
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 256a90c..289c5bc 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -917,6 +917,7 @@ void __cdecl     MSVCRT__lock_file(MSVCRT_FILE*);
 void __cdecl     MSVCRT__unlock_file(MSVCRT_FILE*);
 int __cdecl      MSVCRT_fgetc(MSVCRT_FILE*);
 int __cdecl      MSVCRT__fgetc_nolock(MSVCRT_FILE*);
+int __cdecl      MSVCRT__fputc_nolock(int,MSVCRT_FILE*);
 int __cdecl      MSVCRT_ungetc(int,MSVCRT_FILE*);
 MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*);
 MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*);
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index 768b3a0..71e642a 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -132,6 +132,7 @@ size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*);
 int    __cdecl _fclose_nolock(FILE*);
 int    __cdecl _fflush_nolock(FILE*);
 int    __cdecl _fgetc_nolock(FILE*);
+int    __cdecl _fputc_nolock(int,FILE*);
 int    __cdecl _fseek_nolock(FILE*,__msvcrt_long,int);
 int    __cdecl _fseeki64_nolock(FILE*,__int64,int);
 __msvcrt_long __cdecl _ftell_nolock(FILE*);
-- 
1.9.1