February 2020 - Wine-commits

Francois Gouget : testbot/LogUtils: Deduplicate the latest WineTest reports.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: tools Branch: master Commit: 8c6d8e66595d376adbe3cb1f199dbb69331739a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c6d8e66595d376adbe3cb1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 04:45:23 2020 +0100 testbot/LogUtils: Deduplicate the latest WineTest reports. There is no need to keep old logs if they don't contain errors that are already present in the latest one. It cuts down on the number of reports that test results need to be compared to to detect new failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 21 +++++--- testbot/lib/WineTestBot/LogUtils.pm | 95 +++++++++++++++++++++++++++++++++++-- 2 files changed, 107 insertions(+), 9 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 49f3c2e..94adf42 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -210,6 +210,9 @@ sub BuildErrorsCache($$$$;$) return CreateLogErrorsCache($LogInfo, $Task); } +# The list of files in latest/. This includes files deleted for redundancy. +my %LatestFiles; + sub DoUpdateLatestReport($$$) { my ($Task, $ReportName, $SrcReportPath) = @_; @@ -218,6 +221,8 @@ sub DoUpdateLatestReport($$$) my $SrcIsRef = ($SrcReportPath =~ /-job\d+-/); my $RefReportName = $SrcIsRef ? basename($SrcReportPath) : $Task->GetRefReportName($ReportName); + return 0 if ($LatestFiles{$RefReportName}); + $LatestFiles{$RefReportName} = 1; my $Rc = 0; my $LatestReportPath = "$DataDir/latest/$RefReportName"; @@ -519,14 +524,18 @@ sub ProcessLatestReports() { $Rc += Delete("$LatestReportPath.errors", "orphaned"); } - elsif (!-f "$LatestReportPath.errors") + else { - # Build the missing .errors file - my $ErrMessage = BuildErrorsCache("$DataDir/latest", $RefReportName, 1, 0); - if (defined $ErrMessage) + $LatestFiles{$RefReportName} = 1; + if (!-f "$LatestReportPath.errors") { - Error "$ErrMessage\n"; - $Rc = 1; + # Build the missing .errors file + my $ErrMessage = BuildErrorsCache("$DataDir/latest", $RefReportName, 1, 0); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } } } } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index f7b6f42..e309753 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1028,9 +1028,9 @@ sub MarkAllErrorsAsNew($) =item C<_GetLineKey()> -This is a helper for TagNewErrors(). It reformats the log lines so they -can meaningfully be compared to the reference log even if line numbers change, -etc. +This is a helper for _DeduplicateLatestReport() and TagNewErrors(). It +reformats the log lines so they can meaningfully be compared to the reference +log even if line numbers change, etc. =back =cut @@ -1244,6 +1244,92 @@ sub SnapshotLatestReport($$) return \@ErrMessages; } +sub _IsReportRedundant($$) +{ + my ($RefInfo, $LogInfo) = @_; + + return undef if (($RefInfo->{ErrCount} || 0) < ($LogInfo->{ErrCount} || 0)); + return 1 if (($LogInfo->{ErrCount} || 0) == 0); + + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + return undef if (!$RefGroup); + + my $Diff = Algorithm::Diff->new($RefGroup->{Errors}, $LogGroup->{Errors}, + { keyGen => \&_GetLineKey }); + while ($Diff->Next()) + { + # Same() > 0 => Items(2) > 0 despite there being no new lines + if (!$Diff->Same() and $Diff->Items(2) > 0) + { + # This old log has errors not present in the latest one so keep it + return undef; + } + } + } + + return 1; +} + +sub _DeduplicateLatestReport($) +{ + my ($RefReportName) = @_; + + my $LatestGlob = $RefReportName; + $LatestGlob =~ s/-job\d+-/-job*-/; + my @LatestPaths = glob("$DataDir/latest/$LatestGlob"); + return undef if (@LatestPaths <= 1); + + my $RefReportPath = "$DataDir/latest/$RefReportName"; + my $RefInfo = LoadLogErrors($RefReportPath); + return $RefInfo->{BadLog} if (defined $RefInfo->{BadLog}); + + my %LatestAges; + foreach my $LogPath (@LatestPaths) + { + $LatestAges{$LogPath} = -M $LogPath || 0; + } + my $RefAge = $LatestAges{$RefReportPath}; + + my $ErrMessage; + my $ReportRE = $RefReportName; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job\d+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9]+-\\Q$2/; + foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) + { + my $LogName = basename($LogPath); + next if ($LogName eq $RefReportName); + next if ($LogName !~ /^($ReportRE)$/); + $LogName = $1; # untaint + $LogPath = "$DataDir/latest/$LogName"; + + my $LogInfo = LoadLogErrors($LogPath); + if (defined $LogInfo->{BadLog}) + { + # Take note of the error but continue to try deduplicating + $ErrMessage = $LogInfo->{BadLog}; + next; + } + if ($RefAge < $LatestAges{$LogPath}) + { + if (_IsReportRedundant($RefInfo, $LogInfo)) + { + unlink $LogPath, "$LogPath.errors"; + } + } + else + { + if (_IsReportRedundant($LogInfo, $RefInfo)) + { + unlink $RefReportPath, "$RefReportPath.errors"; + last; + } + } + } + return $ErrMessage; +} + sub UpdateLatestReport($$) { my ($RefReportName, $SrcReportPath) = @_; @@ -1262,6 +1348,9 @@ sub UpdateLatestReport($$) } } + my $ErrMessage = _DeduplicateLatestReport($RefReportName); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + return \@ErrMessages; }

