June 2014 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/lib: Add a utility function to atomically create a new hardlink.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: d6106d599f6ca314d4f4f8775987079ba9f262f0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6106d599f6ca314d4f4f877… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 16:11:12 2014 +0200 testbot/lib: Add a utility function to atomically create a new hardlink. It ensures there are no race conditions with other processes and simplifies the calling code. --- testbot/lib/WineTestBot/Patches.pm | 11 ++++------- testbot/lib/WineTestBot/Utils.pm | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index bb7ea3f..98cc6c2 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -33,6 +33,8 @@ linked to this patch through a WineTestBot::PendingPatch object. =cut use Encode qw/decode/; +use File::Basename; + use WineTestBot::Config; use WineTestBot::PendingPatchSets; use WineTestBot::Jobs; @@ -206,13 +208,8 @@ sub Submit my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); # Create a link to the patch file in the staging dir - my $FileNameRandomPart = GenerateRandomString(32); - while (-e ("$DataDir/staging/${FileNameRandomPart}_patch.diff")) - { - $FileNameRandomPart = GenerateRandomString(32); - } - link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch.diff"; - $NewStep->FileName($FileNameRandomPart . "_patch.diff"); + my $StagingFileName = CreateNewLink($PatchFileName, "$DataDir/staging", "_patch.diff"); + $NewStep->FileName(basename($StagingFileName)); my @Keys = keys %{$Targets{$BaseName}}; $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); $NewStep->InStaging(1); diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index f05c7dc..1cea5d7 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &BuildEMailRecipient); + &OpenNewFile &CreateNewFile &CreateNewLink &BuildEMailRecipient); sub MakeSecureURL($) { @@ -91,6 +91,20 @@ sub CreateNewFile($$) return $FileName; } +sub CreateNewLink($$$) +{ + my ($OldFileName, $Dir, $Suffix) = @_; + + while (1) + { + my $Link = "$Dir/" . GenerateRandomString(32) . $Suffix; + return $Link if (link $OldFileName, $Link); + + # This is not an error that will be fixed by trying a different path + return undef if (!$!{EEXIST}); + } +} + sub DateTimeToString($) { my ($Time) = @_;

1 0

Francois Gouget : testbot/lib: Improve the Collection methods argument handling.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: 96e7f4369df0d967b5c6f0af09dffeb8dc149e9f URL: http://source.winehq.org/git/tools.git/?a=commit;h=96e7f4369df0d967b5c6f0af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 12:18:28 2014 +0200 testbot/lib: Improve the Collection methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/Collection.pm | 131 ++++++++++++++++++--------------- testbot/lib/ObjectModel/Item.pm | 92 +++++++++++------------ 2 files changed, 114 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=96e7f4369df0d967b5c6…

1 0

