wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Zebediah Figura : winegstreamer: Decommit the source allocator when cleaning up the stream.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 540f2983a97e033acc8ba3c72ca38a1ca0ed67ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=540f2983a97e033acc8ba3c7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 19 20:44:52 2020 -0600 winegstreamer: Decommit the source allocator when cleaning up the stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1337cd0a81..488c9bd8a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1455,6 +1455,7 @@ static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); GstStateChangeReturn ret; + unsigned int i; if (!filter->container) return S_OK; @@ -1468,6 +1469,12 @@ static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) gst_element_get_state(filter->container, NULL, NULL, GST_CLOCK_TIME_NONE); filter->ignore_flush = FALSE; + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IMemAllocator_Decommit(filter->sources[i]->pin.pAllocator); + } + return S_OK; }

1 0

Jacek Caban : include: Include sys/stat.h from wchar.h.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 6187ee134607568a02f95c8dd34cdba658b419a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6187ee134607568a02f95c8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:50:01 2020 +0100 include: Include sys/stat.h from wchar.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/sys/stat.h | 4 -- include/msvcrt/wchar.h | 136 +--------------------------------------------- 2 files changed, 1 insertion(+), 139 deletions(-) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index f305984798..15cf823739 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -167,14 +167,10 @@ int __cdecl _stati64(const char*,struct _stati64*); int __cdecl _fstat64(int,struct _stat64*); int __cdecl _stat64(const char*,struct _stat64*); int __cdecl _umask(int); - -#ifndef _WSTAT_DEFINED -#define _WSTAT_DEFINED int __cdecl _wstat(const wchar_t*,struct _stat*); int __cdecl _wstat32(const wchar_t*, struct _stat32*); int __cdecl _wstati64(const wchar_t*,struct _stati64*); int __cdecl _wstat64(const wchar_t*,struct _stat64*); -#endif /* _WSTAT_DEFINED */ #ifdef __cplusplus } diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index b93fec9de7..0b7be92174 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -12,6 +12,7 @@ #include <corecrt_wio.h> #include <corecrt_wtime.h> #include <string.h> +#include <sys/stat.h> #include <pshpack8.h> @@ -24,135 +25,8 @@ extern "C" { #define WCHAR_MAX 0xffffU #endif -#ifndef DECLSPEC_ALIGN -# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) -# define DECLSPEC_ALIGN(x) __declspec(align(x)) -# elif defined(__GNUC__) -# define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) -# else -# define DECLSPEC_ALIGN(x) -# endif -#endif - typedef int mbstate_t; -#ifndef _DEV_T_DEFINED -typedef unsigned int _dev_t; -#define _DEV_T_DEFINED -#endif - -#ifndef _INO_T_DEFINED -typedef unsigned short _ino_t; -#define _INO_T_DEFINED -#endif - -#ifndef _OFF_T_DEFINED -typedef int _off_t; -#define _OFF_T_DEFINED -#endif - -#ifndef _STAT_DEFINED -#define _STAT_DEFINED - -struct _stat { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct stat { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct _stat32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct _stat32i64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct _stat64i32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - -struct _stati64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct _stat64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; -#endif /* _STAT_DEFINED */ - /* ASCII char classification table - binary compatible */ #define _UPPER 0x0001 /* C1_UPPER */ #define _LOWER 0x0002 /* C1_LOWER */ @@ -221,14 +95,6 @@ int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wcha int __cdecl _wsystem(const wchar_t*); #endif /* _WPROCESS_DEFINED */ -#ifndef _WSTAT_DEFINED -#define _WSTAT_DEFINED -int __cdecl _wstat(const wchar_t*,struct _stat*); -int __cdecl _wstat32(const wchar_t*, struct _stat32*); -int __cdecl _wstati64(const wchar_t*,struct _stati64*); -int __cdecl _wstat64(const wchar_t*,struct _stat64*); -#endif /* _WSTAT_DEFINED */ - #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED wchar_t* __cdecl _itow(int,wchar_t*,int);

1 0

