April 2013 - Wine-commits - list.winehq.org

Victor Martinez : gdiplus: Fix returned rect in GdiGetRegionBoundsI.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: e891fe4b8e995ddd707af727137609533ec64093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e891fe4b8e995ddd707af7271… Author: Victor Martinez <vmartinez(a)reactos.org> Date: Wed Apr 3 00:51:47 2013 +0200 gdiplus: Fix returned rect in GdiGetRegionBoundsI. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 99c5d35..d797459 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -716,7 +716,7 @@ GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *region, GpGraphics *graphics, status = GdipGetRegionBounds(region, graphics, &rectf); if(status == Ok){ rect->X = gdip_round(rectf.X); - rect->Y = gdip_round(rectf.X); + rect->Y = gdip_round(rectf.Y); rect->Width = gdip_round(rectf.Width); rect->Height = gdip_round(rectf.Height); }

1 0

Francois Gouget : testbot/Users: Fix UserDetails. pl to reuse WaitForApproval() instead of incompletely duplicating it.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: 5a6b0e8323ea7ef2056ccec29d57d37fc56d8c55 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5a6b0e8323ea7ef2056ccec2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:58:34 2013 +0200 testbot/Users: Fix UserDetails.pl to reuse WaitForApproval() instead of incompletely duplicating it. --- testbot/web/admin/UserDetails.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 9e79aa4..bc56eec 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -1,6 +1,7 @@ # User details page # # Copyright 2009 Ge van Geldorp +# Copyright 2013 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -53,8 +54,7 @@ sub GetActions my $self = shift; my @Actions; - if ($self->{Item}->Active && length($self->{Item}->Password) == 1 && - ! defined($LDAPServer)) + if (!defined $LDAPServer and $self->{Item}->WaitingForApproval()) { $Actions[0] = "Approve"; }

1 0

Francois Gouget : testbot/Users: Turn the DeleteNonPermanentSessions() method into a function.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: e90220247e4612c26bb8b8f7b2be7bbd4f2e3644 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e90220247e4612c26bb8b8f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:58:57 2013 +0200 testbot/Users: Turn the DeleteNonPermanentSessions() method into a function. Methods should not add filters to the collection they are called on. --- testbot/lib/WineTestBot/CGI/Sessions.pm | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 6cf8b71..97e33b5 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,14 +75,14 @@ sub CreateItem return WineTestBot::CGI::Session->new($self); } -sub DeleteNonPermanentSessions +sub DeleteNonPermanentSessions($) { - my $self = shift; my $User = $_[0]; - $self->AddFilter("User", [$User]); - $self->AddFilter("Permanent", [!1]); - map { $self->DeleteItem($_); } @{$self->GetItems()}; + my $Sessions = CreateSessions(); + $Sessions->AddFilter("User", [$User]); + $Sessions->AddFilter("Permanent", [!1]); + map { $Sessions->DeleteItem($_); } @{$Sessions->GetItems()}; } sub NewSession @@ -90,7 +90,7 @@ sub NewSession my $self = shift; my ($User, $Permanent) = @_; - CreateSessions()->DeleteNonPermanentSessions($User); + DeleteNonPermanentSessions($User); my $Session = $self->Add(); my $Existing = $Session;

1 0

Francois Gouget : testbot/web: Standardize the OnAction() methods.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: a7e0a1d56ec80b437d85755631963a642041cc51 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a7e0a1d56ec80b437d857556… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:56:42 2013 +0200 testbot/web: Standardize the OnAction() methods. Also note that FormPage::Save() sets the 'ErrField' and 'ErrMessage' properties directly and returns a simple boolean. --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 9 +++------ testbot/web/admin/UserDetails.pl | 22 +++++++++------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index a3310ec..16736fe 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -157,12 +157,9 @@ sub OnAction if ($Action eq "OK") { - if ($self->Save()) - { - $self->RedirectToList(); - exit; - } - return !1; + return !1 if (!$self->Save()); + $self->RedirectToList(); + exit; } elsif ($Action eq "Cancel") { diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index f49a522..9e79aa4 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -64,21 +64,13 @@ sub GetActions return \@Actions; } -sub OnApprove +sub OnApprove($) { my $self = shift; - ($self->{ErrField}, $self->{ErrMessage}) = $self->Save(); - if (defined($self->{ErrMessage})) - { - return !1; - } + return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); - if (defined($self->{ErrMessage})) - { - return !1; - } - + return !1 if (defined $self->{ErrMessage}); $self->RedirectToList(); exit; } @@ -88,8 +80,12 @@ sub OnAction my $self = shift; my $Action = $_[0]; - return ($Action eq "Approve" ? $self->OnApprove() : - $self->SUPER::OnAction(@_)); + if ($Action eq "Approve") + { + return $self->OnApprove(); + } + + return $self->SUPER::OnAction(@_); } package main;