Francois Gouget : testbot/lib: Add utility functions to atomically create new files.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: e803a3fa8270cb2eff0f2be5844ee263d66b62db URL: http://source.winehq.org/git/tools.git/?a=commit;h=e803a3fa8270cb2eff0f2be5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 16:10:48 2014 +0200 testbot/lib: Add utility functions to atomically create new files. These ensure there are no race conditions with other processes. They also simplify the calling code. --- testbot/bin/CheckForWinetestUpdate.pl | 36 ++++++++++++--------------- testbot/bin/WinePatchesMLSubmit.pl | 14 ++++++----- testbot/lib/WineTestBot/PendingPatchSets.pm | 27 ++++++-------------- testbot/lib/WineTestBot/Utils.pm | 28 ++++++++++++++++++++- testbot/web/Submit.pl | 17 ++++++------- 5 files changed, 65 insertions(+), 57 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 17b75d0..3bedd88 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -38,6 +38,7 @@ sub BEGIN } use Fcntl; +use File::Basename; use File::Compare; use File::Copy; use LWP::UserAgent; @@ -65,17 +66,20 @@ sub AddJob($$$) my ($BaseJob, $LatestBaseName, $Bits) = @_; # Create a copy in staging so it can then be moved into the job directory - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName") + my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); + if (!$fh) { - $FileNameRandomPart = GenerateRandomString(32); + LogMsg "Could not create the staging file: $!\n"; + return 0; } - my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName"; - if (!copy("$DataDir/latest/$LatestBaseName", $StagingFileName)) + if (!copy("$DataDir/latest/$LatestBaseName", $fh)) { LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; + close($fh); + unlink($StagingFileName); return 0; } + close($fh); # First create a new job my $Jobs = CreateJobs(); @@ -91,7 +95,7 @@ sub AddJob($$$) my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart}_$LatestBaseName"); + $NewStep->FileName(basename($StagingFileName)); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); @@ -219,24 +223,16 @@ if ($Response->code != RC_OK) # put it in the jobs directory tree. umask 002; mkdir "$DataDir/staging"; -my $FileNameRandomPart = GenerateRandomString(32); -while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") +my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); +if (!$fh) { - $FileNameRandomPart = GenerateRandomString(32); + LogMsg "Could not create staging file: $!\n"; + exit 1; } -my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; +print $fh $Response->decoded_content(); +close($fh); my $NewFile = 1; -if (open(my $fh, ">", $StagingFileName)) -{ - print $fh $Response->decoded_content(); - close($fh); -} -else -{ - LogMsg "Could not create staging file '$StagingFileName': $!\n"; - exit 1; -} if (-r $LatestFileName) { $NewFile = compare($StagingFileName, $LatestFileName) != 0; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index e904bbc..359e4c0 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -44,17 +44,19 @@ use WineTestBot::Engine::Notify; use WineTestBot::Log; # Store the message in the staging dir -my $FileName = GenerateRandomString(32) . "_wine-patches"; -while (-e ("$DataDir/staging/$FileName")) +my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_wine-patches"); +if (!$fh) { - $FileName = GenerateRandomString(32); + LogMsg "Could not create a staging file: $!\n"; + exit 1; } -if (!copy(\*STDIN, "$DataDir/staging/$FileName")) +if (!copy(\*STDIN, $fh)) { - LogMsg "Unable to copy the email to '$FileName': $!\n"; + LogMsg "Could not copy the email to '$FileName': $!\n"; + close($fh); exit 1; } - +close($fh); # Notify the Engine of the new message my $ErrMessage = WinePatchMLSubmission(); diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 4f908b5..7a837db 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -107,34 +107,21 @@ sub SubmitSubset my $self = shift; my ($MaxPart, $FinalPatch) = @_; - my $CombinedFileName = "$DataDir/staging/" . GenerateRandomString(32) . - "_patch"; - while (-e $CombinedFileName) - { - $CombinedFileName = "$DataDir/staging/" . GenerateRandomString(32) . - "_patch"; - } - - if (! open(COMBINED, ">$CombinedFileName")) - { - return "Can't create combined patch file"; - } + my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch"); + return "Could not create a combined patch file: $!" if (!$CombinedFile); my $Parts = $self->Parts; for (my $PartNo = 1; $PartNo <= $MaxPart; $PartNo++) { my $Part = $Parts->GetItem($PartNo); - if (defined($Part)) + if (defined $Part and + open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { - if (open(PART, "<$DataDir/patches/" . $Part->Patch->Id)) - { - print COMBINED <PART>; - close(PART); - } + map { print $CombinedFile $_; } <$PartFile>; + close($PartFile); } } - - close(COMBINED); + close($CombinedFile); my $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); unlink($CombinedFileName); diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 1084abd..f05c7dc 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -24,6 +24,8 @@ WineTestBot::Utils - Utility functions =cut +use Fcntl; + use WineTestBot::Config; use vars qw (@ISA @EXPORT); @@ -31,7 +33,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &BuildEMailRecipient); + &OpenNewFile &CreateNewFile &BuildEMailRecipient); sub MakeSecureURL($) { @@ -65,6 +67,30 @@ sub GenerateRandomString($) return substr($RandomString, 0, $Len); } +sub OpenNewFile($$) +{ + my ($Dir, $Suffix) = @_; + + while (1) + { + my $fh; + my $FileName = "$Dir/" . GenerateRandomString(32) . $Suffix; + return ($fh, $FileName) if (sysopen($fh, $FileName, O_CREAT | O_EXCL | O_WRONLY)); + + # This is not an error that will be fixed by trying a different filename + return (undef, undef) if (!$!{EEXIST}); + } +} + +sub CreateNewFile($$) +{ + my ($Dir, $Suffix) = @_; + + my ($fh, $FileName) = OpenNewFile($Dir, $Suffix); + close($fh) if ($fh); + return $FileName; +} + sub DateTimeToString($) { my ($Time) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index c760446..823be4b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,20 +792,17 @@ sub OnSubmit($) # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. my $BaseName = $self->GetParam("FileName"); - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_$BaseName") - { - $FileNameRandomPart = GenerateRandomString(32); - } - my $StagingFileName = "${FileNameRandomPart}_$BaseName"; + my $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - if (!rename($TmpStagingFullPath, "$DataDir/staging/$StagingFileName")) + if ($StagingFileName and !rename($TmpStagingFullPath, $StagingFileName)) { - # Use the existing staging file and hope for the best. - $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$DataDir/staging/$StagingFileName': $!"; - $StagingFileName = basename($TmpStagingFullPath); + $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$StagingFileName': $!\n"; + unlink($StagingFileName); + $StagingFileName = undef; } + # If needed fall back to the existing staging file and hope for the best. + $StagingFileName = basename($StagingFileName || $TmpStagingFullPath); # See also Patches::Submit() in lib/WineTestBot/Patches.pm

