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

Francois Gouget : testbot: Add prototypes to the Perl utility functions.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 6518eb604c1b118d523b22cc649d8b82cff06f5f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6518eb604c1b118d523b22cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:05:52 2014 +0200 testbot: Add prototypes to the Perl utility functions. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. Also standardize the way we retrieve their arguments. --- testbot/lib/WineTestBot/Utils.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index acfabb5..1084abd 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,9 +33,9 @@ require Exporter; @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &BuildEMailRecipient); -sub MakeSecureURL +sub MakeSecureURL($) { - my $URL = shift; + my ($URL) = @_; my $Protocol = "http"; if ($UseSSL || SecureConnection()) @@ -46,14 +46,14 @@ sub MakeSecureURL return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; } -sub SecureConnection +sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } -sub GenerateRandomString +sub GenerateRandomString($) { - my $Len = $_[0]; + my ($Len) = @_; my $RandomString = ""; while (length($RandomString) < $Len) @@ -65,15 +65,15 @@ sub GenerateRandomString return substr($RandomString, 0, $Len); } -sub DateTimeToString +sub DateTimeToString($) { - my $Time = $_[0]; + my ($Time) = @_; # my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); } -sub BuildEMailRecipient +sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_;

1 0

Francois Gouget : testbot/Janitor: Check and clean up the staging directory.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: cc218ea2c267f2aee508b5d9ed26a9886b29302f URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc218ea2c267f2aee508b5d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:21:36 2014 +0200 testbot/Janitor: Check and clean up the staging directory. Purge unsubmitted jobs (web/Submit.pl) as soon as they are a day old. There should be no file older than $JobPurgeDays. Report them so they are investigated and delete them after a 7 days grace period. Detect unknown files and report them so their source can be investigated. --- testbot/bin/Janitor.pl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index b195dff..24b2b28 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -214,3 +214,54 @@ if (%DeletedUsers or %DeletedVMs) } } } + +# Check the content of the staging directory +if (opendir(my $dh, "$DataDir/staging")) +{ + # We will be deleting files so read the directory in one go + my @Entries = readdir($dh); + close($dh); + foreach my $Entry (@Entries) + { + next if ($Entry eq "." or $Entry eq ".."); + $Entry =~ m%^([^/]+)$%; + my $FileName = "$DataDir/staging/$1"; + my $Age = int((-M $FileName) + 0.5); + + if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) + { + if ($Age >= 1 and !unlink $FileName) + { + # The user abandonned the submit procedure half-way + LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); + } + } + else + { + if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) + { + LogMsg "Found a suspicious staging file: $Entry\n"; + } + + if ($JobPurgeDays != 0) + { + if ($Age >= $JobPurgeDays + 7) + { + if ((-d $FileName and !rmtree($FileName)) or + !unlink($FileName)) + { + LogMsg "Could not delete '$FileName': $!\n"; + } + } + elsif ($Age > $JobPurgeDays) + { + LogMsg "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; + } + } + } + } +} +else +{ + LogMsg "0Unable to open '$DataDir/staging': $!"; +}

1 0

Francois Gouget : testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 261fcf10d4d16b2c85ec5bb225733ef1b3ece485 URL: http://source.winehq.org/git/tools.git/?a=commit;h=261fcf10d4d16b2c85ec5bb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:59 2014 +0200 testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments. Although Item::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. Similarly, although Item::InitializeNew() does not currently use its Collection argument, subclasses should not assume so. --- testbot/lib/ObjectModel/Collection.pm | 3 ++- testbot/lib/ObjectModel/Item.pm | 3 ++- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 4 ++-- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a356990..7dbcf63 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -102,7 +102,8 @@ sub new sub _initialize { - my ($self) = @_; + # $MasterObject may be required for some Collections. + my ($self, $MasterObject) = @_; $self->{AllScopeItems}->{ref($self)} ||= {}; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 47aea03..0cc07ab 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -72,11 +72,12 @@ sub new sub _initialize { + #my ($self, $Collection) = @_; } sub InitializeNew { - my $self = shift; + my ($self, $_Collection) = @_; $self->{IsModified} = !1; } diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 0b37e89..f434569 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -35,10 +35,10 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->IsDefault(!1); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } package WineTestBot::Branches; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index a053036..3fbef8a 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -36,9 +36,9 @@ use vars qw(@ISA @EXPORT); sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); $self->Permanent(!1); } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4532d4e..60241e0 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -62,23 +62,23 @@ require Exporter; sub _initialize { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Collection); $self->{OldStatus} = undef; } sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Archived(!1); $self->Branch(CreateBranches()->GetDefaultBranch()); $self->Status("queued"); $self->Submitted(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub Status diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 70c47f7..bb7ea3f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -49,11 +49,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Received(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index e937866..2a7ee35 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -53,7 +53,7 @@ sub InitializeNew $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub HandleStaging diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8a29196..a5facda 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -120,7 +120,7 @@ sub _initialize my $self = shift; my $Job = $_[0]; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Job); foreach my $Step (@{$Job->Steps->GetItems()}) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index dd22749..02dd220 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -54,7 +54,7 @@ sub InitializeNew my $Keys = $Collection->GetKeys(); $self->No(scalar @$Keys + 1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 46828a3..047e5d7 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -40,11 +40,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status('active'); $self->Password("*"); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub GeneratePasswordHash diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0aa06eb..e4a5a59 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -223,6 +223,8 @@ sub _initialize($$) { my ($self, $VMs) = @_; + $self->SUPER::_initialize($VMs); + $self->{Hypervisors} = $VMs->{Hypervisors}; $self->{Hypervisor} = undef; $self->{Domain} = undef; @@ -231,12 +233,12 @@ sub _initialize($$) sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status("idle"); $self->IdleSnapshot("wtb"); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub GetHost($)

