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

Nikolay Sivov : explorerframe: Query for more notification callbacks.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 586c3f2b4678c7e576c9459cc5aba9f72a327561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586c3f2b4678c7e576c9459cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:03:37 2014 +0400 explorerframe: Query for more notification callbacks. --- dlls/explorerframe/nstc.c | 87 ++++++++++++++++++++++----------------- dlls/explorerframe/tests/nstc.c | 32 ++++---------- 2 files changed, 59 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=586c3f2b4678c7e576c94…

1 0

Nikolay Sivov : comctl32/imagelist: Update to IImageList2.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: f109a084e8ec4f0be6704b9128656086ef48a531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f109a084e8ec4f0be6704b912… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 10 08:21:32 2014 +0400 comctl32/imagelist: Update to IImageList2. --- dlls/comctl32/imagelist.c | 286 ++++++++++++++++++++++++++------------- dlls/comctl32/tests/imagelist.c | 11 ++ 2 files changed, 202 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f109a084e8ec4f0be6704…

1 0

Alexandre Julliard : comctl32/tests: Output message sequences only on failure.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 6ad2cf9b5350adff859d36e3438be6a4a54c9fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad2cf9b5350adff859d36e34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 12 10:18:23 2014 +0200 comctl32/tests: Output message sequences only on failure. --- dlls/comctl32/tests/msg.h | 97 +++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/syslink.c | 4 -- dlls/comctl32/tests/tab.c | 4 -- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/tests/trackbar.c | 4 -- dlls/comctl32/tests/treeview.c | 1 - dlls/comctl32/tests/updown.c | 6 --- 7 files changed, 91 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad2cf9b5350adff859d3…

1 0

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

June 12, 2014

Module: wine Branch: master Commit: d4278ce0ed61160fa8941ae825668cfe7a1be503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4278ce0ed61160fa8941ae82… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:52:28 2014 -0300 rpcrt4: Take care of EINTR on send/recv. --- dlls/rpcrt4/rpc_transport.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c073a95..b283301 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> +#include <errno.h> #include <stdlib.h> #include <sys/types.h> @@ -1464,6 +1465,8 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, return -1; else if (r > 0) bytes_read += r; + else if (errno == EINTR) + continue; else if (errno != EAGAIN) { WARN("recv() failed: %s\n", strerror(errno)); @@ -1489,6 +1492,8 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) bytes_written += r; + else if (errno == EINTR) + continue; else if (errno != EAGAIN) return -1; else

1 0

Zhenbo Li : mshtml: Added IHTMLDocument2:toString method.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 4719c438a9cd16c56ed2854de317bc7008aadc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4719c438a9cd16c56ed2854de… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 31 19:51:07 2014 +0800 mshtml: Added IHTMLDocument2:toString method. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a9db920..6992c93 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1578,8 +1578,17 @@ static HRESULT WINAPI HTMLDocument_get_onerrorupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; + } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb1e7be..c16e073 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5243,10 +5243,17 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDocument3 *doc3; HRESULT hres; + BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "[object]"), + "toString returned %s, expected [object]\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);

1 0

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

Francois Gouget : testbot: Update the SSL Apache configuration section to match the regular one.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: bc4d58b448be3d2fbdb6cd5c180ac74467ae5af0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc4d58b448be3d2fbdb6cd5c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:48:03 2014 +0200 testbot: Update the SSL Apache configuration section to match the regular one. --- testbot/doc/vhost_winetestbot.conf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 5953317..7b84564 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -32,7 +32,7 @@ </Directory> </VirtualHost> -<VirtualHost 192.168.0.1:443> +<VirtualHost *:443> DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com @@ -42,8 +42,18 @@ SSLCertificateFile /etc/apache2/ssl.crt/winetestbot.example.com.crt SSLCertificateKeyFile /etc/apache2/ssl.key/winetestbot.example.com.key - PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw + <Perl> + use strict; + BEGIN + { + $::RootDir = "/home/winehq/tools/testbot"; + unshift @INC, "$::RootDir/lib"; + } + use ObjectModel::CGI::Page; + use WineTestBot::CGI::PageBase; + SetPageBaseCreator(\&CreatePageBase); + </Perl> <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl @@ -52,7 +62,10 @@ Options +ExecCGI DirectoryIndex index.pl + # Access control the Apache 2.2 way Order allow,deny Allow from all + # And the Apache 2.4 way + Require all granted </Directory> </VirtualHost>

1 0