1 0

Francois Gouget : testbot/WineRunTask: Standardize handling of WineRunTask 's arguments and add prototypes.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: 12189400e6a39e8cef0dd21443a51b7fabdd9bb8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12189400e6a39e8cef0dd214… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 12:18:19 2014 +0200 testbot/WineRunTask: Standardize handling of WineRunTask's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The prototypes also document which arguments are optional. --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2413a76..86073e6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -88,7 +88,7 @@ sub FatalError($$$$$) exit 1; } -sub TakeScreenshot +sub TakeScreenshot($$) { my ($VM, $FullScreenshotFileName) = @_; @@ -111,9 +111,9 @@ sub TakeScreenshot } } -sub CountFailures +sub CountFailures($) { - my $ReportFileName = $_[0]; + my ($ReportFileName) = @_; if (! open REPORTFILE, "<$ReportFileName") {

1 0

Akihiro Sagawa : winmm: Memory file buffer is available even if we just allocate memory.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: c4629e5af549e7e30a8573b00d9e420f86e33e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4629e5af549e7e30a8573b00… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:23 2014 +0900 winmm: Memory file buffer is available even if we just allocate memory. --- dlls/winmm/mmio.c | 5 +---- dlls/winmm/tests/mmio.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c8f3745..8521b87 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -574,7 +574,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, wm->info.pchEndRead = wm->info.pchBuffer; wm->info.pchEndWrite = wm->info.pchBuffer + cchBuffer; wm->info.lBufOffset = wm->info.lDiskOffset; - wm->bBufferLoaded = FALSE; + wm->bBufferLoaded = (wm->info.fccIOProc == FOURCC_MEM); return MMSYSERR_NOERROR; } @@ -660,9 +660,6 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, goto error1; } - if (wm->info.fccIOProc == FOURCC_MEM && !(wm->info.dwFlags & MMIO_ALLOCBUF)) - wm->bBufferLoaded = TRUE; - /* see mmioDosIOProc for that one */ memcpy( wm->info.adwInfo, refmminfo->adwInfo, sizeof(wm->info.adwInfo) ); diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0853b8f..71efc5d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -347,10 +347,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -408,10 +405,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -440,10 +434,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -607,10 +598,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); }

1 0

Akihiro Sagawa : winmm/tests: Activate some mmioSeek tests with todo_wine keyword.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 09a1f81cb4edfda01fdbc2367d37adfd902f7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a1f81cb4edfda01fdbc2367… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:21 2014 +0900 winmm/tests: Activate some mmioSeek tests with todo_wine keyword. --- dlls/winmm/tests/mmio.c | 59 ++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 05e8952..0853b8f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -314,10 +314,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -345,10 +346,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -405,10 +407,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -436,10 +439,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -532,15 +536,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, NULL, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -556,15 +559,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, buf, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -580,15 +582,11 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); ok(ret == 0, "expected 0, got %d\n", ret); -#endif ret = mmioSetBuffer(hmmio, NULL, 256, MMIO_WRITE|MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -605,15 +603,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", buf, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); }

1 0

