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

Felix Janda : iphlpapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 0547c0d236ab197c14b5fec0abfad4c31eade7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0547c0d236ab197c14b5fec0a… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 iphlpapi: stdio.h needs to be included for sprintf(). --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e145386..8c55048 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h>

1 0

Bruno Jesus : winetest: Take care of EINTR on send/recv.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 49ef87c3143c59e3037b8dd78b083e30643bf775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ef87c3143c59e3037b8dd78… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:45:36 2014 -0300 winetest: Take care of EINTR on send/recv. --- programs/winetest/send.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 7767d25..d04b6e9 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -92,7 +92,10 @@ send_buf (SOCKET s, const char *buf, size_t length) while (length > 0) { sent = send (s, buf, length, 0); - if (sent == SOCKET_ERROR) return 1; + if (sent == SOCKET_ERROR) { + if (errno == EINTR) continue; + return 1; + } buf += sent; length -= sent; } @@ -200,6 +203,7 @@ send_file_direct (const char *name) total = 0; while ((bytes_read = recv (s, buffer+total, BUFLEN-total, 0))) { if ((signed)bytes_read == SOCKET_ERROR) { + if (errno == EINTR) continue; report (R_WARNING, "Error receiving reply: %d, %d", errno, WSAGetLastError ()); goto abort1;

1 0

Piotr Caban : msvcp90: Fix typo in strstreambuf_freeze.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ab0513ef67f33a64627792ed3cb9b9a7d1b55c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0513ef67f33a64627792ed3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 11 12:50:39 2014 +0200 msvcp90: Fix typo in strstreambuf_freeze. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index b223d10..913086a 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -11586,7 +11586,7 @@ void __thiscall strstreambuf_freeze(strstreambuf *this, MSVCP_bool freeze) { TRACE("(%p %d)\n", this, freeze); - if(!freeze == !(this->strmode *STRSTATE_Frozen)) + if(!freeze == !(this->strmode & STRSTATE_Frozen)) return; if(freeze) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d8f1e1c..f7cb232 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -13241,7 +13241,7 @@ void __thiscall strstreambuf_freeze(strstreambuf *this, MSVCP_bool freeze) { TRACE("(%p %d)\n", this, freeze); - if(!freeze == !(this->strmode *STRSTATE_Frozen)) + if(!freeze == !(this->strmode & STRSTATE_Frozen)) return; if(freeze) {

1 0

Francois Gouget : testbot/lib: DBIBackend::LoadItem() must not return objects from the Collection scope.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 2a350500f2075a7da7c0b8337772ede3b94978d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a350500f2075a7da7c0b833… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:14:41 2014 +0200 testbot/lib: DBIBackend::LoadItem() must not return objects from the Collection scope. Such checks belong to the higher levels. Doing them in LoadItem() interferes with Collection::Validate(), causing it to think new items are already present in the database whenever they don't have Sequence keys. --- testbot/lib/ObjectModel/DBIBackEnd.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index c89fa64..06b139d 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -253,14 +253,24 @@ sub LoadCollection $Statement->finish(); } +=pod +=over 12 + +=item C<LoadItem()> + +Loads the specified Item from the database and adds it to the Collection. +By design this method will not check if the Item is already present in the +Collection scope. Such checks belong in the higher levels. This method will +however put the Item in the Collection's scope. + +=back +=cut + sub LoadItem { my $self = shift; my ($Collection, $RequestedKey) = @_; - my $Item = $Collection->GetScopeItem($RequestedKey); - return $Item if (defined $Item); - my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); my $Where = ""; @@ -283,7 +293,7 @@ sub LoadItem my $Statement = $self->GetDb()->prepare($Query); $Statement->execute(@Data); - $Item = undef; + my $Item; if (my $Row = $Statement->fetchrow_hashref()) { $Item = $Collection->CreateItem();

1 0

Francois Gouget : testbot/lib: Improve Collection::Validate()' s error reporting.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 2fd3c073f6579e1051bcc2bff8cedfe490425183 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2fd3c073f6579e1051bcc2bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:51 2014 +0200 testbot/lib: Improve Collection::Validate()'s error reporting. The error message contains no information about the Collection so it should mention the guilty Item's full key. --- testbot/lib/ObjectModel/Collection.pm | 5 +++-- testbot/lib/ObjectModel/Item.pm | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 0070c57..53ad5fe 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -404,7 +404,8 @@ sub Validate (my $ErrProperty, my $ErrMessage) = $Item->Validate(); if (defined($ErrMessage)) { - return ($Item->GetKey(), $ErrProperty, $ErrMessage); + return ($Item->GetKey(), $ErrProperty, "$ErrMessage for " . + $self->GetItemName() . " " . $Item->GetFullKey()); } if ($Item->GetIsNew()) { @@ -424,7 +425,7 @@ sub Validate my $ExistingItem = $self->GetBackEnd()->LoadItem($self, $Item->GetKey()); if (defined($ExistingItem)) { - $ErrMessage = $self->GetItemName() . " " . $ErrMessage . + $ErrMessage = $self->GetItemName() . " " . $Item->GetFullKey() . " already exists"; return ($Item->GetKey(), undef, $ErrMessage); } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 0cc07ab..2ec69f1 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -382,8 +382,7 @@ sub Validate my ($ErrKey, $ErrProperty, $ErrMessage) = $Detail->Validate(); if (defined($ErrMessage)) { - return (undef, $ErrMessage . " for " . $Detail->GetItemName() . - $ErrKey); + return (undef, $ErrMessage); } } }

1 0

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

June 12, 2014

Module: tools Branch: master Commit: 4ff885361b38d0cdfe024f6c9325539362872fa2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ff885361b38d0cdfe024f6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:14 2014 +0200 testbot/lib: Improve the Backend 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/BackEnd.pm | 8 ++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 82 +++++++++++++-------------------- 2 files changed, 38 insertions(+), 52 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index cf7439e..561bfce 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -35,17 +35,19 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(%ActiveBackEnds); -sub new +sub new($@) { my $class = shift; + my $self = {}; $self = bless $self, $class; - $self->_initialize(); + $self->_initialize(@_); return $self; } -sub _initialize +sub _initialize($) { + #my ($self) = @_; } 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 06b139d..45bd1f6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -40,9 +40,9 @@ require Exporter; @ISA = qw(ObjectModel::BackEnd Exporter); @EXPORT = qw(&UseDBIBackend); -sub GetDb +sub GetDb($) { - my $self = shift; + my ($self) = @_; if (defined $self->{Db} && !$self->{Db}->ping()) { @@ -58,10 +58,9 @@ sub GetDb return $self->{Db}; } -sub ToDb +sub ToDb($$$) { - my $self = shift; - my ($Value, $PropertyDescriptor) = @_; + my ($self, $Value, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetClass eq "Basic") { @@ -97,10 +96,9 @@ sub ToDb return $Value; } -sub FromDb +sub FromDb($$$) { - my $self = shift; - my ($Value, $PropertyDescriptor) = @_; + my ($self, $Value, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetClass eq "Basic") { @@ -129,10 +127,9 @@ sub FromDb return $Value; } -sub BuildKeyWhere +sub BuildKeyWhere($$$$) { - my $self = shift; - my ($PropertyDescriptors, $ColPrefix, $Where) = @_; + my ($self, $PropertyDescriptors, $ColPrefix, $Where) = @_; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { @@ -152,10 +149,9 @@ sub BuildKeyWhere return $Where; } -sub BuildFieldList +sub BuildFieldList($$) { - my $self = shift; - my $PropertyDescriptors = $_[0]; + my ($self, $PropertyDescriptors) = @_; my $Fields = ""; foreach my $PropertyDescriptor (@$PropertyDescriptors) @@ -173,10 +169,9 @@ sub BuildFieldList return $Fields; } -sub LoadCollection +sub LoadCollection($$) { - my $self = shift; - my $Collection = $_[0]; + my ($self, $Collection) = @_; my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); @@ -266,10 +261,9 @@ however put the Item in the Collection's scope. =back =cut -sub LoadItem +sub LoadItem($$$) { - my $self = shift; - my ($Collection, $RequestedKey) = @_; + my ($self, $Collection, $RequestedKey) = @_; my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); @@ -314,10 +308,9 @@ sub LoadItem return $Item; } -sub BuildInsertStatement +sub BuildInsertStatement($$$$) { - my $self = shift; - my ($TableName, $PropertyDescriptors, $MasterColNames) = @_; + my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; my $Fields = ""; my $PlaceHolders = ""; @@ -352,11 +345,9 @@ sub BuildInsertStatement return "INSERT INTO $TableName ($Fields) VALUES($PlaceHolders)"; } -sub GetInsertData +sub GetInsertData($$$) { - my $self = shift; - my $MasterColValues = shift; - my $Item = shift; + my ($self, $MasterColValues, $Item) = @_; my @Data; if (defined($MasterColValues)) @@ -376,10 +367,9 @@ sub GetInsertData return \@Data; } -sub BuildUpdateStatement +sub BuildUpdateStatement($$$$) { - my $self = shift; - my ($TableName, $PropertyDescriptors, $MasterColNames) = @_; + my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; my $Fields = ""; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) @@ -407,11 +397,9 @@ sub BuildUpdateStatement return "UPDATE $TableName SET $Fields WHERE $Where"; } -sub GetUpdateData +sub GetUpdateData($$$) { - my $self = shift; - my $MasterColValues = shift; - my $Item = shift; + my ($self, $MasterColValues, $Item) = @_; my @Data; foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -445,10 +433,9 @@ sub GetUpdateData return \@Data; } -sub SaveCollection +sub SaveCollection($$) { - my $self = shift; - my $Collection = shift; + my ($self, $Collection) = @_; my $Db = $self->GetDb(); my ($MasterColNames, $MasterColValues) = $Collection->GetMasterCols(); @@ -500,10 +487,9 @@ sub SaveCollection $UpdateStatement->finish(); } -sub SaveItem +sub SaveItem($$) { - my $self = shift; - my $Item = $_[0]; + my ($self, $Item) = @_; my $Query; my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); @@ -528,10 +514,9 @@ sub SaveItem $Statement->finish(); } -sub DeleteItem +sub DeleteItem($$) { - my $self = shift; - my $Item = shift; + my ($self, $Item) = @_; my $Where = ""; my @Data; @@ -554,10 +539,9 @@ sub DeleteItem return undef; } -sub DeleteAll +sub DeleteAll($$) { - my $self = shift; - my $Collection = shift; + my ($self, $Collection) = @_; my $Where = ""; my @Data; @@ -580,9 +564,9 @@ sub DeleteAll return undef; } -sub PrepareForFork +sub PrepareForFork($) { - my $self = shift; + my ($self) = @_; if (defined($self->{Db})) { @@ -591,7 +575,7 @@ sub PrepareForFork } } -sub UseDBIBackEnd +sub UseDBIBackEnd($$@) { my $class = shift; my $DbSelector = shift;

1 0

Francois Gouget : testbot/web: Use the default Domain and Path of our cookies.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 70ebd159c77017701d59d92f391a502e80bea2d3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=70ebd159c77017701d59d92f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:43:28 2014 +0200 testbot/web: Use the default Domain and Path of our cookies. The Path defaults to '/' which is what we want. The Domain is set to the most restrictive value which is good. This also means we're no longer putting the port number in the Domain value which fixes our cookies when the web server is running on a non-standard port or the connection is going through port forwarding. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index bfa44c4..a724507 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -162,8 +162,6 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, - -Domain => $ENV{"HTTP_HOST"}, - -Path => "/", -Secure => $UseSSL); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -184,8 +182,6 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, - -Domain => $ENV{"HTTP_HOST"}, - -Path => "/", -Secure => !1); $Request->err_headers_out->add("Set-Cookie", $Cookie); }

1 0

Francois Gouget : testbot/web: Improve argument handling in the web methods.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 95b5ea0176af8ef17e4e262ce7e6cd31b7c80e6e URL: http://source.winehq.org/git/tools.git/?a=commit;h=95b5ea0176af8ef17e4e262c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:32 2014 +0200 testbot/web: Improve argument handling in the web methods. This standardizes the way we handle 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/web/Feedback.pl | 44 +++++++-------- testbot/web/ForgotPassword.pl | 29 +++++----- testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 76 ++++++++++++-------------- testbot/web/Login.pl | 36 ++++++------ testbot/web/Logout.pl | 12 ++-- testbot/web/PatchesList.pl | 41 ++++++-------- testbot/web/Register.pl | 48 ++++++++-------- testbot/web/ResetPassword.pl | 40 +++++++------- testbot/web/Screenshot.pl | 8 +-- testbot/web/Submit.pl | 106 +++++++++++++++++------------------- testbot/web/admin/BranchDetails.pl | 6 +- testbot/web/admin/BranchesList.pl | 11 ++-- testbot/web/admin/UserDetails.pl | 30 +++++----- testbot/web/admin/UsersList.pl | 30 +++++----- testbot/web/admin/VMDetails.pl | 13 ++--- testbot/web/admin/VMsList.pl | 24 ++++---- testbot/web/index.pl | 68 +++++++++++------------ 18 files changed, 299 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=95b5ea0176af8ef17e4e…

1 0

Francois Gouget : testbot: Remove duplicate options from the sample Apache configuration file.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: b76db4ff3768eb5e9f5939fb0e0f915875b8dfb6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b76db4ff3768eb5e9f5939fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:47:53 2014 +0200 testbot: Remove duplicate options from the sample Apache configuration file. --- testbot/doc/vhost_winetestbot.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 3219bcd..5953317 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -22,8 +22,6 @@ PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders Options +ExecCGI - PerlOptions +ParseHeaders - Options +ExecCGI DirectoryIndex index.pl # Access control the Apache 2.2 way

1 0

Francois Gouget : testbot/lib: Simplify and optimize Collection::Validate( ).
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: f65fa587273a3130ec69f04a26f3ce1d17fe503d URL: http://source.winehq.org/git/tools.git/?a=commit;h=f65fa587273a3130ec69f04a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:45 2014 +0200 testbot/lib: Simplify and optimize Collection::Validate(). --- testbot/lib/ObjectModel/Collection.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 7dbcf63..0070c57 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -409,18 +409,14 @@ sub Validate if ($Item->GetIsNew()) { my $HasSequenceKey = !1; - my $ErrProperty, my $ErrMessage; foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { - if ($PropertyDescriptor->GetIsKey()) + if ($PropertyDescriptor->GetIsKey() && + $PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "S") { - $ErrProperty = $PropertyDescriptor->GetName(); - $ErrMessage = $Item->$ErrProperty; - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "S") - { - $HasSequenceKey = 1; - } + $HasSequenceKey = 1; + last; } } if (! $HasSequenceKey)

1 0