From: Bartosz Kosiorek gang65@poczta.onet.pl
--- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 21 +++++++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4be6144ca7e..1cbf9b31fee 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -827,7 +827,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index aee92ec232f..92f7bb2f859 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1174,7 +1174,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6c0d560b67f..2a0fa15cc01 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1175,7 +1175,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index aa5d8ccf968..633991fcc54 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1104,7 +1104,7 @@ @ cdecl -arch=!i386 _fpclassf(float) msvcr120._fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) msvcr120._fpieee_flt @ cdecl _fpreset() msvcr120._fpreset -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) msvcr120._fprintf_l @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f3981ed3dea..695ff5857bb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -493,7 +493,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3e581b911e2..546efb0a4a7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -476,7 +476,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 43f27629a64..7c017847fcf 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -681,12 +681,12 @@ BOOL msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *handle_ptr = INVALID_HANDLE_VALUE; } wxflag_ptr++; handle_ptr++; - } + } return TRUE; }
-/* INTERNAL: Set up all file descriptors, - * as well as default streams (stdin, stderr and stdout) +/* INTERNAL: Set up all file descriptors, + * as well as default streams (stdin, stderr and stdout) */ void msvcrt_init_io(void) { @@ -1286,7 +1286,7 @@ int CDECL _dup(int od) { int fd, ret; ioinfo *info = get_ioinfo_alloc(&fd); - + if (_dup2(od, fd) == 0) ret = fd; else @@ -5581,6 +5581,19 @@ int WINAPIV fprintf_s(FILE* file, const char *format, ...) return res; }
+/********************************************************************* + * _fprintf_l (MSVCRT.@) + */ +int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) +{ + va_list valist; + int res; + va_start(valist, locale); + res = _vfprintf_l(file, format, locale, valist); + va_end(valist); + return res; +} + /********************************************************************* * fwprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8c6a3b9a910..c1b47db6940 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -460,7 +460,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -# stub _fprintf_l(ptr str ptr) +@ varargs _fprintf_l(ptr str ptr) # stub _fprintf_p(ptr str) # stub _fprintf_p_l(ptr str ptr) # stub _fprintf_s_l(ptr str ptr)