Shuai Meng : vbscript: Implemented CSng.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d8135b8243e72a6a1d5db3aac742fe20996baf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8135b8243e72a6a1d5db3aac… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jun 13 22:30:29 2014 +0800 vbscript: Implemented CSng. --- dlls/vbscript/global.c | 19 +++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 294004b..5160374 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -514,8 +514,23 @@ static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + + *res = v; + return S_OK; } static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2aad761..2cf9bb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -797,4 +797,52 @@ MyObject.myval = 1.5 Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +Sub testCSngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CSng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CSng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CSng(Empty) = 0, "CSng(Empty) = " & CSng(Empty)) +Call ok(getVT(CSng(Empty)) = "VT_R4", "getVT(CSng(Empty)) = " & getVT(CSng(Empty))) +Call ok(CSng(CByte(0)) = 0, "CSng(CByte(0)) = " & CSng(CByte(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(CCur(0)) = 0, "CSng(CCur(0)) = " & CSng(CCur(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(0) = 0, "CSng(0) = " & CSng(0)) +Call ok(getVT(CSng(0)) = "VT_R4", "getVT(CSng(0)) = " & getVT(CSng(0))) +Call ok(CSng(32768) = 32768, "CSng(32768) = " & CSng(32768)) +Call ok(getVT(CSng(32768)) = "VT_R4", "getVT(CSng(32768)) = " & getVT(CSng(32768))) +Call ok(CSng(0.001 * 0.001) = 0.000001, "CSng(0.001 * 0.001) = " & CSng(0.001 * 0.001)) +Call ok(getVT(CSng(0.001 * 0.001)) = "VT_R4", "getVT(CSng(0.001 * 0.001)) = " & getVT(CSng(0.001 * 0.001))) +Call ok(CSng("-1") = -1, "CSng(""-1"") = " & CSng("-1")) +Call ok(getVT(CSng("-1")) = "VT_R4", "getVT(CSng(""-1"")) = " & getVT(CSng("-1"))) +If isEnglishLang Then + Call ok(CSng("-0.5") = -0.5, "CSng(""-0.5"") = " & CSng("-0.5")) + Call ok(getVT(CSng("-0.5")) = "VT_R4", "getVT(CSng(""-0.5"")) = " & getVT(CSng("-0.5"))) +End If +Call testCSngError("", 13, 13) +Call testCSngError("TRUE", 13, 13) +Call testCSngError("FALSE", 13, 13) +Call testCSngError("#TRue#", 13, 13) +Call testCSngError("#fAlSE#", 13, 13) +Call testCSngError(1, 0, 458) +Call ok(CSng(True) = -1, "CSng(True) = " & CSng(True)) +Call ok(getVT(CSng(True)) = "VT_R4", "getVT(CSng(True)) = " & getVT(CSng(True))) +Call ok(CSng(False) = 0, "CSng(False) = " & CSng(False)) +Call ok(getVT(CSng(False)) = "VT_R4", "getVT(CSng(False)) = " & getVT(CSng(False))) +MyObject.myval = 0.1 +Call ok(CSng(MyObject) = 0.1, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +MyObject.myval = 0 +Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 0188c12..56361bf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -167,6 +167,8 @@ static const char *vt2a(VARIANT *v) return "VT_I2"; case VT_I4: return "VT_I4"; + case VT_R4: + return "VT_R4"; case VT_R8: return "VT_R8"; case VT_CY:

1 0

Matteo Bruni : d3d9/tests: Test GetData behavior with various size values.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 71628208454d193e9d86713bdf8ddd58c156fc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71628208454d193e9d86713bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 13 15:08:50 2014 +0200 d3d9/tests: Test GetData behavior with various size values. --- dlls/d3d9/tests/device.c | 137 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 110 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71628208454d193e9d867…

1 0

Bruno Jesus : ws2_32: Don't call WS_EnterSingleProtocol[A|W] on unsupported protocols (valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 6f47a9d9d83ff53d486cf3c163feb7df7f4bfcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f47a9d9d83ff53d486cf3c16… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 18:54:54 2014 -0300 ws2_32: Don't call WS_EnterSingleProtocol[A|W] on unsupported protocols (valgrind). --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e31f396..10857dc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1822,6 +1822,7 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I for (i = items = 0; protocols[i]; i++) { + if (!supported_protocol(protocols[i])) continue; if (unicode) { if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ))

1 0

Vincent Povirk : windowscodecs: Support InterlaceOption in PNG encoder.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 3ccaad8b41fe9514b95aa7610a1b33bb745b3c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccaad8b41fe9514b95aa7610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 15:04:00 2014 -0500 windowscodecs: Support InterlaceOption in PNG encoder. --- dlls/windowscodecs/pngformat.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index bd5cd3d..6950c07 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; + static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { BYTE header[8]; @@ -1060,6 +1062,7 @@ typedef struct PngEncoder { BOOL frame_committed; BOOL committed; CRITICAL_SECTION lock; + BOOL interlace; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1111,8 +1114,32 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + BOOL interlace; + PROPBAG2 opts[1]= {{0}}; + VARIANT opt_values[1]; + HRESULT opt_hres[1]; + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + + if (pIEncoderOptions) + { + hr = IPropertyBag2_Read(pIEncoderOptions, 1, opts, NULL, opt_values, opt_hres); + + if (FAILED(hr)) + return hr; + } + else + memset(opt_values, sizeof(opt_values), 0); + + if (V_VT(&opt_values[0]) == VT_EMPTY) + interlace = FALSE; + else + interlace = (V_BOOL(&opt_values[0]) != 0); + EnterCriticalSection(&This->lock); if (This->frame_initialized) @@ -1121,6 +1148,8 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, return WINCODEC_ERR_WRONGSTATE; } + This->interlace = interlace; + This->frame_initialized = TRUE; LeaveCriticalSection(&This->lock); @@ -1259,7 +1288,8 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, if (!This->info_written) { ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, - This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + This->format->bit_depth, This->format->color_type, + This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); if (This->xres != 0.0 && This->yres != 0.0) @@ -1548,6 +1578,8 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[1]= {{0}}; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); EnterCriticalSection(&This->lock); @@ -1564,7 +1596,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + opts[0].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 1, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0