1 0

Francois Gouget : testbot/web: Make sure Page::_initialize() is always called, with the right arguments.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: df51375c707cd94119417f68e55cfe9b610ce21a URL: http://source.winehq.org/git/tools.git/?a=commit;h=df51375c707cd94119417f68… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:40 2014 +0200 testbot/web: Make sure Page::_initialize() is always called, with the right arguments. Although Page::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 ++--- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 5 +++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/web/Feedback.pl | 4 ++-- testbot/web/ForgotPassword.pl | 4 ++-- testbot/web/Login.pl | 4 ++-- testbot/web/Logout.pl | 4 +++- testbot/web/ResetPassword.pl | 4 ++-- testbot/web/Submit.pl | 4 ++-- testbot/web/index.pl | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c9dfb04..0bf8694 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -36,10 +36,9 @@ require Exporter; sub _initialize { - my $self = shift; - my $PropertyDescriptors = shift; + my ($self, $Request, $RequiredRole, $PropertyDescriptors) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 16736fe..46925f3 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -42,7 +42,7 @@ sub _initialize $self->{Collection} = $Collection; - $self->SUPER::_initialize($Collection->GetPropertyDescriptors(), @_); + $self->SUPER::_initialize($Request, $RequiredRole, $Collection->GetPropertyDescriptors()); if (defined($self->GetParam("Key"))) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 331243c..8bbd1ae 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -37,7 +37,7 @@ require Exporter; sub new { my $class = shift; - my $Request = $_[0]; + my ($Request, $RequiredRole) = @_; my $self = {Request => $Request, CGIObj => CGI->new($Request), @@ -45,12 +45,13 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize(@_); + $self->_initialize($Request, $RequiredRole); return $self; } sub _initialize { + #my ($self, $Request, $RequiredRole) = @_; } sub GetParam diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 7e12e80..7d75c5e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -68,6 +68,7 @@ sub new sub _initialize { + #my ($self, $Page, $Request, $RequiredRole) = @_; } sub CheckSecurePage diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index c266ce4..b923c11 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -29,7 +29,7 @@ use WineTestBot::Config; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), @@ -37,7 +37,7 @@ sub _initialize CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); my $Session = $self->GetCurrentSession(); if (defined($Session)) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index a22d441..dc35a2b 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -39,7 +39,7 @@ sub _initialize CreateBasicPropertyDescriptor("Name", "Username or EMail", 1, 1, "A", 40), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 4002948..e6a4945 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -32,7 +32,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("AutoLogin", "Log me in automatically each visit", !1, !1, "B", 1), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 696bb95..24d3ac3 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -29,7 +29,9 @@ use CGI::Cookie; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole); $self->{WasLoggedIn} = undef; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index dff05cf..73a7258 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("Password2", "Password (repeat)", !1, 1, "A", 32), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 695ba76..03b9af2 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -39,7 +39,7 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; @@ -62,7 +62,7 @@ sub _initialize $self->{ShowAll} = defined($self->GetParam("ShowAll")); } - $self->SUPER::_initialize(undef); + $self->SUPER::_initialize($Request, $RequiredRole, undef); } sub GetTitle diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d0ba188..25f5e0e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -194,9 +194,9 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); } sub OutputDot

1 0

