February 2020 - Wine-commits

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetClipPlane().
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: a0ba270ec890a6bd7ef4f03ddef93a000a0bdf19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0ba270ec890a6bd7ef4f03d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 16:11:38 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetClipPlane(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 17ce954a7d..aaf5b62e86 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1819,8 +1819,6 @@ static HRESULT WINAPI d3d8_device_SetClipPlane(IDirect3DDevice8 *iface, DWORD in wined3d_mutex_lock(); hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); return hr;

1 0

Francois Gouget : testbot: Use the three parameter open() form.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: tools Branch: master Commit: d6f6d21b469aeda589700da81a0f254e2be849d5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d6f6d21b469aeda589700da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 25 00:13:41 2020 +0100 testbot: Use the three parameter open() form. This avoids potential issues if the filename starts with '<', '>', etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/OldSubmit.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 46b17e5..6af51d7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -404,7 +404,7 @@ sub IsPatch($$) { my ($self, $Body) = @_; - if (open(BODY, "<" . $Body->path)) + if (open(BODY, "<", $Body->path)) { my $Line; while (defined($Line = <BODY>)) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 3568c9b..a5125f3 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -280,7 +280,7 @@ sub UpdateStatus($$) my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); - if (open TASKLOG, ">>$TaskDir/testbot.log") + if (open TASKLOG, ">>", "$TaskDir/testbot.log") { print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG; diff --git a/testbot/web/OldSubmit.pl b/testbot/web/OldSubmit.pl index e0ccda3..06ce275 100644 --- a/testbot/web/OldSubmit.pl +++ b/testbot/web/OldSubmit.pl @@ -636,7 +636,7 @@ sub OnPage1Next($) { my $StagingFile = $self->GetTmpStagingFullPath($BaseName); my $OldUMask = umask(002); - if (! open (OUTFILE,">$StagingFile")) + if (! open (OUTFILE,">", $StagingFile)) { umask($OldUMask); $self->{ErrField} = "File";

1 0

Francois Gouget : testbot/LogUtils: Defend against invalid .errors lines.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: tools Branch: master Commit: 02a478745bb808c7c2cfbcbb5640d2dc0a1ec9f8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=02a478745bb808c7c2cfbcb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 25 00:14:09 2020 +0100 testbot/LogUtils: Defend against invalid .errors lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e309753..4cc8aaa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -855,7 +855,13 @@ sub LoadLogErrors($) $LineNo++; chomp $Line; my ($Type, $Property, $Value) = split / /, $Line, 3; - if ($Type eq "p") + if (!defined $Value) + { + $LogInfo->{BadLog} = "$LineNo: Found an invalid line"; + last; + } + # else $Type, $Property and $Value are all defined + elsif ($Type eq "p") { if (!defined $LogInfo->{$Property}) {

1 0

Francois Gouget : testbot: Share the patch subject parsing code.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: tools Branch: master Commit: 02540eb65d19d926b7b20051f2e7af4f2a672489 URL: https://source.winehq.org/git/tools.git/?a=commit;h=02540eb65d19d926b7b2005… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 25 00:14:24 2020 +0100 testbot: Share the patch subject parsing code. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 73 ++++++++++++++++------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 24 ++++------ 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 6af51d7..2b52f4b 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -110,6 +110,31 @@ sub FromSubmission($$) $self->Disposition("Processing"); } +sub ParseSubject($) +{ + my ($self) = @_; + + my $Title = $self->Subject; + $Title =~ s/32\/64//; + $Title =~ s/64\/32//; + + my $SubjectInfo; + if ($Title =~ s~[[$](\d+)/(\d+)[]$]~~ or + $Title =~ s~\b(\d+)/(\d+)\b~~) + { + $SubjectInfo->{PartNo} = int($1); + $SubjectInfo->{MaxPartNo} = int($2); + } + + $Title =~ s/\[PATCH[^]]*\]//i; + $Title =~ s/\s+/ /g; + $Title =~ s/^\s//; + $Title =~ s/\s$//; + $SubjectInfo->{Title} = $Title; + + return $SubjectInfo; +} + =pod =over 12 @@ -129,22 +154,23 @@ WineTestBot::PendingPatchSet::SubmitSubset(). =back =cut -sub Submit($$$) +sub Submit($$;$) { - my ($self, $PatchFileName, $IsSet) = @_; + my ($self, $PatchFileName, $SubjectInfo) = @_; + $SubjectInfo ||= $self->ParseSubject(); my $Impacts = GetPatchImpacts($PatchFileName); if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and !$Impacts->{PatchedTests}) { if ($Impacts->{IsWinePatch}) { - $self->Disposition(($IsSet ? "Part does" : "Does") + $self->Disposition(($SubjectInfo->{PartNo} ? "Part does" : "Does") ." not impact the Wine build"); } else { - $self->Disposition(($IsSet ? "Part is not" : "Not") ." a Wine patch"); + $self->Disposition(($SubjectInfo->{PartNo} ? "Part is not" : "Not") ." a Wine patch"); } return undef; } @@ -155,12 +181,8 @@ sub Submit($$$) my $Priority = 5; $NewJob->Priority($Priority); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); - my $Subject = $self->Subject; - $Subject =~ s/\[PATCH[^\]]*]//i; - $Subject =~ s/[[$]?\d+\/\d+[$\]]?//; - $Subject =~ s/^\s*//; - $NewJob->Remarks(substr("[$PatchesMailingList] " . $Subject, 0, - $PropertyDescriptor->GetMaxLength())); + my $Remarks = "[$PatchesMailingList] $SubjectInfo->{Title}"; + $NewJob->Remarks(substr($Remarks, 0, $PropertyDescriptor->GetMaxLength())); $NewJob->Patch($self); my $User; @@ -301,7 +323,7 @@ sub Submit($$$) } else { - $self->Disposition(($IsSet ? "Part does" : "Does") ." not impact the ". + $self->Disposition(($SubjectInfo->{PartNo} ? "Part does" : "Does") ." not impact the ". ($WineVMs->IsEmpty() ? "Windows " : "") ."tests"); } return undef; @@ -464,28 +486,15 @@ sub NewPatch($$$) my $ErrMessage; if (scalar(@PatchBodies) == 1) { - my $Subject = $Patch->Subject; - $Subject =~ s/32\/64//; - $Subject =~ s/64\/32//; - if ($Subject =~ m/\d+\/\d+/) - { - $Patch->Disposition("Checking series"); - (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); - link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); - if (! defined($ErrMessage)) - { - $ErrMessage = CreatePendingPatchSets()->NewSubmission($Patch); - } - } - else + my $SubjectInfo = $Patch->ParseSubject(); + $Patch->Disposition($SubjectInfo->{PartNo} ? "Checking series" : "Checking patch"); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); + if (!defined $ErrMessage) { - $Patch->Disposition("Checking patch"); - (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); - link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); - if (! defined($ErrMessage)) - { - $ErrMessage = $Patch->Submit($PatchBodies[0]->path, !1); - } + $ErrMessage = $SubjectInfo->{PartNo} ? + CreatePendingPatchSets()->NewSubmission($Patch, $SubjectInfo) : + $Patch->Submit($PatchBodies[0]->path, $SubjectInfo); } } elsif (scalar(@PatchBodies) == 0) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5339513..adabf2e 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -136,7 +136,7 @@ sub SubmitSubset($$$) if (!defined $ErrMessage) { - $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); + $ErrMessage = $FinalPatch->Submit($CombinedFileName); } unlink($CombinedFileName); @@ -224,36 +224,29 @@ makes the patchset complete, then the patchset itself is deleted. =back =cut -sub NewSubmission($$) +sub NewSubmission($$$) { - my ($self, $Patch) = @_; + my ($self, $Patch, $SubjectInfo) = @_; if (! defined($Patch->FromEMail)) { $Patch->Disposition("Unable to determine series author"); return undef; } - my $Subject = $Patch->Subject; - $Subject =~ s/32\/64//; - $Subject =~ s/64\/32//; - $Subject =~ m/(\d+)\/(\d+)/; - my $PartNo = int($1); - my $MaxPartNo = int($2); - - my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $MaxPartNo)); + my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $SubjectInfo->{MaxPartNo})); if (! defined($Set)) { $Set = $self->Add(); $Set->EMail($Patch->FromEMail); - $Set->TotalParts($MaxPartNo); + $Set->TotalParts($SubjectInfo->{MaxPartNo}); } my $Parts = $Set->Parts; - my $Part = $Parts->GetItem($PartNo); + my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); if (! defined($Part)) { $Part = $Parts->Add(); - $Part->No($PartNo); + $Part->No($SubjectInfo->{PartNo}); } $Part->Patch($Patch); @@ -264,12 +257,13 @@ sub NewSubmission($$) $Patch->Disposition("Error occurred during series processing"); } - if (! $Set->CheckSubsetComplete($PartNo)) + if (! $Set->CheckSubsetComplete($SubjectInfo->{PartNo})) { $Patch->Disposition("Set not complete yet"); } else { + my $PartNo = $SubjectInfo->{PartNo}; my $AllPartsAvailable = 1; while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && ! defined($ErrMessage))

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _snwprintf_s and _vsnwprintf_s declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: ee02f93cc90d4ffeff6aab1ad63e40024fe01276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee02f93cc90d4ffeff6aab1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:35 2020 +0100 corecrt_wstdio.h: Add ucrt _snwprintf_s and _vsnwprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 31702129cd..65334ca0f9 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -55,12 +55,10 @@ wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); -int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int WINAPIV _scwprintf(const wchar_t*,...); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); -int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); @@ -104,6 +102,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT +_ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) @@ -123,6 +122,23 @@ static inline int WINAPIV _snwprintf(wchar_t *buffer, size_t size, const wchar_t return ret; } +static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vsnwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsnwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); @@ -160,7 +176,9 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) #else /* _UCRT */ _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); +_ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 449959f4118b9d536dff2d5a64b70f640aee699f URL: https://source.winehq.org/git/wine.git/?a=commit;h=449959f4118b9d536dff2d5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:48 2020 +0100 corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 65334ca0f9..a371d54cff 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -55,9 +55,7 @@ wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); -int WINAPIV _scwprintf(const wchar_t*,...); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); @@ -173,10 +171,31 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) return ret < 0 ? -1 : ret; } +static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV _scwprintf(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ +_ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); +_ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _vscwprintf_p_l and _vswprintf_p_l declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: e5771a94e756f6b9a137fb20759e18d69cb51e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5771a94e756f6b9a137fb20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:58 2020 +0100 corecrt_wstdio.h: Add ucrt _vscwprintf_p_l and _vswprintf_p_l declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index a371d54cff..a04e571f02 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -56,8 +56,6 @@ wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); -int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); @@ -102,6 +100,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { @@ -178,6 +177,19 @@ static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) return ret < 0 ? -1 : ret; } +static inline int __cdecl _vswprintf_p_l(wchar_t *buffer, size_t size, const wchar_t *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _vscwprintf_p_l(const wchar_t *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, locale, args); + return ret < 0 ? -1 : ret; +} + static inline int WINAPIV _scwprintf(const wchar_t *format, ...) { int ret; @@ -196,8 +208,10 @@ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); _ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt fwprintf and vfwprintf declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 5fe1c9aac456ff2349d976df35fde0f56d968fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fe1c9aac456ff2349d976df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:34:07 2020 +0100 corecrt_wstdio.h: Add ucrt fwprintf and vfwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index a04e571f02..05f1d7f63f 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -71,7 +71,6 @@ wint_t __cdecl fgetwc(FILE*); wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); -int WINAPIV fwprintf(FILE*,const wchar_t*,...); int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int WINAPIV fwscanf(FILE*,const wchar_t*,...); @@ -86,7 +85,6 @@ int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); @@ -98,6 +96,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT +_ACRTIMP int __cdecl __stdio_common_vfwprintf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); @@ -202,6 +201,22 @@ static inline int WINAPIV _scwprintf(const wchar_t *format, ...) return ret; } +static inline int __cdecl vfwprintf(FILE *file, const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + +static inline int WINAPIV fwprintf(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); @@ -212,6 +227,8 @@ _ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int WINAPIV fwprintf(FILE*,const wchar_t*,...); +_ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt fwprintf_s and vfwprintf_s declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: aa31bea0745035ce8802f82c9385a8c0834e4df0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa31bea0745035ce8802f82c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:34:18 2020 +0100 corecrt_wstdio.h: Add ucrt fwprintf_s and vfwprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 05f1d7f63f..fa2580567f 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -71,7 +71,6 @@ wint_t __cdecl fgetwc(FILE*); wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); -int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int WINAPIV fwscanf(FILE*,const wchar_t*,...); int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); @@ -85,7 +84,6 @@ int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); @@ -97,6 +95,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vfwprintf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vfwprintf_s(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); @@ -217,6 +216,22 @@ static inline int WINAPIV fwprintf(FILE *file, const wchar_t *format, ...) return ret; } +static inline int vfwprintf_s(FILE *file, const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + +static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = vfwprintf_s(file, format, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); @@ -228,7 +243,9 @@ _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int WINAPIV fwprintf(FILE*,const wchar_t*,...); +_ACRTIMP int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt fwscanf and fwscanf_s declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: f152ff91503efe125ea1a5bb068b85add833235c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f152ff91503efe125ea1a5bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:34:26 2020 +0100 corecrt_wstdio.h: Add ucrt fwscanf and fwscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index fa2580567f..d0d8ed952c 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -72,8 +72,6 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fputws(const wchar_t*,FILE*); -int WINAPIV fwscanf(FILE*,const wchar_t*,...); -int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); wint_t __cdecl getwc(FILE*); wint_t __cdecl getwchar(void); wchar_t* __cdecl getws(wchar_t*); @@ -100,6 +98,8 @@ _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_ _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); + static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); @@ -232,6 +232,28 @@ static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int WINAPIV fwscanf(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV fwscanf_s(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); @@ -264,6 +286,9 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * } #endif /* _CRT_NON_CONFORMING_SWPRINTFS */ +_ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); +_ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); + #endif /* _UCRT */ #ifdef __cplusplus

1 0