Skip to content

Commit

Permalink
Update 12 packages
Browse files Browse the repository at this point in the history
mingw-w64-i686-crt-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-i686-headers-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-i686-libmangle-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-i686-libwinpthread-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-i686-tools-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-i686-winpthreads-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-x86_64-crt-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-x86_64-headers-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-x86_64-libmangle-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-x86_64-libwinpthread-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-x86_64-tools-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)
mingw-w64-x86_64-winpthreads-git (12.0.0.r387.gcf5c50cce-1 -> 12.0.0.r406.gc0313ec33-1)

Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
  • Loading branch information
Git for Windows Build Agent committed Nov 28, 2024
1 parent b16106d commit e9c8e7e
Show file tree
Hide file tree
Showing 145 changed files with 559 additions and 279 deletions.
Binary file modified mingw32/bin/gendef.exe
Binary file not shown.
Binary file modified mingw32/bin/genidl.exe
Binary file not shown.
Binary file modified mingw32/bin/genpeimg.exe
Binary file not shown.
Binary file modified mingw32/bin/libwinpthread-1.dll
Binary file not shown.
Binary file modified mingw32/bin/widl.exe
Binary file not shown.
106 changes: 80 additions & 26 deletions mingw32/include/stdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -915,10 +915,10 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format,
int __cdecl __mingw_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
int __cdecl __mingw_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list);
/* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
int __cdecl __mingw_swprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ , ...);
/* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list);
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
int __cdecl __mingw_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...);
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
int __cdecl __mingw_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);

/* __attribute__((__format__ (ms_wscanf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
int __cdecl __ms_swscanf(const wchar_t * __restrict__ _Src,const wchar_t * __restrict__ _Format,...);
Expand All @@ -935,10 +935,10 @@ int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format,
int __cdecl __ms_vfwprintf(FILE * __restrict__ _File,const wchar_t * __restrict__ _Format,va_list _ArgList);
/*__attribute__((__format__ (ms_wprintf, 1, 0))) */ __MINGW_ATTRIB_NONNULL(1)
int __cdecl __ms_vwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);
/* __attribute__((__format__ (ms_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
int __cdecl __ms_swprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ , ...);
/* __attribute__((__format__ (ms_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
int __cdecl __ms_vswprintf(wchar_t * __restrict__ , const wchar_t * __restrict__ ,va_list);
/* __attribute__((__format__ (ms_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
int __cdecl __ms_swprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , ...);
/* __attribute__((__format__ (ms_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
int __cdecl __ms_vswprintf(wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ ,va_list);

#ifdef _UCRT
int __cdecl __stdio_common_vswprintf(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, _locale_t locale, va_list valist);
Expand Down Expand Up @@ -996,6 +996,32 @@ __MINGW_ASM_CALL(__mingw_vfwprintf);
int vwprintf (const wchar_t *__format, __builtin_va_list __local_argv)
__MINGW_ASM_CALL(__mingw_vwprintf);

/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
int swprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...)
__MINGW_ASM_CALL(__mingw_swprintf);

#if __MINGW_FORTIFY_VA_ARG

__mingw_bos_extern_ovr
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
int swprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, ...)
{
__mingw_bos_ptr_chk_warn(__stream, __n * sizeof(wchar_t), 1);
return __mingw_swprintf( __stream, __n, __format, __builtin_va_arg_pack() );
}

#endif /* __MINGW_FORTIFY_VA_ARG */

__mingw_bos_ovr
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
int vswprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builtin_va_list __local_argv)
{
#if __MINGW_FORTIFY_LEVEL > 0
__mingw_bos_ptr_chk_warn(__stream, __n * sizeof(wchar_t), 1);
#endif
return __mingw_vswprintf( __stream, __n, __format, __local_argv );
}

#ifndef __NO_ISOCEXT /* externs in libmingwex.a */

/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
Expand Down Expand Up @@ -1023,6 +1049,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
#endif
return __mingw_vsnwprintf( __stream, __n, __format, __local_argv );
}

#endif /* __NO_ISOCEXT */

#else /* !__USE_MINGW_ANSI_STDIO */
Expand Down Expand Up @@ -1170,7 +1197,45 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti

#if __USE_MINGW_ANSI_STDIO == 0
__mingw_ovr
int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...)
{
__builtin_va_list __ap;
int __ret;
/*
* __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
* without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
* executed in "standard snprintf behavior" and returns number of (wide)
* chars required to allocate. For all other cases it is executed in a way
* that returns negative value on error. But C95+ compliant swprintf() for
* case _Count == 0 returns negative value, so handle this case specially.
*/
if (_Dest == NULL && _Count == 0)
return -1;
__builtin_va_start(__ap, _Format);
__ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, __ap);
__builtin_va_end(__ap);
return __ret < 0 ? -1 : __ret;
}
__mingw_ovr
int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args)
{
int __ret;
/*
* __stdio_common_vswprintf() for case _Dest == NULL and _Count == 0 and
* without _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR option, is
* executed in "standard snprintf behavior" and returns number of (wide)
* chars required to allocate. For all other cases it is executed in a way
* that returns negative value on error. But C95+ compliant vswprintf() for
* case _Count == 0 returns negative value, so handle this case specially.
*/
if (_Dest == NULL && _Count == 0)
return -1;
__ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, _Dest, _Count, _Format, NULL, _Args);
return __ret < 0 ? -1 : __ret;
}

__mingw_ovr
int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
{
__builtin_va_list __ap;
int __ret;
Expand All @@ -1182,8 +1247,7 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
__mingw_ovr
int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
{
int __ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, s, n, format, NULL, arg);
return __ret < 0 ? -1 : __ret;
return __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, s, n, format, NULL, arg);
}
#endif

Expand Down Expand Up @@ -1222,26 +1286,16 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
#if __USE_MINGW_ANSI_STDIO == 0
int __cdecl __ms_snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...);
int __cdecl __ms_vsnwprintf (wchar_t * __restrict__ , size_t, const wchar_t * __restrict__ , va_list);
__mingw_ovr
int snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...)
{
int r;
va_list argp;
__builtin_va_start (argp, format);
r = _vsnwprintf (s, n, format, argp);
__builtin_va_end (argp);
return r;
}
__mingw_ovr
int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg)
{
return _vsnwprintf(s,n,format,arg);
}
int __cdecl snwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, ...) __MINGW_ASM_CALL(__ms_snwprintf);
int __cdecl vsnwprintf (wchar_t * __restrict__ s, size_t n, const wchar_t * __restrict__ format, va_list arg) __MINGW_ASM_CALL(__ms_vsnwprintf);
#endif

#endif /* ! __NO_ISOCEXT */
_CRTIMP int __cdecl _swprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,...);
_CRTIMP int __cdecl _vswprintf(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Format,va_list _Args);

int __cdecl swprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,...);
int __cdecl vswprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args);
#endif /* _UCRT */

#ifndef RC_INVOKED
Expand Down
11 changes: 7 additions & 4 deletions mingw32/include/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,13 @@ extern "C" {
_CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch);
size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control);
_CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr);
#if defined(_UCRT)
wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t **_Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
#else
wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim,wchar_t ** __restrict__ _Ptr) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
wchar_t *__cdecl _wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
#if defined(_CRT_NON_CONFORMING_WCSTOK) && !defined(__cplusplus)
#define wcstok _wcstok
#endif
#if !defined(_CRT_NO_INLINE_DEPRECATED_WCSTOK) && defined(__cplusplus)
extern "C++" inline wchar_t *__cdecl wcstok(wchar_t * __restrict__ _Str,const wchar_t * __restrict__ _Delim) { return _wcstok(_Str, _Delim); }
#endif
_CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
_CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
Expand Down
34 changes: 5 additions & 29 deletions mingw32/include/swprintf.inl
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,6 @@

#include <vadefs.h>

__mingw_ovr
/* __attribute__((__format__ (gnu_wprintf, 3, 0))) */ __MINGW_ATTRIB_NONNULL(3)
int vswprintf (wchar_t *__stream, size_t __count, const wchar_t *__format, __builtin_va_list __local_argv)
{
return vsnwprintf( __stream, __count, __format, __local_argv );
}