1 0

Francois Gouget : testbot/ddl: Fix the SQL code that creates the 'batch' user.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: c8699e6985d0c9c89d651589ec7440dd7114b265 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c8699e6985d0c9c89d651589… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:57:03 2013 +0200 testbot/ddl: Fix the SQL code that creates the 'batch' user. --- testbot/ddl/winetestbot.sql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 4fbde28..c8820cc 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -162,7 +162,7 @@ INSERT INTO Roles (Name, IsDefaultRole) VALUES('admin', 'N'); INSERT INTO Roles (Name, IsDefaultRole) VALUES('wine-devel', 'Y'); INSERT INTO Users (Name, EMail, Password, Active, RealName) - VALUES('batch', '/dev/null', '*', 'Batch user for internal jobs', NULL); + VALUES('batch', '/dev/null', '*', 'Y', 'Batch user for internal jobs'); INSERT INTO Branches (Name, IsDefault) VALUES('master', 'Y');

1 0

Francois Gouget : testbot/Users: Remove the unused current user tracking code.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: c2b91aa379043a5555bc2eaafe47b2bc35f9acc9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c2b91aa379043a5555bc2eaa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:57:25 2013 +0200 testbot/Users: Remove the unused current user tracking code. Only the web modules have a concept of a 'current user' and they track him through his session and the PageBase.pm module. --- testbot/lib/WineTestBot/Users.pm | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 54c07bf..f29fd5e 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -310,12 +310,11 @@ use WineTestBot::Config; use WineTestBot::UserRoles; use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT @PropertyDescriptors $CurrentUser); +use vars qw (@ISA @EXPORT @PropertyDescriptors); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateUsers &SetCurrentUser &GetCurrentUser &GetBatchUser - &Authenticate); +(a)EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); BEGIN { @@ -414,14 +413,4 @@ sub GetBatchUser return $class->CreateUsers()->GetItem("batch"); } -sub SetCurrentUser -{ - $CurrentUser = shift; -} - -sub GetCurrentUser -{ - return $CurrentUser; -} - 1;

1 0

Francois Gouget : testbot/Users: Disabled accounts are not waiting for approval.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: b98cb3a916297bee4f33e2dd44cf58dbe9442c0b URL: http://source.winehq.org/git/tools.git/?a=commit;h=b98cb3a916297bee4f33e2dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:57:39 2013 +0200 testbot/Users: Disabled accounts are not waiting for approval. --- testbot/lib/WineTestBot/Users.pm | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index f29fd5e..cb3725b 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -1,4 +1,5 @@ # Copyright 2009 Ge van Geldorp +# Copyright 2013 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -88,12 +89,7 @@ sub WaitingForApproval { my $self = shift; - if ($self->Activated()) - { - return !1; - } - - return ! $self->ResetCode; + return $self->Active && !$self->Activated() && !$self->ResetCode; } sub GenerateResetCode

1 0

Francois Gouget : testbot/Users: Remove a redundant check in SendResetCode( ).
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: tools Branch: master Commit: 783f7dc5e0793c1853fc31988d807940e3e7687b URL: http://source.winehq.org/git/tools.git/?a=commit;h=783f7dc5e0793c1853fc3198… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 3 16:57:58 2013 +0200 testbot/Users: Remove a redundant check in SendResetCode(). An account which has been activated is no longer waiting for approval. --- testbot/lib/WineTestBot/Users.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index cb3725b..a163a17 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -166,7 +166,7 @@ sub SendResetCode { return "This account has been suspended"; } - if (! $self->Activated() && $self->WaitingForApproval()) + if ($self->WaitingForApproval()) { return "Your account has not been approved yet"; }

1 0

