Module: wine Branch: master Commit: 50574ccffa7bbc65e3afd0f7a6c8ccaeec064bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=50574ccffa7bbc65e3afd0f7a6...
Author: Iván Matellanes matellanesivan@gmail.com Date: Wed Oct 15 16:46:30 2014 +0200
msvcrt: Added _ftell_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 | 8 ++++++++ include/msvcrt/stdio.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2425f72..50e2420 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -848,7 +848,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9fa1ac4..f2d2f30 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1196,7 +1196,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 334921b..77a03c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -515,7 +515,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1cbb339..59fba3d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -497,7 +497,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 43f8055..49cb14d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4298,6 +4298,14 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) }
/********************************************************************* + * _ftell_nolock (MSVCRT.@) + */ +LONG CDECL MSVCRT__ftell_nolock(MSVCRT_FILE* file) +{ + return MSVCRT__ftelli64_nolock(file); +} + +/********************************************************************* * fgetpos (MSVCRT.@) */ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 90fc3f7..dbe9231 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*); +__msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*);
void __cdecl clearerr(FILE*);