wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Daniel Lehman : tzres: Add Aleutian Time Zone.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 6ef84f2e545a4402502d9690c39ac07453d8f374 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef84f2e545a4402502d9690… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 24 20:26:01 2020 -0800 tzres: Add Aleutian Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 10 ++ po/ar.po | 402 ++++++++++++++++++++++++++------------------------- po/ast.po | 402 ++++++++++++++++++++++++++------------------------- po/bg.po | 398 +++++++++++++++++++++++++------------------------- po/ca.po | 402 ++++++++++++++++++++++++++------------------------- po/cs.po | 402 ++++++++++++++++++++++++++------------------------- po/da.po | 402 ++++++++++++++++++++++++++------------------------- po/de.po | 402 ++++++++++++++++++++++++++------------------------- po/el.po | 398 +++++++++++++++++++++++++------------------------- po/en.po | 398 +++++++++++++++++++++++++------------------------- po/en_US.po | 398 +++++++++++++++++++++++++------------------------- po/eo.po | 402 ++++++++++++++++++++++++++------------------------- po/es.po | 402 ++++++++++++++++++++++++++------------------------- po/fa.po | 400 +++++++++++++++++++++++++------------------------- po/fi.po | 402 ++++++++++++++++++++++++++------------------------- po/fr.po | 402 ++++++++++++++++++++++++++------------------------- po/he.po | 402 ++++++++++++++++++++++++++------------------------- po/hi.po | 398 +++++++++++++++++++++++++------------------------- po/hr.po | 402 ++++++++++++++++++++++++++------------------------- po/hu.po | 402 ++++++++++++++++++++++++++------------------------- po/it.po | 402 ++++++++++++++++++++++++++------------------------- po/ja.po | 402 ++++++++++++++++++++++++++------------------------- po/ko.po | 402 ++++++++++++++++++++++++++------------------------- po/lt.po | 402 ++++++++++++++++++++++++++------------------------- po/ml.po | 398 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 402 ++++++++++++++++++++++++++------------------------- po/nl.po | 402 ++++++++++++++++++++++++++------------------------- po/or.po | 398 +++++++++++++++++++++++++------------------------- po/pa.po | 398 +++++++++++++++++++++++++------------------------- po/pl.po | 402 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 402 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 402 ++++++++++++++++++++++++++------------------------- po/rm.po | 398 +++++++++++++++++++++++++------------------------- po/ro.po | 402 ++++++++++++++++++++++++++------------------------- po/ru.po | 398 +++++++++++++++++++++++++------------------------- po/si.po | 402 ++++++++++++++++++++++++++------------------------- po/sk.po | 402 ++++++++++++++++++++++++++------------------------- po/sl.po | 402 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 400 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 400 +++++++++++++++++++++++++------------------------- po/sv.po | 402 ++++++++++++++++++++++++++------------------------- po/ta.po | 398 +++++++++++++++++++++++++------------------------- po/te.po | 398 +++++++++++++++++++++++++------------------------- po/th.po | 400 +++++++++++++++++++++++++------------------------- po/tr.po | 402 ++++++++++++++++++++++++++------------------------- po/uk.po | 398 +++++++++++++++++++++++++------------------------- po/wa.po | 400 +++++++++++++++++++++++++------------------------- po/wine.pot | 398 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 402 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 402 ++++++++++++++++++++++++++------------------------- 51 files changed, 10089 insertions(+), 9555 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ef84f2e545a4402502d…

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

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: 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