Francois Gouget : testbot/web: Make it easier to identify Submit' s temporary staging files.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 79460be9dd65f78183c9291d574cac2313e798f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=79460be9dd65f78183c9291d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:21:15 2014 +0200 testbot/web: Make it easier to identify Submit's temporary staging files. It also ensures that GetTmpStagingFullPath() won't get a collision between the session id and the random part of an existing staging file, no matter what filename the user picks. Finally, this will make it possible to better check the content of the staging directory. --- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/web/Submit.pl | 38 ++++++++++++++++++-------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0431bc0..e937866 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -67,7 +67,7 @@ sub HandleStaging } my $FileName = $self->FileName; - if ($FileName !~ m/^[0-9a-f]+_(.*)$/) + if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) { return "Can't split staging filename"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 574c160..695ba76 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -24,6 +24,8 @@ use CGI qw(:standard); use Fcntl; use IO::Handle; use POSIX qw(:fcntl_h); +use File::Basename; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Branches; @@ -430,17 +432,13 @@ sub GetPropertyValue return $self->SUPER::GetPropertyValue(@_); } -sub GetStagingFileName +sub GetTmpStagingFullPath { my $self = shift; my $FileName = $_[0]; - if (! $FileName) - { - return undef; - } - - return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "_$FileName"; + return undef if (!$FileName); + return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "-websubmit_$FileName"; } sub Validate @@ -666,7 +664,7 @@ sub OnPage1Next $self->{ErrMessage} = "File: Name is too long"; return !1; } - my $StagingFile = $self->GetStagingFileName($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($FileName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -756,7 +754,7 @@ sub OnPage2Prev { my $self = shift; - my $StagingFileName = $self->GetStagingFileName($self->GetParam("FileName")); + my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); if ($StagingFileName) { unlink($StagingFileName); @@ -796,20 +794,20 @@ sub OnSubmit # IDs are known and it can be moved to the jobs directory tree. But rename # 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}_" . - $self->GetParam("FileName"))) + while (-e "$DataDir/staging/${FileNameRandomPart}_$BaseName") { $FileNameRandomPart = GenerateRandomString(32); } - if (! rename("$DataDir/staging/" . $self->GetCurrentSession()->Id . "_" . - $self->GetParam("FileName"), - "$DataDir/staging/${FileNameRandomPart}_" . - $self->GetParam("FileName"))) + my $StagingFileName = "${FileNameRandomPart}_$BaseName"; + + my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); + if (!rename($TmpStagingFullPath, "$DataDir/staging/$StagingFileName")) { - # Can't give the file a unique name. Maybe we're lucky and using the - # session id works - $FileNameRandomPart = $self->GetCurrentSession()->Id; + # Use the existing staging file and hope for the best. + $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$DataDir/staging/$StagingFileName': $!"; + $StagingFileName = basename($TmpStagingFullPath); } # See also Patches::Submit() in lib/WineTestBot/Patches.pm @@ -839,7 +837,7 @@ sub OnSubmit { # This is a patch so add a build step... my $BuildStep = $Steps->Add(); - $BuildStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); + $BuildStep->FileName($StagingFileName); $BuildStep->FileType($FileType); $BuildStep->InStaging(1); $BuildStep->Type("build"); @@ -888,7 +886,7 @@ sub OnSubmit } else { - $TestStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); + $TestStep->FileName($StagingFileName); $TestStep->InStaging(1); } $TestStep->FileType("exe$Bits");

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Improve error handling and plug staging file leaks.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: ed692db13e0b97d4b535fadae700d51fe45aa695 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ed692db13e0b97d4b535fada… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:19:57 2014 +0200 testbot/CheckForWinetestUpdate: Improve error handling and plug staging file leaks. The leaks would happen whenever there was no non-base VM, no 64-bit VM, or CheckForWinetestUpdate would exit prematurely due to an error. Also let AddJob() handle the staging file. This greatly simplifies the calling code. Finally, fix the indentation in a couple of places. --- testbot/bin/CheckForWinetestUpdate.pl | 167 ++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 78 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index df3c63e..4eb2555 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -44,6 +44,7 @@ use LWP::UserAgent; use HTTP::Request; use HTTP::Response; use HTTP::Status; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Users; @@ -52,9 +53,29 @@ use WineTestBot::Utils; use WineTestBot::VMs; use WineTestBot::Engine::Notify; + +my %WineTestUrls = ( + 32 => "http://test.winehq.org/builds/winetest-latest.exe", + 64 => "http://test.winehq.org/builds/winetest64-latest.exe" +); + + sub AddJob { - my ($BaseJob, $FileNameRandomPart, $Bits) = @_; + 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") + { + $FileNameRandomPart = GenerateRandomString(32); + } + my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName"; + if (!copy("$DataDir/latest/$LatestBaseName", $StagingFileName)) + { + LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; + return 0; + } # First create a new job my $Jobs = CreateJobs(); @@ -62,7 +83,7 @@ sub AddJob $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); $NewJob->Remarks("WineTest: " . - ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . + ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . " VMs"); # Add a step to the job @@ -70,7 +91,7 @@ sub AddJob my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"); + $NewStep->FileName("${FileNameRandomPart}_$LatestBaseName"); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); @@ -80,18 +101,18 @@ sub AddJob my $VMs = CreateVMs(); if ($Bits == 64) { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); } elsif ($BaseJob) { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); } else { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { @@ -102,15 +123,21 @@ sub AddJob } # Now save the whole thing - if ($HasTasks) + if (!$HasTasks) + { + unlink($StagingFileName); + return 1; + } + + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) { - (my $ErrKey, my $ErrProperty, my $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - LogMsg "Failed to save job: $ErrMessage\n"; - exit 1; - } + LogMsg "Failed to save job: $ErrMessage\n"; + unlink($StagingFileName); + return 0; } + + return 1; } sub AddReconfigJob @@ -141,22 +168,18 @@ sub AddReconfigJob # Now save the whole thing my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) + if (defined $ErrMessage) { LogMsg "Failed to save reconfig job: $ErrMessage\n"; - exit 1; + return 0; } } -my $WINETEST32_URL = "http://test.winehq.org/builds/winetest-latest.exe"; -my $WINETEST64_URL = "http://test.winehq.org/builds/winetest64-latest.exe"; - my $Bits = $ARGV[0]; -if (! $Bits) +if (!$Bits) { die "Usage: CheckForWinetestUpdate.pl <bits>"; } - if ($Bits =~ m/^(32|64)$/) { $Bits = $1; @@ -165,30 +188,14 @@ else { die "Invalid number of bits $Bits"; } - -my $WinetestUrl = ($Bits == 64 ? $WINETEST64_URL : $WINETEST32_URL); my $BitsSuffix = ($Bits == 64 ? "64" : ""); -umask 002; -mkdir "$DataDir/latest"; -mkdir "$DataDir/staging"; - -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# check that it is truly new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -my $FileNameRandomPart = GenerateRandomString(32); -while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") -{ - $FileNameRandomPart = GenerateRandomString(32); -} -my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; - +# Download the winetest executable if new my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); +my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; +my $LatestFileName = "$DataDir/latest/$LatestBaseName"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -202,60 +209,64 @@ if ($Response->code != RC_OK) LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; exit 1; } - exit; + exit 0; } +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# verify that it truly is new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# 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") +{ + $FileNameRandomPart = GenerateRandomString(32); +} +my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; + my $NewFile = 1; -if (! open STAGINGFILE, ">$StagingFileName") +if (open(my $fh, ">", $StagingFileName)) +{ + print $fh $Response->decoded_content(); + close($fh); +} +else { - LogMsg "Can't create staging file $StagingFileName: $!\n"; + LogMsg "Could not create staging file '$StagingFileName': $!\n"; exit 1; } -print STAGINGFILE $Response->decoded_content(); -close STAGINGFILE; if (-r $LatestFileName) { $NewFile = compare($StagingFileName, $LatestFileName) != 0; } -if (! $NewFile) +if (!$NewFile) { - unlink $StagingFileName; - exit; + # Nothing to do + unlink($StagingFileName); + exit 0; } -if (! copy($StagingFileName, $LatestFileName)) + +# Save the WineTest executable in the latest directory for the next round +mkdir "$DataDir/latest"; +if (!move($StagingFileName, $LatestFileName)) { - LogMsg "Can't copy $StagingFileName to $LatestFileName: $!\n"; + LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; } utime time, $Response->last_modified, $LatestFileName; -if ($Bits == 32) -{ - AddReconfigJob(); - AddJob(1, $FileNameRandomPart, $Bits); +# A new executable means there have been commits so update Wine. Create this +# job first purely to make the WineTestBot job queue look nice, and arbitrarily +# do it only for 32-bit executables to avoid redundant updates. +my $rc = 0; +$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - # Create another copy for the non-base VMs Job. - $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") - { - $FileNameRandomPart = GenerateRandomString(32); - } - $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (!copy($LatestFileName, $StagingFileName)) - { - LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; - } - else - { - AddJob(!1, $FileNameRandomPart, $Bits); - } -} -else -{ - AddJob(1, $FileNameRandomPart, $Bits); -} +$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); +$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit; +exit $rc;

1 0

Francois Gouget : testbot/RevertVM: Always pass the current VM to FatalError().
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 650414651caddff186c348913ee228b8594abbe0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=650414651caddff186c34891… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:06:17 2014 +0200 testbot/RevertVM: Always pass the current VM to FatalError(). Without this argument it devolves to a two line LogMsg()+exit() combination. --- testbot/bin/RevertVM.pl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 60a13f8..b2ae902 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -48,16 +48,14 @@ sub FatalError LogMsg $ErrMessage, "\n"; - if ($VM) - { - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - - my $VMKey = $VM->GetKey(); - my $VMSnapshot = $VM->IdleSnapshot; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + $VM->Status("offline"); + $VM->ChildPid(undef); + $VM->Save(); + + my $VMKey = $VM->GetKey(); + my $VMSnapshot = $VM->IdleSnapshot; + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + print SENDMAIL <<"EOF"; From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline @@ -68,8 +66,7 @@ $ErrMessage The VM has been put offline. EOF - close(SENDMAIL); - } + close(SENDMAIL); exit 1; } @@ -86,7 +83,8 @@ if (! $VMKey) my $VM = CreateVMs()->GetItem($VMKey); if (! defined($VM)) { - FatalError "VM $VMKey doesn't exist"; + LogMsg "VM $VMKey doesn't exist\n"; + exit 1; } LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; @@ -146,4 +144,4 @@ if (defined($ErrMessage)) LogMsg "Revert of $VMKey completed\n"; -exit; +exit 0;

1 0

Nikolay Sivov : xmllite/writer: Implement OmitXmlDeclaration property.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 9a2177ff538977d046fd998de03f1188b8669145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2177ff538977d046fd998de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 00:27:16 2014 +0400 xmllite/writer: Implement OmitXmlDeclaration property. --- dlls/xmllite/tests/writer.c | 94 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 20 +++++++-- 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d7cfe44..d617c43 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -312,6 +312,99 @@ static void test_flush(void) ok(g_write_len == 0, "got %d\n", g_write_len); } +static void test_omitxmldeclaration(void) +{ + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!ptr, "got %p\n", ptr); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -321,4 +414,5 @@ START_TEST(writer) test_writeroutput(); test_writestartdocument(); test_flush(); + test_omitxmldeclaration(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index de5f755..d1834b8 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -392,13 +392,23 @@ static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LO return S_OK; } -static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) +static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LONG_PTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %lu\n", This, nProperty, pValue); + TRACE("(%p)->(%s %lu)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + switch (property) + { + case XmlWriterProperty_OmitXmlDeclaration: + This->omitxmldecl = !!value; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *pReader, @@ -625,6 +635,9 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal ; } + This->state = XmlWriterState_DocStarted; + if (This->omitxmldecl) return S_OK; + /* version */ write_output_buffer(This->output, versionW, sizeof(versionW)/sizeof(WCHAR)); @@ -647,7 +660,6 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal write_output_buffer(This->output, noW, sizeof(noW)/sizeof(WCHAR)); } - This->state = XmlWriterState_DocStarted; return S_OK; }