__mingw_ovr
/* __attribute__((__format__ (gnu_wprintf, 3, 4))) */ __MINGW_ATTRIB_NONNULL(3)
int swprintf (wchar_t *__stream, size_t __count, const wchar_t *__format, ...)
{
int __retval;
__builtin_va_list __local_argv;

__builtin_va_start( __local_argv, __format );
__retval = vswprintf( __stream, __count, __format, __local_argv );
__builtin_va_end( __local_argv );
return __retval;
}

#ifdef __cplusplus

extern "C++" {
Expand All @@ -37,37 +17,33 @@ __mingw_ovr
/* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
int vswprintf (wchar_t *__stream, const wchar_t *__format, __builtin_va_list __local_argv)
{
#if __USE_MINGW_ANSI_STDIO
return __mingw_vswprintf( __stream, __format, __local_argv );
#else
return _vswprintf( __stream, __format, __local_argv );
#endif
}

__mingw_ovr
/* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
int swprintf (wchar_t *__stream, const wchar_t *__format, ...)
{
#ifdef __clang__
/* clang does not support __builtin_va_arg_pack(), so forward swprintf() to vswprintf() */
int __retval;
__builtin_va_list __local_argv;

__builtin_va_start( __local_argv, __format );
__retval = vswprintf( __stream, __format, __local_argv );
__builtin_va_end( __local_argv );
return __retval;
#else
return _swprintf( __stream, __format, __builtin_va_arg_pack() );
#endif
}

}

#elif defined(_CRT_NON_CONFORMING_SWPRINTFS)

#if __USE_MINGW_ANSI_STDIO
#define swprintf __mingw_swprintf
#define vswprintf __mingw_vswprintf
#else
#define swprintf _swprintf
#define vswprintf _vswprintf
#endif

#endif /* __cplusplus */