Alex Henrie : ntdll/tests: Add more tests for RtlIpv6StringToAddress.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 9c11de6b79472378be9af5b72dbca5db804fa670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c11de6b79472378be9af5b7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 24 00:39:51 2020 -0700 ntdll/tests: Add more tests for RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 559a7d625c..445f3538d8 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1539,6 +1539,8 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, { "1111:2222:3333:4444:5555:6666::7777:8888", STATUS_SUCCESS, 35, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x7777 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777::8888", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, ex_fail_6|win_broken_6 }, { "1111:2222:3333:4444:5555::", STATUS_SUCCESS, 26, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, { "1111:2222:3333:4444:5555::123.123.123.123", STATUS_SUCCESS, 41, @@ -1555,8 +1557,30 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800 }, ex_fail_6 }, { "1111:2222:3333:4444:5555::0x8888", STATUS_SUCCESS, 27, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0x80000000", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0xffff }, ex_fail_6 }, + { "1111:2222:3333:4444::5555:0x012345678", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0x7856 }, ex_fail_6 }, + { "1111:2222:3333:4444::5555:0x123456789", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0xffff }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:0x12345678", STATUS_INVALID_PARAMETER, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:0x80000000", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:0x012345678", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x7856 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:0x123456789", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff }, ex_fail_6 }, + { "111:222:333:444:555:666:777:0x123456789abcdef0", STATUS_SUCCESS, 29, + { 0x1101, 0x2202, 0x3303, 0x4404, 0x5505, 0x6606, 0x7707, 0xffff }, ex_fail_6 }, { "1111:2222:3333:4444:5555::08888", STATUS_INVALID_PARAMETER, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555::08888::", STATUS_INVALID_PARAMETER, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555:6666:7777:fffff:", STATUS_INVALID_PARAMETER, 40, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xabab } }, + { "1111:2222:3333:4444:5555:6666::fffff:", STATUS_INVALID_PARAMETER, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab } }, { "1111:2222:3333:4444:5555::fffff", STATUS_INVALID_PARAMETER, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333:4444::fffff", STATUS_INVALID_PARAMETER, 26, @@ -1672,16 +1696,24 @@ static const struct { -1 } }, { "1111", STATUS_INVALID_PARAMETER, 4, { -1 } }, + { "0x1111", STATUS_INVALID_PARAMETER, 1, + { -1 } }, { "1111:22223333:4444:5555:6666:1.2.3.4", STATUS_INVALID_PARAMETER, -1, { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:22223333:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, -1, { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:123456789:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, -1, + { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:1234567890abcdef0:4444:5555:6666:7777:888", STATUS_INVALID_PARAMETER, -1, + { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:", STATUS_INVALID_PARAMETER, 10, { 0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:1.2.3.4", STATUS_INVALID_PARAMETER, 17, { 0x1111, 0x2222, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333", STATUS_INVALID_PARAMETER, 14, { 0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555:6666::1.2.3.4", STATUS_SUCCESS, 32, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x100 }, ex_fail_6 }, { "1111:2222:3333:4444:5555:6666:7777:1.2.3.4", STATUS_SUCCESS, 36, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 }, ex_fail_6 }, { "1111:2222:3333:4444:5555:6666:7777:8888:", STATUS_SUCCESS, 39, @@ -1702,12 +1734,30 @@ static const struct { 0x1111, 0, 0, 0, 0, 0, 0, 0x3333 }, ex_fail_6 }, { "12345::6:7:8", STATUS_INVALID_PARAMETER, -1, { -1 } }, + { "1::001.2.3.4", STATUS_SUCCESS, 12, + { 0x100, 0, 0, 0, 0, 0, 0x201, 0x403 } }, + { "1::1.002.3.4", STATUS_SUCCESS, 12, + { 0x100, 0, 0, 0, 0, 0, 0x201, 0x403 } }, + { "1::0001.2.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.0002.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.256.4", STATUS_INVALID_PARAMETER, -1, { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.4294967296.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.18446744073709551616.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.3.256", STATUS_INVALID_PARAMETER, 12, { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.4294967296", STATUS_INVALID_PARAMETER, 19, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.18446744073709551616", STATUS_INVALID_PARAMETER, 29, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.3.300", STATUS_INVALID_PARAMETER, 12, { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.300.", STATUS_INVALID_PARAMETER, 12, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2::1", STATUS_INVALID_PARAMETER, 6, { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.3.4::1", STATUS_SUCCESS, 10, @@ -1758,6 +1808,20 @@ static const struct { -1 } }, { "::-1", STATUS_SUCCESS, 2, { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::12345678", STATUS_INVALID_PARAMETER, 10, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "::123456789", STATUS_INVALID_PARAMETER, 11, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "::1234567890abcdef0", STATUS_INVALID_PARAMETER, 19, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "::0x80000000", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0xffff }, ex_fail_6 }, + { "::0x012345678", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0x7856 }, ex_fail_6 }, + { "::0x123456789", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0xffff }, ex_fail_6 }, + { "::0x1234567890abcdef0", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0xffff }, ex_fail_6 }, { "::.", STATUS_SUCCESS, 2, { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, { "::..", STATUS_SUCCESS, 2,

1 0

Alexandre Julliard : ver: Use the 16-bit resource function in GetFileVersionInfo16().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: f4ebe20b2ba33e3c366407f58cbc7421e422eea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ebe20b2ba33e3c366407f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 24 19:15:40 2020 +0100 ver: Use the 16-bit resource function in GetFileVersionInfo16(). The 32-bit functions no longer support LZ compression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48557 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/version.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 269e2c9b2a..dac9ff28dd 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -30,6 +30,7 @@ #include "windef.h" #include "wine/winbase16.h" #include "winternl.h" +#include "winuser.h" #include "winver.h" #include "lzexpand.h" #include "wine/debug.h" @@ -461,22 +462,23 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, /************************************************************************* * GetFileVersionInfoSize [VER.6] */ -DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle ) +DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle ) { - TRACE("(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle ); - return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle ); + DWORD offset; + + TRACE("(%s, %p)\n", debugstr_a(filename), handle ); + + return GetFileResourceSize16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, &offset ); } /************************************************************************* * GetFileVersionInfo [VER.7] */ -DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle, - DWORD cbBuf, LPVOID lpvData ) +DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - TRACE("(%s, %08x, %d, %p)\n", - debugstr_a(lpszFileName), handle, cbBuf, lpvData ); + TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data ); - return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData ); + return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data ); } /*************************************************************************

1 0

Jacek Caban : include: Add corecrt_wstdlib.h header.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 1e5522ab78f11fb032ba44a66e73f349f5d6f6a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e5522ab78f11fb032ba44a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 16:35:44 2020 +0100 include: Add corecrt_wstdlib.h header. 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_wstdlib.h | 60 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 46 +----------------------------- include/msvcrt/wchar.h | 43 ++-------------------------- 4 files changed, 64 insertions(+), 86 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 694828ab71..f5e2ba665b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -428,6 +428,7 @@ SOURCES = \ msvcrt/corecrt_wctype.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ + msvcrt/corecrt_wstdlib.h \ msvcrt/corecrt_wtime.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h new file mode 100644 index 0000000000..da97e42bb9 --- /dev/null +++ b/include/msvcrt/corecrt_wstdlib.h @@ -0,0 +1,60 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WSTDLIB_DEFINED +#define _WSTDLIB_DEFINED + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +wchar_t* __cdecl _itow(int,wchar_t*,int); +errno_t __cdecl _itow_s(int,wchar_t*,int, int); +wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); +wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); +wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); +wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); +wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl _wgetenv(const wchar_t*); +void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +void __cdecl _wperror(const wchar_t*); +int __cdecl _wputenv(const wchar_t*); +void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); +void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); +errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, + wchar_t*,size_t,wchar_t*,size_t); +int __cdecl _wsystem(const wchar_t*); +double __cdecl _wtof(const wchar_t*); +int __cdecl _wtoi(const wchar_t*); +__int64 __cdecl _wtoi64(const wchar_t*); +__msvcrt_long __cdecl _wtol(const wchar_t*); + +size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); +errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); +int __cdecl mbtowc(wchar_t*,const char*,size_t); +float __cdecl wcstof(const wchar_t*,wchar_t**); +double __cdecl wcstod(const wchar_t*,wchar_t**); +__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); +size_t __cdecl wcstombs(char*,const wchar_t*,size_t); +errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); +__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); +int __cdecl wctomb(char*,wchar_t); +__int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); +__int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); +unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); +unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); + +#ifdef __cplusplus +} +#endif + +#endif /* _WSTDLIB_DEFINED */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 78fc5fba75..5bcc2e4455 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -8,7 +8,7 @@ #ifndef __WINE_STDLIB_H #define __WINE_STDLIB_H -#include <corecrt.h> +#include <corecrt_wstdlib.h> #include <pshpack8.h> @@ -222,50 +222,6 @@ int __cdecl system(const char*); void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); -#ifndef _WSTDLIB_DEFINED -#define _WSTDLIB_DEFINED -wchar_t* __cdecl _itow(int,wchar_t*,int); -errno_t __cdecl _itow_s(int,wchar_t*,int, int); -wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); -errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); -errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); -wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); -errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); -errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); -wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); -wchar_t* __cdecl _wgetenv(const wchar_t*); -void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -void __cdecl _wperror(const wchar_t*); -int __cdecl _wputenv(const wchar_t*); -void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); -void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); -errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, - wchar_t*,size_t,wchar_t*,size_t); -int __cdecl _wsystem(const wchar_t*); -double __cdecl _wtof(const wchar_t*); -int __cdecl _wtoi(const wchar_t*); -__int64 __cdecl _wtoi64(const wchar_t*); -__msvcrt_long __cdecl _wtol(const wchar_t*); - -size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); -errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); -int __cdecl mbtowc(wchar_t*,const char*,size_t); -float __cdecl wcstof(const wchar_t*,wchar_t**); -double __cdecl wcstod(const wchar_t*,wchar_t**); -__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); -size_t __cdecl wcstombs(char*,const wchar_t*,size_t); -errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); -__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); -int __cdecl wctomb(char*,wchar_t); -__int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); -__int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); -unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); -unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); -#endif /* _WSTDLIB_DEFINED */ - typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 6b30645dc0..2daa6de169 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -8,9 +8,10 @@ #ifndef __WINE_WCHAR_H #define __WINE_WCHAR_H -#include <corecrt_wstdio.h> #include <corecrt_wctype.h> #include <corecrt_wio.h> +#include <corecrt_wstdio.h> +#include <corecrt_wstdlib.h> #include <corecrt_wtime.h> #include <string.h> #include <sys/stat.h> @@ -61,46 +62,6 @@ int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wcha int __cdecl _wsystem(const wchar_t*); #endif /* _WPROCESS_DEFINED */ -#ifndef _WSTDLIB_DEFINED -#define _WSTDLIB_DEFINED -wchar_t* __cdecl _itow(int,wchar_t*,int); -errno_t __cdecl _itow_s(int,wchar_t*,int, int); -wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); -errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); -errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); -wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); -errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); -errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); -wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); -wchar_t* __cdecl _wgetenv(const wchar_t*); -void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -void __cdecl _wperror(const wchar_t*); -int __cdecl _wputenv(const wchar_t*); -void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); -void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); -errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, - wchar_t*,size_t,wchar_t*,size_t); -int __cdecl _wsystem(const wchar_t*); -double __cdecl _wtof(const wchar_t*); -int __cdecl _wtoi(const wchar_t*); -__int64 __cdecl _wtoi64(const wchar_t*); -__msvcrt_long __cdecl _wtol(const wchar_t*); - -size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); -errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); -int __cdecl mbtowc(wchar_t*,const char*,size_t); -float __cdecl wcstof(const wchar_t*,wchar_t**); -double __cdecl wcstod(const wchar_t*,wchar_t**); -__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); -size_t __cdecl wcstombs(char*,const wchar_t*,size_t); -errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); -__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); -int __cdecl wctomb(char*,wchar_t); -#endif /* _WSTDLIB_DEFINED */ - #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED int __cdecl _wcscoll_l(const wchar_t*,const wchar_t*,_locale_t);

1 0

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

24 Feb '20

Module: wine Branch: master Commit: 2a33bacc039fc5d858c9509105924895fa15d680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a33bacc039fc5d858c95091… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:34:37 2020 +0100 corecrt_wstdio.h: Add ucrt swprintf_s and vswprintf_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 d0d8ed952c..5b751b47f9 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -78,11 +78,9 @@ wchar_t* __cdecl getws(wchar_t*); wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); -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 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); int WINAPIV wprintf(const wchar_t*,...); @@ -97,6 +95,7 @@ _ACRTIMP int __cdecl __stdio_common_vfwprintf_s(unsigned __int64,FILE*,const wch _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); +_ACRTIMP int __cdecl __stdio_common_vswprintf_s(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); @@ -168,6 +167,23 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) return ret < 0 ? -1 : ret; } +static inline int WINAPIV vswprintf_s(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV swprintf_s(wchar_t *buffer, size_t size, const wchar_t* format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + __ms_va_end(args); + return 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, @@ -288,6 +304,8 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * _ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); +_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); +_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); #endif /* _UCRT */

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

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

← Newer
1
...
10
11
12
13
14
15
16
...
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