On Thu, 23 Nov 2017, Sven Kretzschmar wrote:
I will try to add the 2 missing references in the way you hinted at in your
post.
FWIW, for the _cprintf one, the conio.h patch that I sent should be a
proper fix.
The other one requires fixing stdio_s.h, and it's a truly huge number of
functions there. I started looking at it, but don't have time to do them
all right now. Attached is my work in progress for this header, that
should cover at least the function that you mentioned so far.
That one isn't sent for review yet as it's quite incomplete. OTOH, perhaps
it's better to at least fix up some subsets of it, that happens to be
used, instead of aiming for all of them.
// Martin
From 53f8cc4ba4ec693fb0324e220b7e4b952635fb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <mar...@martin.st>
Date: Fri, 24 Nov 2017 13:58:21 +0200
Subject: [PATCH] WIP: Map some functions in stdio_s.h for ucrtbase
This is still incomplete.
---
mingw-w64-headers/crt/sec_api/stdio_s.h | 202 +++++++++++++++++++++++++++++++-
1 file changed, 196 insertions(+), 6 deletions(-)
diff --git a/mingw-w64-headers/crt/sec_api/stdio_s.h b/mingw-w64-headers/crt/sec_api/stdio_s.h
index 092f337..08f519d 100644
--- a/mingw-w64-headers/crt/sec_api/stdio_s.h
+++ b/mingw-w64-headers/crt/sec_api/stdio_s.h
@@ -26,8 +26,195 @@ extern "C" {
#ifndef _STDIO_S_DEFINED
#define _STDIO_S_DEFINED
_CRTIMP errno_t __cdecl clearerr_s(FILE *_File);
- int __cdecl fprintf_s(FILE *_File,const char *_Format,...);
+
size_t __cdecl fread_s(void *_DstBuf,size_t _DstSize,size_t _ElementSize,size_t _Count,FILE *_File);
+
+#if __MSVCRT_VERSION__ >= 0x1400
+ int __cdecl __stdio_common_vsprintf_s(unsigned __int64 _Options, char *_Str, size_t _Len, const char *_Format, _locale_t _Locale, va_list _ArgList);
+ int __cdecl __stdio_common_vsnprintf_s(unsigned __int64 _Options, char *_Str, size_t _Len, size_t _MaxCount, const char *_Format, _locale_t _Locale, va_list _ArgList);
+ int __cdecl __stdio_common_vsprintf_p(unsigned __int64 _Options, char *_Str, size_t _Len, const char *_Format, _locale_t _Locale, va_list _ArgList);
+ int __cdecl __stdio_common_vfprintf_s(unsigned __int64 _Options, FILE *_File, const char *_Format, _locale_t _Locale, va_list _ArgList);
+ int __cdecl __stdio_common_vfprintf_p(unsigned __int64 _Options, FILE *_File, const char *_Format, _locale_t _Locale, va_list _ArgList);
+
+ __mingw_ovr int __cdecl fprintf_s(FILE *_File,const char *_Format,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Format);
+ _Ret = __stdio_common_vfprintf_s(0, _File, _Format, NULL, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _fscanf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vfscanf_s(0, _File, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl printf_s(const char *_Format,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Format);
+ _Ret = __stdio_common_vfprintf_s(0, stdout, _Format, NULL, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _scanf_l(const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vfscanf(0, stdin, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _scanf_s_l(const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vfscanf_s(0, stdin, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ // TODO: Not mapped for ucrtbase yet
+ _CRTIMP int __cdecl _snprintf_c(char *_DstBuf,size_t _MaxCount,const char *_Format,...);
+ _CRTIMP int __cdecl _vsnprintf_c(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList);
+
+ __mingw_ovr int __cdecl _fscanf_l(FILE *_File,const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vfscanf(0, _File, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _sscanf_l(const char *_Src,const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vsscanf(0, _Src, (size_t)-1, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _sscanf_s_l(const char *_Src,const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vsscanf(UCRTBASE_SCANF_SECURECRT, _Src, (size_t)-1, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl sscanf_s(const char *_Src,const char *_Format,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Format);
+ _Ret = __stdio_common_vsscanf(UCRTBASE_SCANF_SECURECRT, _Src, (size_t)-1, _Format, NULL, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _snscanf_s(const char *_Src,size_t _MaxCount,const char *_Format,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Format);
+ _Ret = __stdio_common_vsscanf(UCRTBASE_SCANF_SECURECRT, _Src, _MaxCount, _Format, NULL, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _snscanf_l(const char *_Src,size_t _MaxCount,const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vsscanf(0, _Src, _MaxCount, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl _snscanf_s_l(const char *_Src,size_t _MaxCount,const char *_Format,_locale_t _Locale,...)
+ {
+ __builtin_va_list _ArgList;
+ int _Ret;
+ __builtin_va_start(_ArgList, _Locale);
+ _Ret = __stdio_common_vsscanf(UCRTBASE_SCANF_SECURECRT, _Src, _MaxCount, _Format, _Locale, _ArgList);
+ __builtin_va_end(_ArgList);
+ return _Ret;
+ }
+ __mingw_ovr int __cdecl vfprintf_s(FILE *_File,const char *_Format,va_list _ArgList)
+ {
+ return __stdio_common_vfprintf_s(0, _File, _Format, NULL, _ArgList);
+ }
+ __mingw_ovr int __cdecl vprintf_s(const char *_Format,va_list _ArgList)
+ {
+ return __stdio_common_vfprintf_s(0, stdout, _Format, NULL, _ArgList);
+ }
+
+ __mingw_ovr int __cdecl vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList)
+ {
+ return __stdio_common_vsnprintf_s(0, _DstBuf, _DstSize, _MaxCount, _Format, NULL, _ArgList);
+ }
+
+ __mingw_ovr int __cdecl _vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList)
+ {
+ return __stdio_common_vsnprintf_s(0, _DstBuf, _DstSize, _MaxCount, _Format, NULL, _ArgList);
+ }
+
+ __mingw_ovr int __cdecl vsprintf_s(char *_DstBuf,size_t _Size,const char *_Format,va_list _ArgList)
+ {
+ return __stdio_common_vsprintf_s(0, _DstBuf, _Size, _Format, NULL, _ArgList);
+ }
+
+ // TODO: Continue from here
+ _SECIMP int __cdecl sprintf_s(char *_DstBuf,size_t _DstSize,const char *_Format,...);
+
+ _CRTIMP int __cdecl _snprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,...);
+
+ _CRTIMP int __cdecl _fprintf_p(FILE *_File,const char *_Format,...);
+ _CRTIMP int __cdecl _printf_p(const char *_Format,...);
+ _CRTIMP int __cdecl _sprintf_p(char *_Dst,size_t _MaxCount,const char *_Format,...);
+ _CRTIMP int __cdecl _vfprintf_p(FILE *_File,const char *_Format,va_list _ArgList);
+ _CRTIMP int __cdecl _vprintf_p(const char *_Format,va_list _ArgList);
+ _CRTIMP int __cdecl _vsprintf_p(char *_Dst,size_t _MaxCount,const char *_Format,va_list _ArgList);
+ _CRTIMP int __cdecl _scprintf_p(const char *_Format,...);
+ _SECIMP int __cdecl _vscprintf_p(const char *_Format,va_list _ArgList);
+ _CRTIMP int __cdecl _printf_l(const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _printf_p_l(const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vprintf_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _vprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _fprintf_l(FILE *_File,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _fprintf_p_l(FILE *_File,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vfprintf_l(FILE *_File,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _vfprintf_p_l(FILE *_File,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _sprintf_l(char *_DstBuf,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _sprintf_p_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vsprintf_l(char *_DstBuf,const char *_Format,_locale_t,va_list _ArgList);
+ _CRTIMP int __cdecl _vsprintf_p_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _scprintf_l(const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _scprintf_p_l(const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vscprintf_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _vscprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _printf_s_l(const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vprintf_s_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _fprintf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vfprintf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _sprintf_s_l(char *_DstBuf,size_t _DstSize,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vsprintf_s_l(char *_DstBuf,size_t _DstSize,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _snprintf_s_l(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vsnprintf_s_l(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _snprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _snprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...);
+ _CRTIMP int __cdecl _vsnprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList);
+ _CRTIMP int __cdecl _vsnprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *,_locale_t _Locale,va_list _ArgList);
+#else
+ int __cdecl fprintf_s(FILE *_File,const char *_Format,...);
_CRTIMP int __cdecl _fscanf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...);
int __cdecl printf_s(const char *_Format,...);
_CRTIMP int __cdecl _scanf_l(const char *_Format,_locale_t _Locale,...);
@@ -46,19 +233,14 @@ extern "C" {
int __cdecl vprintf_s(const char *_Format,va_list _ArgList);
int __cdecl vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList);
- __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList)
_CRTIMP int __cdecl _vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList);
- __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,_vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList)
_SECIMP int __cdecl vsprintf_s(char *_DstBuf,size_t _Size,const char *_Format,va_list _ArgList);
- __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vsprintf_s, char, _DstBuf, const char*, _Format, va_list, _ArgList)
_SECIMP int __cdecl sprintf_s(char *_DstBuf,size_t _DstSize,const char *_Format,...);
- __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int,sprintf_s,vsprintf_s,char,_DstBuf,const char*,_Format)
_CRTIMP int __cdecl _snprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,...);
- __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(int,_snprintf_s,_vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format)
_CRTIMP int __cdecl _fprintf_p(FILE *_File,const char *_Format,...);
_CRTIMP int __cdecl _printf_p(const char *_Format,...);
@@ -96,6 +278,14 @@ extern "C" {
_CRTIMP int __cdecl _snprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...);
_CRTIMP int __cdecl _vsnprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList);
_CRTIMP int __cdecl _vsnprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *,_locale_t _Locale,va_list _ArgList);
+#endif
+
+ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList)
+ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_3(int,_vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format,va_list,_ArgList)
+ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2(int, vsprintf_s, char, _DstBuf, const char*, _Format, va_list, _ArgList)
+ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1_ARGLIST(int,sprintf_s,vsprintf_s,char,_DstBuf,const char*,_Format)
+ __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_2_ARGLIST(int,_snprintf_s,_vsnprintf_s,char,_DstBuf,size_t,_MaxCount,const char*,_Format)
+
_CRTIMP errno_t __cdecl fopen_s(FILE **_File,const char *_Filename,const char *_Mode);
_CRTIMP errno_t __cdecl freopen_s(FILE** _File, const char *_Filename, const char *_Mode, FILE *_Stream);
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