Expand Down
40 changes: 20 additions & 20 deletions mingw32/include/tchar.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ extern "C" {
#define _tenviron _wenviron
#define __targv __wargv

#define _tprintf wprintf
#define _tprintf __ms_wprintf
#define _tprintf_l _wprintf_l
#define _tprintf_p _wprintf_p
#define _tprintf_p_l _wprintf_p_l
Expand All @@ -145,11 +145,11 @@ extern "C" {
#define _vtcprintf_l _vcwprintf_l
#define _vtcprintf_p _vcwprintf_p
#define _vtcprintf_p_l _vcwprintf_p_l
#define _ftprintf fwprintf
#define _ftprintf __ms_fwprintf
#define _ftprintf_l _fwprintf_l
#define _ftprintf_p _fwprintf_p
#define _ftprintf_p_l _fwprintf_p_l
#define _stprintf swprintf
#define _stprintf _swprintf
#define _stprintf_l __swprintf_l
#define _stprintf_p _swprintf_p
#define _stprintf_p_l _swprintf_p_l
Expand All @@ -159,15 +159,15 @@ extern "C" {
#define _sctprintf_p_l _scwprintf_p_l
#define _sntprintf _snwprintf
#define _sntprintf_l _snwprintf_l
#define _vtprintf vwprintf
#define _vtprintf __ms_vwprintf
#define _vtprintf_l _vwprintf_l
#define _vtprintf_p _vwprintf_p
#define _vtprintf_p_l _vwprintf_p_l
#define _vftprintf vfwprintf
#define _vftprintf __ms_vfwprintf
#define _vftprintf_l _vfwprintf_l
#define _vftprintf_p _vfwprintf_p
#define _vftprintf_p_l _vfwprintf_p_l
#define _vstprintf vswprintf
#define _vstprintf _vswprintf
#define _vstprintf_l _vswprintf_l
#define _vstprintf_p _vswprintf_p
#define _vstprintf_p_l _vswprintf_p_l
Expand All @@ -178,13 +178,13 @@ extern "C" {
#define _vsntprintf _vsnwprintf
#define _vsntprintf_l _vsnwprintf_l

#define _tscanf wscanf
#define _tscanf __ms_wscanf
#define _tscanf_l _wscanf_l
#define _tcscanf _cwscanf
#define _tcscanf_l _cwscanf_l
#define _ftscanf fwscanf
#define _ftscanf __ms_fwscanf
#define _ftscanf_l _fwscanf_l
#define _stscanf swscanf
#define _stscanf __ms_swscanf
#define _stscanf_l _swscanf_l
#define _sntscanf _snwscanf
#define _sntscanf_l _snwscanf_l
Expand Down Expand Up @@ -268,7 +268,7 @@ extern "C" {
#define _tcsrchr wcsrchr
#define _tcsspn wcsspn
#define _tcsstr wcsstr
#define _tcstok wcstok
#define _tcstok _wcstok
#define _tcstok_l _wcstok_l
#define _tcserror _wcserror
#define __tcserror __wcserror
Expand Down Expand Up @@ -477,7 +477,7 @@ extern "C" {
#define _wcsspnp(_cpc1,_cpc2) (!_cpc1 ? NULL : ((*((_cpc1)+wcsspn(_cpc1,_cpc2))) ? ((_cpc1)+wcsspn(_cpc1,_cpc2)) : NULL))
#define _wcsncpy_l(_Destination,_Source,_Count,_Locale) (wcsncpy(_Destination,_Source,_Count))
#define _wcsncat_l(_Destination,_Source,_Count,_Locale) (wcsncat(_Destination,_Source,_Count))
#define _wcstok_l(_String,_Delimiters,_Locale) (wcstok(_String,_Delimiters))
#define _wcstok_l(_String,_Delimiters,_Locale) (_wcstok(_String,_Delimiters))
#define _wcsnset_l(_Destination,_Value,_Count,_Locale) (_wcsnset(_Destination,_Value,_Count))
#define _wcsset_l(_Destination,_Value,_Locale) (_wcsset(_Destination,_Value))

Expand Down Expand Up @@ -520,7 +520,7 @@ extern "C" {
#endif
#define __targv __argv

#define _tprintf printf
#define _tprintf __ms_printf
#define _tprintf_l _printf_l
#define _tprintf_p _printf_p
#define _tprintf_p_l _printf_p_l
Expand All @@ -532,11 +532,11 @@ extern "C" {
#define _vtcprintf_l _vcprintf_l
#define _vtcprintf_p _vcprintf_p
#define _vtcprintf_p_l _vcprintf_p_l
#define _ftprintf fprintf
#define _ftprintf __ms_fprintf
#define _ftprintf_l _fprintf_l
#define _ftprintf_p _fprintf_p
#define _ftprintf_p_l _fprintf_p_l
#define _stprintf sprintf
#define _stprintf __ms_sprintf
#define _stprintf_l _sprintf_l
#define _stprintf_p _sprintf_p
#define _stprintf_p_l _sprintf_p_l
Expand All @@ -546,15 +546,15 @@ extern "C" {
#define _sctprintf_p_l _scprintf_p_l
#define _sntprintf _snprintf
#define _sntprintf_l _snprintf_l
#define _vtprintf vprintf
#define _vtprintf __ms_vprintf
#define _vtprintf_l _vprintf_l
#define _vtprintf_p _vprintf_p
#define _vtprintf_p_l _vprintf_p_l
#define _vftprintf vfprintf
#define _vftprintf __ms_vfprintf
#define _vftprintf_l _vfprintf_l
#define _vftprintf_p _vfprintf_p
#define _vftprintf_p_l _vfprintf_p_l
#define _vstprintf vsprintf
#define _vstprintf __ms_vsprintf
#define _vstprintf_l _vsprintf_l
#define _vstprintf_p _vsprintf_p
#define _vstprintf_p_l _vsprintf_p_l
Expand All @@ -565,13 +565,13 @@ extern "C" {
#define _vsntprintf _vsnprintf
#define _vsntprintf_l _vsnprintf_l

#define _tscanf scanf
#define _tscanf __ms_scanf
#define _tscanf_l _scanf_l
#define _tcscanf _cscanf
#define _tcscanf_l _cscanf_l
#define _ftscanf fscanf
#define _ftscanf __ms_fscanf
#define _ftscanf_l _fscanf_l
#define _stscanf sscanf
#define _stscanf __ms_sscanf
#define _stscanf_l _sscanf_l
#define _sntscanf _snscanf
#define _sntscanf_l _snscanf_l
Expand Down
Loading

0 comments on commit e9c8e7e

Please sign in to comment.