Jacek Caban : include: Add corecrt_wtime.h file.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f0779722c33779d937b22773003b4bf7d64735ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0779722c33779d937b22773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:49:42 2020 +0100 include: Add corecrt_wtime.h file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wtime.h | 48 ++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/time.h | 39 +--------------------------------- include/msvcrt/wchar.h | 38 +-------------------------------- 4 files changed, 51 insertions(+), 75 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 506e5fc96a..fbfbf72be0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -427,6 +427,7 @@ SOURCES = \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ + msvcrt/corecrt_wtime.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ msvcrt/ctype.h \ diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h new file mode 100644 index 0000000000..3422b2d349 --- /dev/null +++ b/include/msvcrt/corecrt_wtime.h @@ -0,0 +1,48 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WTIME_DEFINED +#define _WTIME_DEFINED + +#include <corecrt.h> + +struct tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + +#ifdef _USE_32BIT_TIME_T +#define _wctime32 _wctime +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +wchar_t* __cdecl _wasctime(const struct tm*); +size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +wchar_t* __cdecl _wctime32(const __time32_t*); +wchar_t* __cdecl _wctime64(const __time64_t*); +wchar_t* __cdecl _wstrdate(wchar_t*); +errno_t __cdecl _wstrdate_s(wchar_t*,size_t); +wchar_t* __cdecl _wstrtime(wchar_t*); +errno_t __cdecl _wstrtime_s(wchar_t*,size_t); + +#ifndef _USE_32BIT_TIME_T +static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _WTIME_DEFINED */ diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 9ed27f5f9e..61df364d21 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -20,7 +20,7 @@ #ifndef __WINE_TIME_H #define __WINE_TIME_H -#include <corecrt.h> +#include <corecrt_wtime.h> #include <pshpack8.h> @@ -33,21 +33,6 @@ typedef __msvcrt_long clock_t; #define CLOCKS_PER_SEC 1000 #endif -#ifndef _TM_DEFINED -#define _TM_DEFINED -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; -#endif /* _TM_DEFINED */ - #ifdef __cplusplus extern "C" { #endif @@ -113,28 +98,6 @@ static inline time_t mktime(struct tm *tm) { return _mktime64(tm); } static inline time_t time(time_t *t) { return _time64(t); } #endif -#ifndef _WTIME_DEFINED -#define _WTIME_DEFINED - -#ifdef _USE_32BIT_TIME_T -#define _wctime32 _wctime -#endif - -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); - -#ifndef _USE_32BIT_TIME_T -static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } -#endif - -#endif /* _WTIME_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index d5ae3561d0..b93fec9de7 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include <corecrt_wstdio.h> #include <corecrt_wio.h> +#include <corecrt_wtime.h> #include <string.h> #include <pshpack8.h> @@ -50,21 +51,6 @@ typedef int _off_t; #define _OFF_T_DEFINED #endif -#ifndef _TM_DEFINED -#define _TM_DEFINED -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; -#endif /* _TM_DEFINED */ - #ifndef _STAT_DEFINED #define _STAT_DEFINED @@ -326,28 +312,6 @@ wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); #endif /* _WSTRING_DEFINED */ -#ifndef _WTIME_DEFINED -#define _WTIME_DEFINED - -#ifdef _USE_32BIT_TIME_T -#define _wctime32 _wctime -#endif - -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); - -#ifndef _USE_32BIT_TIME_T -static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } -#endif - -#endif /* _WTIME_DEFINED */ - wchar_t __cdecl btowc(int); size_t __cdecl mbrlen(const char *,size_t,mbstate_t*); size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);

1 0

Jacek Caban : stdio.h: Add ucrt vfprintf_s declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 62d43ed4180bca17035c06a9b0efd9b8a52278d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d43ed4180bca17035c06a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:35 2020 +0100 stdio.h: Add ucrt vfprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a31eada276..33d33aa7b4 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -154,7 +154,6 @@ int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); @@ -163,6 +162,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vfprintf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vfprintf_s(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); @@ -219,12 +219,18 @@ static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); } +static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); +_ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt vfprintf declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 567b9ac093c7b741e04ae136c6a31e09732c2bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=567b9ac093c7b741e04ae136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:24 2020 +0100 stdio.h: Add ucrt vfprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9f3b43b570..a31eada276 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -154,7 +154,6 @@ int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); @@ -163,6 +162,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT +_ACRTIMP int __cdecl __stdio_common_vfprintf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); @@ -214,11 +214,17 @@ static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *f return ret < 0 ? -1 : ret; } +static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt _vsprintf_p_l declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: add7409c0a9a3c6bf8bcad90a09e846d2c4e9559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=add7409c0a9a3c6bf8bcad90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:13 2020 +0100 stdio.h: Add ucrt _vsprintf_p_l declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 36c52a7388..9f3b43b570 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -88,7 +88,6 @@ int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); -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 _fread_nolock_s(void*,size_t,size_t,size_t,FILE*); @@ -165,6 +164,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); @@ -208,10 +208,17 @@ static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_l return ret < 0 ? -1 : ret; } +static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); +_ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt vsprintf_s declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 84778f154a9efaa4398492c9ea4a4ce1616dbb26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84778f154a9efaa4398492c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:05 2020 +0100 stdio.h: Add ucrt vsprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 5fe472ef3c..36c52a7388 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -159,13 +159,13 @@ int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); -int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) @@ -202,11 +202,18 @@ static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_lis return ret < 0 ? -1 : ret; } +static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); +_ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }

1 0

Jacek Caban : stdio.h: Add ucrt vsprintf declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: a68c92d45a61427698e1b901dac3c9e97c5de495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68c92d45a61427698e1b901… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:55 2020 +0100 stdio.h: Add ucrt vsprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8eef90bbf6..5fe472ef3c 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -159,7 +159,6 @@ int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); -int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); @@ -196,10 +195,18 @@ static inline int __cdecl _vscprintf(const char *format, __ms_va_list args) return ret < 0 ? -1 : ret; } +static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, + buffer, -1, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); +_ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }

1 0

Jacek Caban : stdio.h: Add ucrt _vscprintf declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: b8681acd46bf4e8757b78c28f4a89291ae61ba81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8681acd46bf4e8757b78c28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:48 2020 +0100 stdio.h: Add ucrt _vscprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9a7e4b69eb..8eef90bbf6 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -88,7 +88,6 @@ int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); -int __cdecl _vscprintf(const char*,__ms_va_list); 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*); @@ -190,8 +189,16 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, return ret < 0 ? -1 : ret; } +static inline int __cdecl _vscprintf(const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ +_ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt _vsnprintf_s declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: a3f973c4345053e45c734dab1a60631d8f30907d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f973c4345053e45c734dab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:40 2020 +0100 stdio.h: Add ucrt _vsnprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6db7ebe50b..9a7e4b69eb 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -89,7 +89,6 @@ char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); -int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); 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*); @@ -169,6 +168,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { @@ -184,8 +184,16 @@ static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *form return ret < 0 ? -1 : ret; } +static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ +_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); + int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020