1 0

Francois Gouget : winetest/dissect: Lines have no trailing CRs in the main loop.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: tools Branch: master Commit: da162780c973a19febd4e846eefe8b150d4e6f71 URL: https://source.winehq.org/git/tools.git/?a=commit;h=da162780c973a19febd4e84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 04:45:29 2020 +0100 winetest/dissect: Lines have no trailing CRs in the main loop. The trailing CRs are removed at the start of the parser's loop. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index ca8648a..87fdc65 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -594,7 +594,7 @@ while ($line = <IN>) { next if ($line =~ /^\s*$/); chomp $line; $line =~ s/\r+$//; - if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)\r?$%) + if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) { my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5); @@ -614,7 +614,7 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { my ($l_unit, $l_subunit) = ($1, $2); if ($units{$l_unit})

1 0

Francois Gouget : testbot/testagentd: Fix a spelling error in an error message.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: tools Branch: master Commit: 28443bcac11129a04919aa3c3f00426a85d3e990 URL: https://source.winehq.org/git/tools.git/?a=commit;h=28443bcac11129a04919aa3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 04:45:40 2020 +0100 testbot/testagentd: Fix a spelling error in an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 057e8fc..581c789 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -273,7 +273,7 @@ int platform_settime(uint64_t epoch, uint32_t leeway) filetime.dwHighDateTime = epoch >> 32; if (!FileTimeToSystemTime(&filetime, &systemtime)) { - set_status(ST_ERROR, "failed to oconvert the time (%lu)", GetLastError()); + set_status(ST_ERROR, "failed to convert the time (%lu)", GetLastError()); return 0; } if (!SetSystemTime(&systemtime))

1 0

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

21 Feb '20

Module: wine Branch: master Commit: 9bfd4652368fd72613533eda58af891e04fa34bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfd4652368fd72613533eda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:38 2020 +0100 stdio.h: Add ucrt _scprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 10 ---------- include/msvcrt/stdio.h | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index b6375f71dc..82bbf84c25 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -114,16 +114,6 @@ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const { _invalid_parameter_noinfo(); } - -int WINAPIV _scprintf(const char* fmt, ...) -{ - int ret; - __ms_va_list valist; - __ms_va_start(valist, fmt); - ret = _vsnprintf(NULL, 0, fmt, valist); - __ms_va_end(valist); - return ret; -} #endif static void init_cxx_funcs(void) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index be8c1e485f..0fc374b06e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -87,7 +87,6 @@ int __cdecl _setmaxstdio(int); 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*,...); 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*); @@ -147,7 +146,6 @@ int WINAPIV scanf_s(const char*,...); void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); int WINAPIV sprintf_s(char*,size_t,const char*,...); -int WINAPIV _scprintf(const char *, ...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); @@ -195,6 +193,18 @@ static inline int __cdecl _vscprintf(const char *format, __ms_va_list args) return ret < 0 ? -1 : ret; } +static inline int WINAPIV _scprintf(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + __ms_va_end(args); + return 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, @@ -226,6 +236,7 @@ static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_lis #else /* _UCRT */ +_ACRTIMP int WINAPIV _scprintf(const char *,...); _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);

1 0

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

21 Feb '20

Module: wine Branch: master Commit: 6bc15730457b780c47374d3e922287cafd36b233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc15730457b780c47374d3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:45 2020 +0100 stdio.h: Add ucrt _snprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0fc374b06e..b246182e8c 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -84,7 +84,6 @@ int __cdecl _putw(int,FILE*); int __cdecl _rmtmp(void); int __cdecl _set_printf_count_output(int); int __cdecl _setmaxstdio(int); -int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); @@ -186,6 +185,17 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, return ret < 0 ? -1 : ret; } +static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + __ms_va_end(args); + return 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, @@ -237,6 +247,7 @@ static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_lis #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); +_ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); _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);

1 0

