Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 04:32:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK][CRT] Add _CRT_NON_CONFORMING_SWPRINTFS support

Browse source 
This allows us to easier port wine changes, where swprintf with a size is used a lot
This commit is contained in:
Mark Jansen 2022-03-13 17:17:39 +01:00
parent 958f1addcf
commit f1132155d9
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
5 changed files with 76 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
sdk/include/crt/stdio.h
View file

@ -885,6 +885,7 @@ extern _CRTIMP int _commode;
_In_z_ _Printf_format_string_ const wchar_t *_Format,
va_list _ArgList);
#if defined __cplusplus || defined _CRT_NON_CONFORMING_SWPRINTFS
_Check_return_opt_
_CRTIMP
int
@ -901,6 +902,7 @@ extern _CRTIMP int _commode;
_Out_ wchar_t*,
const wchar_t*,
va_list);
#endif
_Check_return_opt_
_CRTIMP
@ -948,15 +950,38 @@ extern _CRTIMP int _commode;
#include <vadefs.h>
#endif
#if 0 //this is for MSVCRT80 and higher, which we don't use nor implement
#ifdef _CRT_NON_CONFORMING_SWPRINTFS
#ifndef __cplusplus
#define swprintf _swprintf
#define vswprintf _vswprintf
#define _swprintf_l __swprintf_l
#define _vswprintf_l __vswprintf_l
#endif
#endif
#ifndef _CRT_NON_CONFORMING_SWPRINTFS
_Check_return_opt_
static inline
int
__cdecl
swprintf(
_Out_writes_z_(_SizeInWords) wchar_t* _DstBuf,
_In_ size_t _SizeInWords,
_In_z_ _Printf_format_string_ const wchar_t* _Format,
...)
{
int ret;
va_list args;
va_start(args, _Format);
ret = _vsnwprintf(_DstBuf, _SizeInWords, _Format, args);
va_end(args);
return ret;
}
_Check_return_opt_
static inline
int
__cdecl
vswprintf(
_Out_writes_z_(_SizeInWords) wchar_t* _DstBuf,
_In_ size_t _SizeInWords,
_In_z_ _Printf_format_string_ const wchar_t* _Format,
va_list _ArgList)
{
return _vsnwprintf(_DstBuf, _SizeInWords, _Format, _ArgList);
}
#endif
_Check_return_

43
sdk/include/crt/wchar.h
View file

@ -1072,6 +1072,7 @@ _CRTIMP int __cdecl iswblank(wint_t _C);
_In_z_ _Printf_format_string_ const wchar_t *_Format,
va_list _ArgList);
#if defined __cplusplus || defined _CRT_NON_CONFORMING_SWPRINTFS
_CRTIMP
int
__cdecl
@ -1087,6 +1088,7 @@ _CRTIMP int __cdecl iswblank(wint_t _C);
_Out_ wchar_t*,
const wchar_t*,
va_list);
#endif
_Check_return_opt_
_CRTIMP
@ -1378,15 +1380,38 @@ _CRTIMP int __cdecl iswblank(wint_t _C);
_CRTIMP int __cdecl __swprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,...);
_CRTIMP int __cdecl __vswprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,va_list _Args);
#if 0 //this is for MSVCRT80 and higher, which we don't use nor implement
#ifdef _CRT_NON_CONFORMING_SWPRINTFS
#ifndef __cplusplus
#define swprintf _swprintf
#define vswprintf _vswprintf
#define _swprintf_l __swprintf_l
#define _vswprintf_l __vswprintf_l
#endif
#endif
#ifndef _CRT_NON_CONFORMING_SWPRINTFS
_Check_return_opt_
static inline
int
__cdecl
swprintf(
_Out_writes_z_(_SizeInWords) wchar_t* _DstBuf,
_In_ size_t _SizeInWords,
_In_z_ _Printf_format_string_ const wchar_t* _Format,
...)
{
int ret;
va_list args;
va_start(args, _Format);
ret = _vsnwprintf(_DstBuf, _SizeInWords, _Format, args);
va_end(args);
return ret;
}
_Check_return_opt_
static inline
int
__cdecl
vswprintf(
_Out_writes_z_(_SizeInWords) wchar_t* _DstBuf,
_In_ size_t _SizeInWords,
_In_z_ _Printf_format_string_ const wchar_t* _Format,
va_list _ArgList)
{
return _vsnwprintf(_DstBuf, _SizeInWords, _Format, _ArgList);
}
#endif
_Check_return_