Jacek Caban : ieframe: Fixed index of stored history when loading from history.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 00226935c79c9fa06b597eb5526159048c114989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00226935c79c9fa06b597eb55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:21 2013 +0200 ieframe: Fixed index of stored history when loading from history. --- dlls/ieframe/dochost.c | 50 +++++++++++++++++++++++++++++------------- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 3 +- dlls/ieframe/shellbrowser.c | 9 +++++++- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c910c74..0788132 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -195,6 +195,12 @@ void set_doc_state(DocHost *This, READYSTATE doc_state) static void update_ready_state(DocHost *This, READYSTATE ready_state) { + if(ready_state > READYSTATE_LOADING && This->travellog.loading_pos != -1) { + WARN("histupdate not notified\n"); + This->travellog.position = This->travellog.loading_pos; + This->travellog.loading_pos = -1; + } + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING && !This->browser_service /* FIXME */) notif_complete(This, DISPID_NAVIGATECOMPLETE2); @@ -331,25 +337,28 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); - if(!This->travellog.log) - return; + if(This->travellog.loading_pos == -1) { + /* Clear forward history. */ + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) + return; - This->travellog.size = 4; - }else if(This->travellog.size < This->travellog.position+1) { - travellog_entry_t *new_travellog; + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { + travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); - if(!new_travellog) - return; + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + if(!new_travellog) + return; - This->travellog.log = new_travellog; - This->travellog.size *= 2; - } + This->travellog.log = new_travellog; + This->travellog.size *= 2; + } - while(This->travellog.length > This->travellog.position) - heap_free(This->travellog.log[--This->travellog.length].url); + while(This->travellog.length > This->travellog.position) + heap_free(This->travellog.log[--This->travellog.length].url); + } new_entry = This->travellog.log + This->travellog.position; @@ -357,7 +366,14 @@ static void update_travellog(DocHost *This) if(!new_entry->url) return; - This->travellog.position++; + if(This->travellog.loading_pos == -1) { + This->travellog.position++; + }else { + This->travellog.position = This->travellog.loading_pos; + This->travellog.loading_pos = -1; + } + if(This->travellog.position > This->travellog.length) + This->travellog.length = This->travellog.position; } void create_doc_view_hwnd(DocHost *This) @@ -975,6 +991,8 @@ void DocHost_Init(DocHost *This, IWebBrowser2 *wb, const IDocHostContainerVtbl* This->ready_state = READYSTATE_UNINITIALIZED; list_init(&This->task_queue); + This->travellog.loading_pos = -1; + DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index a20afbc5..2508ef2 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -158,6 +158,7 @@ struct DocHost { unsigned size; unsigned length; unsigned position; + int loading_pos; } travellog; ConnectionPointContainer cps; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 42d0c85..b6e277c 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1068,7 +1068,8 @@ HRESULT go_back(DocHost *This) return E_FAIL; } - url = This->travellog.log[--This->travellog.position].url; + This->travellog.loading_pos = This->travellog.position-1; + url = This->travellog.log[This->travellog.loading_pos].url; if(This->doc_navigate) { hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 6e84264..944c7bc 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -726,6 +726,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); + DocHost *doc_host = This->doc_host; IHTMLPrivateWindow *priv_window; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; @@ -735,6 +736,12 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + if(doc_host->travellog.loading_pos != -1) { + WARN("histupdate not notified\n"); + doc_host->travellog.position = doc_host->travellog.loading_pos; + doc_host->travellog.loading_pos = -1; + } + hres = IHTMLWindow2_QueryInterface(pHTMLWindow2, &IID_IHTMLPrivateWindow, (void**)&priv_window); if(FAILED(hres)) return hres; @@ -751,7 +758,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; + V_DISPATCH(params+1) = (IDispatch*)doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url;

1 0

Jacek Caban : ieframe: Moved freeing travellog entry into a helper function .
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: f1517b15719e489d5d35d01e68c1cfc18787c86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1517b15719e489d5d35d01e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:34 2013 +0200 ieframe: Moved freeing travellog entry into a helper function. --- dlls/ieframe/dochost.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 0788132..e1a897a 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -333,6 +333,11 @@ static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l return DefWindowProcW(hwnd, msg, wParam, lParam); } +static void free_travellog_entry(travellog_entry_t *entry) +{ + heap_free(entry->url); +} + static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; @@ -357,7 +362,7 @@ static void update_travellog(DocHost *This) } while(This->travellog.length > This->travellog.position) - heap_free(This->travellog.log[--This->travellog.length].url); + free_travellog_entry(This->travellog.log + --This->travellog.length); } new_entry = This->travellog.log + This->travellog.position; @@ -1013,7 +1018,7 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); while(This->travellog.length) - heap_free(This->travellog.log[--This->travellog.length].url); + free_travellog_entry(This->travellog.log + --This->travellog.length); heap_free(This->travellog.log); heap_free(This->url);

1 0