Francois Gouget : testbot/CGI: The Page constructor must pass the full extra arguments list to the _initialize () method.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 6613e1526b41a50068c08147f4a65a144db37b19 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6613e1526b41a50068c08147… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:28:31 2014 +0200 testbot/CGI: The Page constructor must pass the full extra arguments list to the _initialize() method. --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8bbd1ae..6b2276d 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -45,7 +45,7 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize($Request, $RequiredRole); + $self->_initialize(@_); return $self; }

1 0

Francois Gouget : testbot/bin: Standardize handling of the function arguments and add prototypes.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 7533b8452fb45c9c0fe94ff145c5afd0e8d0d94a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7533b8452fb45c9c0fe94ff1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 10:56:23 2014 +0200 testbot/bin: Standardize handling of the function arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. They also document which arguments are optional. --- testbot/bin/CheckForWinetestUpdate.pl | 4 ++-- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineSendLog.pl | 21 +++++++++++---------- testbot/bin/build/Build.pl | 10 +++++----- testbot/bin/build/Reconfig.pl | 14 +++++++------- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 4eb2555..17b75d0 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ my %WineTestUrls = ( ); -sub AddJob +sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; @@ -140,7 +140,7 @@ sub AddJob return 1; } -sub AddReconfigJob +sub AddReconfigJob() { # First create a new job my $Jobs = CreateJobs(); diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index b2ae902..3712c4d 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -42,7 +42,7 @@ use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::VMs; -sub FatalError +sub FatalError($$) { my ($ErrMessage, $VM) = @_; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 5f4f1b1..c0a5057 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -43,9 +43,9 @@ use WineTestBot::Log; use WineTestBot::StepsTasks; -sub IsBotFailure +sub IsBotFailure($) { - my $ErrLine = $_[0]; + my ($ErrLine) = @_; return ($ErrLine =~ m/Can't set VM status to running/ || $ErrLine =~ m/Can't copy exe to VM/ || @@ -53,9 +53,9 @@ sub IsBotFailure $ErrLine =~ m/Can't copy generated executable from VM/); } -sub CheckErrLog +sub CheckErrLog($) { - my $ErrLogFileName = $_[0]; + my ($ErrLogFileName) = @_; my $BotFailure = !1; my $Messages = ""; @@ -82,7 +82,7 @@ sub CheckErrLog return ($BotFailure, $Messages); } -sub ReadLog +sub ReadLog($$$) { my ($LogName, $BaseName, $TestSet) = @_; @@ -127,16 +127,16 @@ sub ReadLog return \@Messages; } -sub GetLineKey +sub GetLineKey($) { - my $Line = $_[0]; + my ($Line) = @_; $Line =~ s/^([\w_.]+:)\d+(:.*)$/$1$2/; return $Line; } -sub CompareLogs +sub CompareLogs($$$$) { my ($SuiteLog, $TaskLog, $BaseName, $TestSet) = @_; @@ -166,9 +166,10 @@ sub CompareLogs return $Messages; } -sub SendLog +sub SendLog($) { - my $Job = shift; + my ($Job) = @_; + my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); if (! defined($To)) { diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index ef3fece..f94b87e 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -40,7 +40,7 @@ sub BEGIN use WineTestBot::Config; -sub InfoMsg +sub InfoMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") @@ -51,7 +51,7 @@ sub InfoMsg umask($oldumask); } -sub LogMsg +sub LogMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") @@ -62,14 +62,14 @@ sub LogMsg umask($oldumask); } -sub FatalError +sub FatalError(@) { LogMsg @_; exit 1; } -sub ApplyPatch +sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; @@ -169,7 +169,7 @@ sub CountCPUs() $ncpus ||= 1; } -sub BuildTestExecutable +sub BuildTestExecutable($$$$$$$$) { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib) = @_; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index a82d879..f5ffcab 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,7 +40,7 @@ sub BEGIN use WineTestBot::Config; -sub LogMsg +sub LogMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Reconfig.log") @@ -51,14 +51,14 @@ sub LogMsg umask($oldumask); } -sub FatalError +sub FatalError(@) { LogMsg @_; exit 1; } -sub GitPull +sub GitPull() { system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) @@ -82,7 +82,7 @@ sub CountCPUs() $ncpus ||= 1; } -sub BuildTestAgentd +sub BuildTestAgentd() { # If testagentd already exists it's likely already running # so don't rebuild it. @@ -110,7 +110,7 @@ sub BuildTestAgentd return 1; } -sub BuildNative +sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . @@ -129,9 +129,9 @@ sub BuildNative return 1; } -sub BuildCross +sub BuildCross($) { - my $Bits = $_[0]; + my ($Bits) = @_; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits");

1 0

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

June 12, 2014

Module: tools Branch: master Commit: 0e4eb3a13f794ad8c4f51947519c2af74a69e4a6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0e4eb3a13f794ad8c4f51947… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:04 2014 +0200 testbot/CGI: Improve the CGI 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/CGI/CollectionBlock.pm | 171 ++++++++++---------- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 68 ++++---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 121 ++++++-------- testbot/lib/ObjectModel/CGI/FormPage.pm | 104 ++++++------ testbot/lib/ObjectModel/CGI/ItemPage.pm | 45 +++--- testbot/lib/ObjectModel/CGI/Page.pm | 105 ++++++------ testbot/lib/WineTestBot/CGI/PageBase.pm | 75 ++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 15 +- 8 files changed, 338 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=0e4eb3a13f794ad8c4f5…

1 0

Huw Davies : gdi32: CLIP_DFA_DISABLE should disable the font association mechanism.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 80a29e2d31d3e1245cf1261f99c70a0fc3e26c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a29e2d31d3e1245cf1261f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 10 09:48:38 2014 +0100 gdi32: CLIP_DFA_DISABLE should disable the font association mechanism. --- dlls/gdi32/font.c | 9 ++++++--- dlls/gdi32/tests/font.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 66072af..af3ea5b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -653,12 +653,15 @@ static DWORD get_associated_charset_info(void) return associated_charset; } -static void update_font_code_page( DC *dc ) +static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + LOGFONTW lf; + + GetObjectW( font, sizeof(lf), &lf ); - if (charset == ANSI_CHARSET && + if (charset == ANSI_CHARSET && !(lf.lfClipPrecision & CLIP_DFA_DISABLE) && get_associated_charset_info() & ASSOC_CHARSET_ANSI) charset = DEFAULT_CHARSET; @@ -725,7 +728,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) ret = dc->hFont; dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; - update_font_code_page( dc ); + update_font_code_page( dc, handle ); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e978166..dd63297 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2570,6 +2570,22 @@ static void test_GdiGetCodePage(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + /* CLIP_DFA_DISABLE turns off the font association */ + lf.lfClipPrecision = CLIP_DFA_DISABLE; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage); + ok(codepage == 1252, "GdiGetCodePage returned %d\n", codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); } }

