msvcrt: Added _fclose_nolock() implementation.

Iván Matellanes matellanesivan at gmail.com
Sat Oct 4 11:53:21 CDT 2014


Added _fclose_nolock() implementation.

---
 dlls/msvcr100/msvcr100.spec |  2 +-
 dlls/msvcr110/msvcr110.spec |  2 +-
 dlls/msvcr80/msvcr80.spec   |  2 +-
 dlls/msvcr90/msvcr90.spec   |  2 +-
 dlls/msvcrt/file.c          | 23 +++++++++++++++++++++++
 include/msvcrt/stdio.h      |  1 +
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 84ddcc9..2796576 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -794,7 +794,7 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long) MSVCRT__exit
 @ cdecl _expand(ptr long)
-@ stub _fclose_nolock
+@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
 @ cdecl _fcloseall() MSVCRT__fcloseall
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 36c4137..ae6c356 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1142,7 +1142,7 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long) MSVCRT__exit
 @ cdecl _expand(ptr long)
-@ stub _fclose_nolock
+@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
 @ cdecl _fcloseall() MSVCRT__fcloseall
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 1745f64..fc38453 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -461,7 +461,7 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long) MSVCRT__exit
 @ cdecl _expand(ptr long)
-@ stub _fclose_nolock
+@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
 @ cdecl _fcloseall() MSVCRT__fcloseall
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index ba3757a..4267c2c 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -443,7 +443,7 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long) MSVCRT__exit
 @ cdecl _expand(ptr long)
-@ stub _fclose_nolock
+@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
 @ cdecl _fcloseall() MSVCRT__fcloseall
 @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
 @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 7ce8b59..37d11bc 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -3394,6 +3394,29 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file)
 }
 
 /*********************************************************************
+ *		_fclose_nolock (MSVCRT.@)
+ */
+int CDECL MSVCRT__fclose_nolock(MSVCRT_FILE* file)
+{
+  int r, flag;
+
+  flag = file->_flag;
+  MSVCRT_free(file->_tmpfname);
+  file->_tmpfname = NULL;
+  /* flush stdio buffers */
+  if(file->_flag & MSVCRT__IOWRT)
+      MSVCRT_fflush(file);
+  if(file->_flag & MSVCRT__IOMYBUF)
+      MSVCRT_free(file->_base);
+
+  r=MSVCRT__close(file->_file);
+
+  file->_flag = 0;
+
+  return ((r == -1) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0);
+}
+
+/*********************************************************************
  *		feof (MSVCRT.@)
  */
 int CDECL MSVCRT_feof(MSVCRT_FILE* file)
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index 737003d..184dd2b 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -129,6 +129,7 @@ int    __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list);
 
 void   __cdecl clearerr(FILE*);
 int    __cdecl fclose(FILE*);
+int    __cdecl _fclose_nolock(FILE*);
 int    __cdecl feof(FILE*);
 int    __cdecl ferror(FILE*);
 int    __cdecl fflush(FILE*);
-- 
1.9.1



More information about the wine-patches mailing list