1 0

Nikolay Sivov : netprofm: Added IConnectionPointContainer stub for INetworkListManager.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: e0e0af801eca60690aeb280de4fe53287822e18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e0af801eca60690aeb280de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 19 18:51:15 2014 +0400 netprofm: Added IConnectionPointContainer stub for INetworkListManager. --- dlls/netprofm/list.c | 59 +++++++++++++++++++++++++++++++++++++++++++- dlls/netprofm/tests/list.c | 6 +++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d5940f4..b9ab1cc 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" -#define COBJMACROS #include "initguid.h" #include "objbase.h" +#include "ocidl.h" #include "netlistmgr.h" #include "wine/debug.h" @@ -34,9 +36,15 @@ struct list_manager { INetworkListManager INetworkListManager_iface; INetworkCostManager INetworkCostManager_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; }; +static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); +} + static inline struct list_manager *impl_from_INetworkCostManager( INetworkCostManager *iface ) { @@ -147,6 +155,10 @@ static HRESULT WINAPI list_manager_QueryInterface( { *obj = &mgr->INetworkCostManager_iface; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *obj = &mgr->IConnectionPointContainer_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -285,6 +297,50 @@ static const INetworkListManagerVtbl list_manager_vtbl = list_manager_GetConnectivity }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_QueryInterface(&This->INetworkListManager_iface, riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_AddRef(&This->INetworkListManager_iface); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_Release(&This->INetworkListManager_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + FIXME("(%p)->(%p): stub\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **cp) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), cp); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl cpc_vtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT list_manager_create( void **obj ) { struct list_manager *mgr; @@ -294,6 +350,7 @@ HRESULT list_manager_create( void **obj ) if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; + mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl; mgr->refs = 1; *obj = &mgr->INetworkListManager_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 1619d06..ce4891a 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -21,11 +21,13 @@ #define COBJMACROS #include "initguid.h" #include "objbase.h" +#include "ocidl.h" #include "netlistmgr.h" #include "wine/test.h" static void test_INetworkListManager( void ) { + IConnectionPointContainer *cpc; INetworkListManager *mgr; INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; @@ -74,6 +76,10 @@ static void test_INetworkListManager( void ) INetworkCostManager_Release( cost_mgr ); } + hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); + ok( hr == S_OK, "got %08x\n", hr ); + IConnectionPointContainer_Release( cpc ); + INetworkListManager_Release( mgr ); }

1 0

Vincent Povirk : server: Clear the queue' s QS_SMRESULT bit when sending a new message.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 417585661c26af26bc3251cff8e628e04adbec80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=417585661c26af26bc3251cff… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 13 15:35:20 2014 -0500 server: Clear the queue's QS_SMRESULT bit when sending a new message. --- dlls/user32/tests/win.c | 2 +- server/queue.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a858f6b..cffceb3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7580,7 +7580,7 @@ static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARA /* Send another message while we have a reply queued for the current one. */ res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam); - todo_wine ok(res == 0x449b0190, "unexpected result %lx\n", res); + ok(res == 0x449b0190, "unexpected result %lx\n", res); return 0; } diff --git a/server/queue.c b/server/queue.c index 1954886..57603e1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -681,7 +681,11 @@ static struct message_result *alloc_message_result( struct msg_queue *send_queue result->callback_msg = callback_msg; list_add_head( &send_queue->callback_result, &result->sender_entry ); } - else if (send_queue) list_add_head( &send_queue->send_result, &result->sender_entry ); + else if (send_queue) + { + list_add_head( &send_queue->send_result, &result->sender_entry ); + clear_queue_bits( send_queue, QS_SMRESULT ); + } if (timeout != TIMEOUT_INFINITE) result->timeout = add_timeout_user( timeout, result_timeout, result ); @@ -2502,7 +2506,8 @@ DECL_HANDLER(get_message_reply) else { result = LIST_ENTRY( entry, struct message_result, sender_entry ); - if (!result->replied) clear_queue_bits( queue, QS_SMRESULT ); + if (result->replied) set_queue_bits( queue, QS_SMRESULT ); + else clear_queue_bits( queue, QS_SMRESULT ); } } }

