marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Implement fprintf_s and fwprintf_s.

oldstable
Eryk Wieliczko 2010-11-24 21:25:49 +01:00 committed by Alexandre Julliard
parent 133a38fcfb
commit 91bc6c5201
7 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcr100/msvcr100.spec
View File

@ -1459,7 +1459,7 @@
@ cdecl fopen(str str) msvcrt.fopen
@ cdecl fopen_s(ptr str str) msvcrt.fopen_s
@ varargs fprintf(ptr str) msvcrt.fprintf
@ stub fprintf_s
@ varargs fprintf_s(ptr str) msvcrt.fprintf_s
@ cdecl fputc(long ptr) msvcrt.fputc
@ cdecl fputs(str ptr) msvcrt.fputs
@ cdecl fputwc(long ptr) msvcrt.fputwc
@ -1476,7 +1476,7 @@
@ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
@ cdecl ftell(ptr) msvcrt.ftell
@ varargs fwprintf(ptr wstr) msvcrt.fwprintf
@ stub fwprintf_s
@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s
@ cdecl fwrite(ptr long long ptr) msvcrt.fwrite
@ varargs fwscanf(ptr wstr) msvcrt.fwscanf
@ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s

4
dlls/msvcr80/msvcr80.spec
View File

@ -1315,7 +1315,7 @@
@ cdecl fopen(str str) msvcrt.fopen
@ cdecl fopen_s(ptr str str) msvcrt.fopen_s
@ varargs fprintf(ptr str) msvcrt.fprintf
@ stub fprintf_s
@ varargs fprintf_s(ptr str) msvcrt.fprintf_s
@ cdecl fputc(long ptr) msvcrt.fputc
@ cdecl fputs(str ptr) msvcrt.fputs
@ cdecl fputwc(long ptr) msvcrt.fputwc
@ -1332,7 +1332,7 @@
@ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
@ cdecl ftell(ptr) msvcrt.ftell
@ varargs fwprintf(ptr wstr) msvcrt.fwprintf
@ stub fwprintf_s
@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s
@ cdecl fwrite(ptr long long ptr) msvcrt.fwrite
@ varargs fwscanf(ptr wstr) msvcrt.fwscanf
@ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s

4
dlls/msvcr90/msvcr90.spec
View File

@ -1299,7 +1299,7 @@
@ cdecl fopen(str str) msvcrt.fopen
@ cdecl fopen_s(ptr str str) msvcrt.fopen_s
@ varargs fprintf(ptr str) msvcrt.fprintf
@ stub fprintf_s
@ varargs fprintf_s(ptr str) msvcrt.fprintf_s
@ cdecl fputc(long ptr) msvcrt.fputc
@ cdecl fputs(str ptr) msvcrt.fputs
@ cdecl fputwc(long ptr) msvcrt.fputwc
@ -1316,7 +1316,7 @@
@ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
@ cdecl ftell(ptr) msvcrt.ftell
@ varargs fwprintf(ptr wstr) msvcrt.fwprintf
@ stub fwprintf_s
@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s
@ cdecl fwrite(ptr long long ptr) msvcrt.fwrite
@ varargs fwscanf(ptr wstr) msvcrt.fwscanf
@ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s

26
dlls/msvcrt/file.c
View File

@ -3499,6 +3499,19 @@ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...)
return res;
}
/*********************************************************************
* fprintf_s (MSVCRT.@)
*/
int CDECL MSVCRT_fprintf_s(MSVCRT_FILE* file, const char *format, ...)
{
__ms_va_list valist;
int res;
__ms_va_start(valist, format);
res = MSVCRT_vfprintf_s(file, format, valist);
__ms_va_end(valist);
return res;
}
/*********************************************************************
* fwprintf (MSVCRT.@)
*/
@ -3512,6 +3525,19 @@ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
return res;
}
/*********************************************************************
* fwprintf_s (MSVCRT.@)
*/
int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...)
{
__ms_va_list valist;
int res;
__ms_va_start(valist, format);
res = MSVCRT_vfwprintf_s(file, format, valist);
__ms_va_end(valist);
return res;
}
/*********************************************************************
* printf (MSVCRT.@)
*/

4
dlls/msvcrt/msvcrt.spec
View File

@ -1250,7 +1250,7 @@
@ cdecl fopen(str str) MSVCRT_fopen
@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
@ varargs fprintf(ptr str) MSVCRT_fprintf
# stub fprintf_s
@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
@ cdecl fputc(long ptr) MSVCRT_fputc
@ cdecl fputs(str ptr) MSVCRT_fputs
@ cdecl fputwc(long ptr) MSVCRT_fputwc
@ -1267,7 +1267,7 @@
@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
@ cdecl ftell(ptr) MSVCRT_ftell
@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
# stub fwprintf_s
@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s

2
include/msvcrt/stdio.h
View File

@ -131,6 +131,7 @@ char* __cdecl fgets(char*,int,FILE*);
FILE* __cdecl fopen(const char*,const char*);
errno_t __cdecl fopen_s(FILE**,const char*,const char*);
int __cdecl fprintf(FILE*,const char*,...);
int __cdecl fprintf_s(FILE*,const char*,...);
int __cdecl fputc(int,FILE*);
int __cdecl fputs(const char*,FILE*);
size_t __cdecl fread(void*,size_t,size_t,FILE*);
@ -200,6 +201,7 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*);
wint_t __cdecl fputwc(wint_t,FILE*);
int __cdecl fputws(const wchar_t*,FILE*);
int __cdecl fwprintf(FILE*,const wchar_t*,...);
int __cdecl fwprintf_s(FILE*,const wchar_t*,...);
int __cdecl fputws(const wchar_t*,FILE*);
int __cdecl fwscanf(FILE*,const wchar_t*,...);
int __cdecl fwscanf_s(FILE*,const wchar_t*,...);

1
include/msvcrt/wchar.h
View File

@ -295,6 +295,7 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*);
wint_t __cdecl fputwc(wint_t,FILE*);
int __cdecl fputws(const wchar_t*,FILE*);
int __cdecl fwprintf(FILE*,const wchar_t*,...);
int __cdecl fwprintf_s(FILE*,const wchar_t*,...);
int __cdecl fputws(const wchar_t*,FILE*);
int __cdecl fwscanf(FILE*,const wchar_t*,...);
int __cdecl fwscanf_s(FILE*,const wchar_t*,...);