Jacek Caban : stdio.h: Add ucrt fprintf and fprintf_s declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 39b1d610d8605bc672e11ba4182d2938f61cf9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1d610d8605bc672e11ba4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:51 2020 +0100 stdio.h: Add ucrt fprintf and fprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b246182e8c..9aebcb64c5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -113,8 +113,6 @@ int __cdecl fgetpos(FILE*,fpos_t*); char* __cdecl fgets(char*,int,FILE*); FILE* __cdecl fopen(const char*,const char*); errno_t __cdecl fopen_s(FILE**,const char*,const char*); -int WINAPIV fprintf(FILE*,const char*,...); -int WINAPIV 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*); @@ -239,11 +237,33 @@ 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 WINAPIV fprintf(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + 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); } +static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -251,6 +271,8 @@ _ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); _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 WINAPIV fprintf(FILE*,const char*,...); +_ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _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);

1 0

Jacek Caban : stdio.h: Add ucrt printf and vprintf declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 04ad51b3e50cd92dc8e0dd529b57b6423c3eced5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ad51b3e50cd92dc8e0dd52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:57 2020 +0100 stdio.h: Add ucrt printf and vprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9aebcb64c5..ebdcd616cb 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,7 +130,6 @@ int __cdecl getc(FILE*); int __cdecl getchar(void); char* __cdecl gets(char*); void __cdecl perror(const char*); -int WINAPIV printf(const char*,...); int WINAPIV printf_s(const char*,...); int __cdecl putc(int,FILE*); int __cdecl putchar(int); @@ -149,7 +148,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 vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); @@ -264,6 +262,22 @@ static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...) return ret; } +static inline int vprintf(const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV printf(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -273,8 +287,10 @@ _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 WINAPIV fprintf(FILE*,const char*,...); _ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); +_ACRTIMP int WINAPIV printf(const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); +_ACRTIMP int __cdecl vprintf(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 printf_s and vprintf_s declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 95be8e4928ac6cd4361ca34f27213fd24ad6fe2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=95be8e4928ac6cd4361ca34f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:07 2020 +0100 stdio.h: Add ucrt printf_s and vprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index ebdcd616cb..76bf70d81b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,7 +130,6 @@ int __cdecl getc(FILE*); int __cdecl getchar(void); char* __cdecl gets(char*); void __cdecl perror(const char*); -int WINAPIV printf_s(const char*,...); int __cdecl putc(int,FILE*); int __cdecl putchar(int); int __cdecl puts(const char*); @@ -148,7 +147,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 vprintf_s(const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); @@ -278,6 +276,22 @@ static inline int WINAPIV printf(const char *format, ...) return ret; } +static inline int vprintf_s(const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV printf_s(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -288,9 +302,11 @@ _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_li _ACRTIMP int WINAPIV fprintf(FILE*,const char*,...); _ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _ACRTIMP int WINAPIV printf(const char*,...); +_ACRTIMP int WINAPIV printf_s(const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vprintf(const char*,__ms_va_list); +_ACRTIMP int __cdecl vprintf_s(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 sprintf_s declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 6805ae0f05e274208635e0394326b5101847cb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6805ae0f05e274208635e039… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:15 2020 +0100 stdio.h: Add ucrt sprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 76bf70d81b..42799223d9 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -140,7 +140,6 @@ int WINAPIV scanf(const char*,...); int WINAPIV scanf_s(const char*,...); void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); -int WINAPIV sprintf_s(char*,size_t,const char*,...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); @@ -222,6 +221,17 @@ static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_l return ret < 0 ? -1 : ret; } +static inline int WINAPIV sprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + __ms_va_end(args); + return 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); @@ -303,6 +313,7 @@ _ACRTIMP int WINAPIV fprintf(FILE*,const char*,...); _ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _ACRTIMP int WINAPIV printf(const char*,...); _ACRTIMP int WINAPIV printf_s(const char*,...); +_ACRTIMP int WINAPIV sprintf_s(char*,size_t,const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vprintf(const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt fscanf and fscanf_s declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 8a5983197a6ae0d3312f8af6afda875a987298fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5983197a6ae0d3312f8af6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:26 2020 +0100 stdio.h: Add ucrt fscanf and fscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 42799223d9..6e4a58e41e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -118,8 +118,6 @@ int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*); FILE* __cdecl freopen(const char*,const char*,FILE*); -int WINAPIV fscanf(FILE*,const char*,...); -int WINAPIV fscanf_s(FILE*,const char*,...); int __cdecl fseek(FILE*,__msvcrt_long,int); int __cdecl _fseeki64(FILE*,__int64,int); int __cdecl fsetpos(FILE*,fpos_t*); @@ -158,6 +156,8 @@ _ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,con _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); +_ACRTIMP int __cdecl __stdio_common_vfscanf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); + static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, @@ -302,6 +302,28 @@ static inline int WINAPIV printf_s(const char *format, ...) return ret; } +static inline int WINAPIV fscanf(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -324,6 +346,9 @@ _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); } +_ACRTIMP int WINAPIV fscanf(FILE*,const char*,...); +_ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...); + #endif /* _UCRT */ #endif /* _STDIO_DEFINED */

1 0