1 0

Marcus Meissner : msxml3: Removed unused allocation (Coverity).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 2c984fc8e2400d6cbe01f720fdf9df9d284669c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c984fc8e2400d6cbe01f720f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:41 2014 +0200 msxml3: Removed unused allocation (Coverity). --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2b877a7..881679e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3046,8 +3046,6 @@ static void test_getElementsByTagName(void) ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); - str = SysAllocString( szstar ); - /* null arguments cases */ r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Henri Verbeet : wined3d: Recognize the SM4 discard opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: c81d3b7336e12e0f7031051097e972f5157c4972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81d3b7336e12e0f703105109… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:45 2014 +0200 wined3d: Recognize the SM4 discard opcode. --- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader_sm4.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d0f2b71..bce0097 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4073,6 +4073,8 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); if (ins->ctx->reg_maps->shader_version.major >= 2) { + if (ins->ctx->reg_maps->shader_version.major >= 4) + FIXME("SM4 discard not implemented.\n"); /* 2.0 shaders compare all 4 components in texkill */ shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); } else { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9a6131f..b001aad 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -78,6 +78,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, + WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, @@ -212,6 +213,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "F", "F"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, + {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"},

1 0

Nikolay Sivov : xmllite/writer: Implement ByteOrderMark property.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 086a1e370906b5cbb5df59edf96019bacd602ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a1e370906b5cbb5df59edf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 01:37:14 2014 +0400 xmllite/writer: Implement ByteOrderMark property. --- dlls/xmllite/tests/writer.c | 73 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 28 +++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d617c43..6800cd2 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -405,6 +405,78 @@ static void test_omitxmldeclaration(void) IXmlWriter_Release(writer); } +static void test_bom(void) +{ + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriterOutput *output; + unsigned char *ptr; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* BOM is on by default */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IUnknown_Release(output); + + /* start with PI */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IUnknown_Release(output); + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -415,4 +487,5 @@ START_TEST(writer) test_writestartdocument(); test_flush(); test_omitxmldeclaration(); + test_bom(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index d1834b8..a1f409c 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -78,6 +78,7 @@ typedef struct _xmlwriter BOOL omitxmldecl; XmlConformanceLevel conformance; XmlWriterState state; + BOOL bomwritten; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -272,6 +273,26 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) return S_OK; } +static HRESULT write_encoding_bom(xmlwriter *writer) +{ + if (!writer->bom || writer->bomwritten) return S_OK; + + if (writer->output->encoding == XmlEncoding_UTF16) { + static const char utf16bom[] = {0xff, 0xfe}; + struct output_buffer *buffer = &writer->output->buffer; + int len = sizeof(utf16bom); + HRESULT hr; + + hr = grow_output_buffer(writer->output, len); + if (FAILED(hr)) return hr; + memcpy(buffer->data + buffer->written, utf16bom, len); + buffer->written += len; + } + + writer->bomwritten = TRUE; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -329,6 +350,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; + This->bomwritten = FALSE; } /* just reset current output */ @@ -400,6 +422,9 @@ static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LO switch (property) { + case XmlWriterProperty_ByteOrderMark: + This->bom = !!value; + break; case XmlWriterProperty_OmitXmlDeclaration: This->omitxmldecl = !!value; break; @@ -574,6 +599,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP if (This->state == XmlWriterState_DocStarted && !strcmpW(name, xmlW)) return WR_E_INVALIDACTION; + write_encoding_bom(This); write_output_buffer(This->output, openpiW, sizeof(openpiW)/sizeof(WCHAR)); write_output_buffer(This->output, name, -1); write_output_buffer(This->output, spaceW, 1); @@ -635,6 +661,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal ; } + write_encoding_bom(This); This->state = XmlWriterState_DocStarted; if (This->omitxmldecl) return S_OK; @@ -833,6 +860,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->omitxmldecl = FALSE; writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; + writer->bomwritten = FALSE; *obj = &writer->IXmlWriter_iface;

1 0

Jacek Caban : urlmon: Fixed some occasionally failing tests.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 1687c5cd3a02adaed341de3d0d1812c38391c28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1687c5cd3a02adaed341de3d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 15:11:03 2014 +0200 urlmon: Fixed some occasionally failing tests. --- dlls/urlmon/tests/url.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8460000..5861127 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2810,6 +2810,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_ABORT_START 0x0400 #define BINDTEST_ABORT_PROGRESS 0x0800 #define BINDTEST_ASYNC_SWITCH 0x1000 +#define BINDTEST_ALLOW_FINDINGRESOURCE 0x2000 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2885,9 +2886,11 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) MSG msg; IBindStatusCallback *previousclb; IUnknown *unk = (IUnknown*)0x00ff00ff; + BOOL allow_finding_resource; IBinding *bind; init_bind_test(protocol, flags, t); + allow_finding_resource = (flags & BINDTEST_ALLOW_FINDINGRESOURCE) != 0; if(no_callback) { hres = CreateBindCtx(0, &bctx); @@ -2967,7 +2970,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); - if(http_is_first) + if(http_is_first || allow_finding_resource) SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } @@ -3125,6 +3128,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CLEAR_CALLED(OnProgress_CONNECTING); } }else if(!abort_start) { + if(allow_finding_resource) + CLEAR_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */ CLEAR_CALLED(OnProgress_CONNECTING); } @@ -3951,7 +3956,7 @@ START_TEST(url) test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (short response)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); @@ -3965,7 +3970,7 @@ START_TEST(url) test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); trace("http test (abort progress)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_FILE); trace("emulated http test...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM);

1 0

Hans Leidekker : wbemprox: Add a partial implementation of CIM_Processor.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: a6374aad413a0e68b5c4b1fb2f2baee532da6fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6374aad413a0e68b5c4b1fb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 20 15:33:13 2014 +0200 wbemprox: Add a partial implementation of CIM_Processor. --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1ca4137..ea54213 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -84,6 +84,8 @@ static const WCHAR class_process_getowner_outW[] = 'N','E','R','_','O','U','T',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_processor2W[] = + {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = @@ -2408,6 +2410,7 @@ static struct table builtin_classes[] = { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, + { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice },

1 0

Nikolay Sivov : scrrun: Return float type size when signed I4 limit exceeded.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: f82cb7003338f4614582d429fc68cc1a2ad87bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82cb7003338f4614582d429f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 15:17:24 2014 +0400 scrrun: Return float type size when signed I4 limit exceeded. --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 9412491..6473210 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,7 +892,7 @@ static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) { HRESULT hr = S_OK; - if (src->HighPart) + if (src->HighPart || src->LowPart > INT_MAX) { V_VT(v) = VT_R8; hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 61cadb9..c06b43d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <stdio.h> +#include <limits.h> #include "windows.h" #include "ole2.h" @@ -1296,7 +1297,7 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_R8(&size) > (double)INT_MAX, "got %f\n", V_R8(&size)); else ok(V_I4(&size) > 0, "got %d\n", V_I4(&size));

1 0

Piotr Caban : msvcp100: Export basic_istream::gcount function.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 48c9a90a81b44a7c158b2857488eea9870332cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c9a90a81b44a7c158b28574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 20 10:46:51 2014 +0200 msvcp100: Export basic_istream::gcount function. --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 12 ++++++------ dlls/msvcp90/ios.c | 10 ++++++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1dcbded..ab0b1d0 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1736,11 +1736,11 @@ @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=win32 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ stub -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ @ stub -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0527936..40f5577 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2433,14 +2433,14 @@ @ cdecl -arch=arm ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=i386 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ(ptr) basic_istream_char_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=arm ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=i386 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e8d4b06..d8f1e1c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7785,8 +7785,10 @@ static void basic_istream_char_sentry_destroy(basic_istream_char *istr) /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_char_gcount, 4) -int __thiscall basic_istream_char_gcount(const basic_istream_char *this) +streamsize __thiscall basic_istream_char_gcount(const basic_istream_char *this) { TRACE("(%p)\n", this); return this->count; @@ -9066,8 +9068,12 @@ static void basic_istream_wchar_sentry_destroy(basic_istream_wchar *istr) /* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_gcount, 4) -int __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) +streamsize __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) { TRACE("(%p)\n", this); return this->count;

1 0

Marcus Meissner : jsproxy: Avoid potential NULL dereference (Coverity).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 0dda8a14db8d83505670f1375966d35ed3c05ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dda8a14db8d83505670f1375… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:38 2014 +0200 jsproxy: Avoid potential NULL dereference (Coverity). --- dlls/jsproxy/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 4d02b07..0399173 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -103,8 +103,11 @@ static inline WCHAR *strdupAW( const char *src, DWORD len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); - dst[dst_len] = 0; + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + { + len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } } return dst; }

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp2 opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 3555eab8b9d18059ce0cb37b2595460164b4c1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3555eab8b9d18059ce0cb37b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:46 2014 +0200 wined3d: Recognize the SM4 dp2 opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 195c3ae..ecbaec6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5191,6 +5191,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DEFB */ shader_hw_nop, /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DP2 */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bce0097..84b638e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6650,6 +6650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ shader_glsl_binop, + /* WINED3DSIH_DP2 */ shader_glsl_dot, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a9b3d9f..05e7168 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", /* WINED3DSIH_DIV */ "div", + /* WINED3DSIH_DP2 */ "dp2", /* WINED3DSIH_DP2ADD */ "dp2add", /* WINED3DSIH_DP3 */ "dp3", /* WINED3DSIH_DP4 */ "dp4", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b001aad..f01463b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -80,6 +80,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, + WINED3D_SM4_OP_DP2 = 0x0f, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, @@ -215,6 +216,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, + {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9233148..6e6534f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,6 +446,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DEFB, WINED3DSIH_DEFI, WINED3DSIH_DIV, + WINED3DSIH_DP2, WINED3DSIH_DP2ADD, WINED3DSIH_DP3, WINED3DSIH_DP4,

1 0

Andrew Eikum : riched20/tests: Allow conversions to non-English codepages.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 704d1695f3d0b14e8eee9a5f786dfce55589ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704d1695f3d0b14e8eee9a5f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 20 14:09:45 2014 -0500 riched20/tests: Allow conversions to non-English codepages. --- dlls/riched20/tests/editor.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 309de7a..e14d7f6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5071,7 +5071,7 @@ static void test_EM_STREAMIN(void) DWORD phase; LRESULT result; EDITSTREAM es; - char buffer[1024] = {0}; + char buffer[1024] = {0}, tmp[16]; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; @@ -5100,6 +5100,9 @@ static void test_EM_STREAMIN(void) "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; + + const WCHAR UTF8Split_exp[4] = {0xd6, 0xcf, 0xcb, 0}; + int length4 = strlen(streamText4) + 1; struct StringWithLength cookieForStream4 = { length4, @@ -5217,10 +5220,12 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); ok(result == 8, "got %ld\n", result); + WideCharToMultiByte(CP_ACP, 0, UTF8Split_exp, -1, tmp, sizeof(tmp), NULL, NULL); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok(result == 3, "EM_STREAMIN: Test UTF8Split returned %ld\n", result); - result = memcmp (buffer,"\xd6\xcf\xcb", 3); + result = memcmp (buffer, tmp, 3); ok(result == 0, "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0);

1 0

Henri Verbeet : wined3d: Recognize the SM4 ishl opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 7b8aa8606cd4af99dbeae57584febf8559efb6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8aa8606cd4af99dbeae5758… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:47 2014 +0200 wined3d: Recognize the SM4 ishl opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecbaec6..5d23eed 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84b638e..e5eb685 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2335,6 +2335,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_AND: op = "&"; break; case WINED3DSIH_DIV: op = "/"; break; case WINED3DSIH_IADD: op = "+"; break; + case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_USHR: op = ">>"; break; @@ -6674,6 +6675,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 05e7168..06ed09a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_IMUL */ "imul", + /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f01463b..f10969b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -96,6 +96,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LOG = 0x2f, @@ -232,6 +233,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, + {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "FR"}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e6534f..b3cb884 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -470,6 +470,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_IMUL, + WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD,

1 0

Jacek Caban : ieframe: Added InternetExplore::get_HWND implementation.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 92841b3195276a12a320fa0b3dd854401cbef943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92841b3195276a12a320fa0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 18:30:57 2014 +0200 ieframe: Added InternetExplore::get_HWND implementation. --- dlls/ieframe/ie.c | 7 +++++-- dlls/ieframe/tests/ie.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 454eb0f..5eb1d26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -358,8 +358,11 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name) static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pHWND); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pHWND); + + *pHWND = (SHANDLE_PTR)This->frame_hwnd; + return S_OK; } static HRESULT WINAPI InternetExplorer_get_FullName(IWebBrowser2 *iface, BSTR *FullName) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index daf47f7..9ddd25c 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -205,6 +205,22 @@ static void test_html_window(IWebBrowser2 *wb) IHTMLWindow2_Release(html_window); } +static void test_window(IWebBrowser2 *wb) +{ + SHANDLE_PTR handle = 0; + HWND hwnd = NULL; + char buf[100]; + HRESULT hres; + + hres = IWebBrowser2_get_HWND(wb, &handle); + ok(hres == S_OK, "get_HWND faile: %08x\n", hres); + ok(handle, "handle == 0\n"); + + hwnd = (HWND)handle; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "IEFrame"), "Unexpected class name %s\n", buf); +} + static void test_navigate(IWebBrowser2 *wb, const char *url) { VARIANT urlv, emptyv; @@ -249,6 +265,7 @@ static void test_InternetExplorer(void) test_visible(wb); test_html_window(wb); + test_window(wb); test_navigate(wb, "http://test.winehq.org/tests/hello.html"); advise_cp(unk, FALSE);

1 0

Shuai Meng : vbscript: Implemented CCur.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 14f68a988bda797917f778a748ee8920531b734a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f68a988bda797917f778a74… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue May 20 09:05:07 2014 +0800 vbscript: Implemented CCur. --- dlls/vbscript/global.c | 21 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7c44661..f8c875d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -375,8 +375,25 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) static HRESULT Global_CCur(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_CY); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CInt(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 d7af8e9..46c80d4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -587,4 +587,51 @@ MyObject.myval = 0 Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +Sub testCCurError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CCur(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CCur(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CCur(Empty) = 0, "CCur(Empty) = " & CCur(Empty)) +Call ok(getVT(CCur(Empty)) = "VT_CY", "getVT(CCur(Empty)) = " & getVT(CCur(Empty))) +Call ok(CCur(-32768) = -32768, "CCur(-32768) = " & CCur(-32768)) +Call ok(getVT(CCur(-32768)) = "VT_CY", "getVT(CCur(-32768)) = " & getVT(CCur(-32768))) +Call ok(CCur(32768) = 32768, "CCur(32768) = " & CCur(32768)) +Call ok(getVT(CCur(32768)) = "VT_CY", "getVT(CCur(32768)) = " & getVT(CCur(32768))) +Call ok(CCur(0.000149) = 0.0001, "CCur(0.000149) = " & CCur(0.000149)) +Call ok(getVT(CCur(0.000149)) = "VT_CY", "getVT(CCur(0.000149)) = " & getVT(CCur(0.000149))) +Call ok(CCur(2147483647.99) = 2147483647.99, "CCur(2147483647.99) = " & CCur(2147483647.99)) +Call ok(getVT(CCur(2147483647.99)) = "VT_CY", "getVT(CCur(2147483647.99)) = " & getVT(CCur(2147483647.99))) +Call ok(CCur("-1") = -1, "CCur(""-1"") = " & CCur("-1")) +Call ok(getVT(CCur("-1")) = "VT_CY", "getVT(CCur(""-1"")) = " & getVT(CCur("-1"))) +If isEnglishLang Then + Call ok(CCur("-0.5") = -0.5, "CCur(""-0.5"") = " & CCur("-0.5")) + Call ok(getVT(CCur("-0.5")) = "VT_CY", "getVT(CCur(""-0.5"")) = " & getVT(CCur("-0.5"))) +End If +Call testCCurError("", 13, 13) +Call testCCurError("-1", 0, 458) +Call testCCurError("TRUE", 13, 13) +Call testCCurError("FALSE", 13, 13) +Call testCCurError("#TRue#", 13, 13) +Call testCCurError("#fAlSE#", 13, 13) +Call testCCurError(1, 0, 458) +Call ok(CCur(True) = -1, "CCur(True) = " & CCur(True)) +Call ok(getVT(CCur(True)) = "VT_CY", "getVT(CCur(True)) = " & getVT(CCur(True))) +Call ok(CCur(False) = 0, "CCur(False) = " & CCur(False)) +Call ok(getVT(CCur(False)) = "VT_CY", "getVT(CCur(False)) = " & getVT(CCur(False))) +MyObject.myval = 0.1 +Call ok(CCur(MyObject) = 0.1, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +MyObject.myval = 0 +Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9620398..0188c12 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -169,6 +169,8 @@ static const char *vt2a(VARIANT *v) return "VT_I4"; case VT_R8: return "VT_R8"; + case VT_CY: + return "VT_CY"; case VT_DATE: return "VT_DATE"; case VT_BSTR:

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateDxgiSurfaceRenderTarget( ).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 53d1bbf04186763d00cde8db65efa1f284b8c8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d1bbf04186763d00cde8db6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:44 2014 +0200 d2d1: Implement d2d_factory_CreateDxgiSurfaceRenderTarget(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 36 +++ dlls/d2d1/factory.c | 18 +- dlls/d2d1/render_target.c | 533 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 584 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d1bbf04186763d00cde…

1 0

Bruno Jesus : ws2_32: Avoid memory allocation for simple receives.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 1184fe90b2ba89c40a54ed93b8b991ab13796b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1184fe90b2ba89c40a54ed93b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 19 18:16:39 2014 -0300 ws2_32: Avoid memory allocation for simple receives. --- dlls/ws2_32/socket.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 04c715e..e31f396 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6531,8 +6531,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSABUF lpControlBuffer ) { unsigned int i, options; - int n, fd, err; - struct ws2_async *wsa; + int n, fd, err, overlapped; + struct ws2_async *wsa, localwsa; BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -6547,11 +6547,18 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (fd == -1) return SOCKET_ERROR; - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + overlapped = (lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (overlapped || dwBufferCount > 1) { - err = WSAEFAULT; - goto error; + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + { + err = WSAEFAULT; + goto error; + } } + else + wsa = &localwsa; wsa->hSocket = SOCKET2HANDLE(s); wsa->flags = *lpFlags; @@ -6588,8 +6595,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else if (lpNumberOfBytesRecvd) *lpNumberOfBytesRecvd = n; - if ((lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (overlapped) { IO_STATUS_BLOCK *iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; @@ -6673,14 +6679,14 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } TRACE(" -> %i bytes\n", n); - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); return 0; error: - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError( err );

1 0