1 0

Piotr Caban : msvcrt: Handle negative file->_cnt value in fwrite.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b0424313fd16efea4a08732f4ed530df30d350cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0424313fd16efea4a08732f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 9 14:24:14 2014 +0200 msvcrt: Handle negative file->_cnt value in fwrite. --- dlls/msvcrt/file.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 77a0fed..7ebf6d2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3691,7 +3691,11 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si MSVCRT__lock_file(file); while(wrcnt) { - if(file->_cnt) { + if(file->_cnt < 0) { + WARN("negative file->_cnt value in %p\n", file); + file->_flag |= MSVCRT__IOERR; + break; + } else if(file->_cnt) { int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; memcpy(file->_ptr, ptr, pcnt); file->_cnt -= pcnt;

1 0

Michael Stefaniuc : dmcompos: Move a struct definition to the .c file that uses it.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1aae7b0fa7be667601317b9d336023c1e37126b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aae7b0fa7be667601317b9d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:28:51 2014 +0200 dmcompos: Move a struct definition to the .c file that uses it. --- dlls/dmcompos/chordmap.c | 7 +++++++ dlls/dmcompos/dmcompos_private.h | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 9d2d8a9..c3483cd 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -25,6 +25,13 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicChordMapImpl implementation */ +typedef struct IDirectMusicChordMapImpl { + IDirectMusicChordMap IDirectMusicChordMap_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicChordMapImpl; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMusicChordMap *iface) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index d7113e5..6a80445 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -45,7 +45,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicChordMapImpl IDirectMusicChordMapImpl; typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; @@ -58,20 +57,6 @@ extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECL extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** - * IDirectMusicChordMapImpl implementation structure - */ -struct IDirectMusicChordMapImpl { - IDirectMusicChordMap IDirectMusicChordMap_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordMapImpl fields */ - LPDMUS_OBJECTDESC pDesc; - -}; - -/***************************************************************************** * IDirectMusicChordMapTrack implementation structure */ struct IDirectMusicChordMapTrack {

1 0

Michael Stefaniuc : dmband: Move struct definitions to the .c files that uses them.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c3e753c20be1b6e5d2cddb6333fc8959d5b699ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e753c20be1b6e5d2cddb633… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:28:01 2014 +0200 dmband: Move struct definitions to the .c files that uses them. --- dlls/dmband/band.c | 9 +++++++++ dlls/dmband/bandtrack.c | 11 ++++++++++- dlls/dmband/dmband_private.h | 40 ---------------------------------------- 3 files changed, 19 insertions(+), 41 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 97e7c30..0ab7df7 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandImpl implementation */ +typedef struct IDirectMusicBandImpl { + IDirectMusicBand IDirectMusicBand_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Instruments; +} IDirectMusicBandImpl; + static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface) { return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 459c158..14e368d 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -25,7 +25,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandTrack implementation */ -/* IDirectMusicBandTrack IUnknown part: */ +typedef struct IDirectMusicBandTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_BAND_TRACK_HEADER header; + struct list Bands; +} IDirectMusicBandTrack; + static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 6be6ae8..4c8fa0b 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -43,13 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicBandImpl IDirectMusicBandImpl; - -typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; @@ -82,39 +75,6 @@ typedef struct _DMUS_PRIVATE_BAND { } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND; -/***************************************************************************** - * IDirectMusicBandImpl implementation structure - */ -struct IDirectMusicBandImpl { - IDirectMusicBand IDirectMusicBand_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicBandImpl fields */ - LPDMUS_OBJECTDESC pDesc; - /* data */ - struct list Instruments; -}; - -/***************************************************************************** - * IDirectMusicBandTrack implementation structure - */ -struct IDirectMusicBandTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicBandTrack fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_BAND_TRACK_HEADER header; - - /* data */ - struct list Bands; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmband.dll */

1 0

Nikolay Sivov : comctl32/treeview: Send TVN_KEYDOWN in response of WM_KEYDOWN.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: a7fb6c89b3535368faaad06b1bd49253ed3c1430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fb6c89b3535368faaad06b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 00:46:31 2014 +0400 comctl32/treeview: Send TVN_KEYDOWN in response of WM_KEYDOWN. --- dlls/comctl32/tests/treeview.c | 4 ++-- dlls/comctl32/treeview.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3b70e6c..24a63d8 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -206,7 +206,7 @@ static const struct message parent_expand_seq[] = { }; static const struct message parent_expand_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { WM_CHANGEUISTATE, sent|optional }, @@ -221,7 +221,7 @@ static const struct message parent_collapse_2nd_kb_seq[] = { }; static const struct message parent_expand_empty_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c26513f..4067323 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5201,11 +5201,15 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) { /* If it is non-NULL and different, it will be selected and visible. */ TREEVIEW_ITEM *newSelection = NULL; - TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; + NMTVKEYDOWN nmkeydown; TRACE("%lx\n", wParam); + nmkeydown.wVKey = wParam; + nmkeydown.flags = 0; + TREEVIEW_SendRealNotify(infoPtr, TVN_KEYDOWN, &nmkeydown.hdr); + if (prevItem == NULL) return FALSE;

1 0

Michael Stefaniuc : dmstyle: Move a struct definition to the .c file that uses it.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: e22458c224b6ff83c020888868b9fa25a9318bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22458c224b6ff83c02088886… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:29:47 2014 +0200 dmstyle: Move a struct definition to the .c file that uses it. --- dlls/dmstyle/dmstyle_private.h | 20 -------------------- dlls/dmstyle/style.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index bae61a0..95ad92f 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -45,8 +45,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicStyle8Impl IDirectMusicStyle8Impl; - typedef struct IDirectMusicAuditionTrack IDirectMusicAuditionTrack; typedef struct IDirectMusicChordTrack IDirectMusicChordTrack; typedef struct IDirectMusicCommandTrack IDirectMusicCommandTrack; @@ -100,24 +98,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { /***************************************************************************** - * IDirectMusicStyle8Impl implementation structure - */ -struct IDirectMusicStyle8Impl { - IDirectMusicStyle8 IDirectMusicStyle8_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicStyle8Impl fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_STYLE style; - - /* data */ - struct list Motifs; - struct list Bands; -}; - -/***************************************************************************** * IDirectMusicAuditionTrack implementation structure */ struct IDirectMusicAuditionTrack { diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 2945e5d..ed40791 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -26,6 +26,17 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleImpl implementation */ +typedef struct IDirectMusicStyle8Impl { + IDirectMusicStyle8 IDirectMusicStyle8_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_STYLE style; + struct list Motifs; + struct list Bands; +} IDirectMusicStyle8Impl; + static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface);

1 0