March 2022 - Wine-Devel - list.winehq.org

[PATCH] comsvcs: Use CRT memory allocation functions.
by Nikolay Sivov March 31, 2022

March 31, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/main.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index b34c7d21309..43803f60632 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -19,7 +19,6 @@ */ #include "comsvcs_private.h" -#include "wine/heap.h" #include "wine/debug.h" #include "initguid.h" #include "comsvcs_classes.h" @@ -109,7 +108,7 @@ static ULONG WINAPI holder_Release(IHolder *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -221,7 +220,7 @@ static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) TRACE("(%p)\n", object); - hold = heap_alloc(sizeof(*hold)); + hold = malloc(sizeof(*hold)); if (!hold) { *object = NULL; @@ -277,7 +276,7 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) { if (This->mta_cookie) CoDecrementMTAUsage(This->mta_cookie); - heap_free(This); + free(This); } return ref; @@ -330,7 +329,7 @@ static HRESULT WINAPI dispenser_manager_cf_CreateInstance(IClassFactory *iface, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), object); - dismanager = heap_alloc_zero(sizeof(*dismanager)); + dismanager = calloc(1, sizeof(*dismanager)); if (!dismanager) { *object = NULL; @@ -443,8 +442,8 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) if (!refcount) { - heap_free(moniker->progid); - heap_free(moniker); + free(moniker->progid); + free(moniker); } return refcount; @@ -488,7 +487,7 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (SUCCEEDED(hr) && progid_len) { - if (!(progid = heap_alloc(progid_len))) + if (!(progid = malloc(progid_len))) return E_OUTOFMEMORY; hr = IStream_Read(stream, progid, progid_len, &len); } @@ -500,12 +499,12 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (SUCCEEDED(hr) && pad == 0) { moniker->clsid = clsid; - heap_free(moniker->progid); + free(moniker->progid); moniker->progid = progid; progid = NULL; } - heap_free(progid); + free(progid); return hr; } @@ -871,7 +870,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG progid = str; } - moniker = heap_alloc_zero(sizeof(*moniker)); + moniker = calloc(1, sizeof(*moniker)); if (!moniker) return E_OUTOFMEMORY; @@ -881,12 +880,11 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->clsid = guid; if (progid) { - if (!(moniker->progid = heap_alloc((lstrlenW(progid) + 1) * sizeof(WCHAR)))) + if (!(moniker->progid = wcsdup(progid))) { IMoniker_Release(&moniker->IMoniker_iface); return E_OUTOFMEMORY; } - lstrcpyW(moniker->progid, progid); } *ret = &moniker->IMoniker_iface; -- 2.35.1

1 0

[RFC PATCH] riched20: Draw OLE objects with IViewObject implementation.
by Jinoh Kang March 31, 2022

March 31, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52752 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a23f4c82730..3cbd2ddf4af 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5652,6 +5652,7 @@ static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5677,6 +5678,29 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + SIZEL sizel; + + hr = IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sizel); + if (FAILED(hr)) + { + WARN("failed to get extent: %#08lx\n", hr); + sizel.cx = sizel.cy = 0; + } + + convert_sizel(c, &sizel, pSize); + if (c->editor->nZoomNumerator != 0) + { + pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Query Interface IID_IDataObject failed!\n"); @@ -5729,6 +5753,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5741,6 +5766,45 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); + + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + SIZEL sizel = run->reobj->obj.sizel; + + if (sizel.cx == 0 && sizel.cy == 0) + { + hr = IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sizel); + if (FAILED(hr)) + { + WARN("failed to get extent: %#08lx\n", hr); + IViewObject_Release(ivo); + return; + } + } + + convert_sizel(c, &sizel, &sz); + if (c->editor->nZoomNumerator != 0) + { + sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + + hr = IViewObject_Draw(ivo, DVASPECT_CONTENT, -1, 0, 0, 0, c->hDC, (RECTL*)&rc, NULL, NULL, 0); + if (FAILED(hr)) + { + WARN("failed to draw object: %#08lx\n", hr); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Couldn't get interface\n"); -- 2.34.1

1 0

[PATCH v2] ntoskrnl.exe: Make USD pointers volatile to silent a warning.
by Rémi Bernon March 31, 2022

March 31, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..0aba2413ab1 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -496,9 +496,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_INDEX( sib, rex ) (((sib) >> 3) & 7) | (((rex) & REX_X) ? 8 : 0) #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) -/* keep in sync with dlls/ntdll/thread.c:thread_init */ -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; -static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; +/* keep in sync with dlls/ntdll/thread.c:thread_init. + * + * Both the data and the pointers need to be volatile, as GCC 11 + * considers that a fixed value pointer is an empty array, and will + * emit warnings when dereferencing it otherwise. + */ +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000; +static const volatile BYTE *const volatile user_shared_data = (BYTE *)0xfffff78000000000; static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) { @@ -516,7 +521,7 @@ static inline int get_op_size( int long_op, int rex ) } /* store an operand into a register */ -static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex, +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const volatile BYTE *addr, int long_op, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); @@ -527,7 +532,7 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i switch (op) { case INSTR_OP_MOV: - memcpy( reg, addr, op_size ); + memcpy( reg, (BYTE *)addr, op_size ); break; case INSTR_OP_OR: for (i = 0; i < op_size; ++i) @@ -541,7 +546,7 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i } /* store an operand into a byte register */ -static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex, enum instr_op op ) +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const volatile BYTE *addr, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); @@ -843,7 +848,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ULONGLONG temp = 0; TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &temp, wine_user_shared_data + offset, data_size ); + memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; @@ -902,7 +907,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; } -- 2.35.1

2 1

[PATCH v3 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban March 31, 2022

March 31, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 527 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 529 deletions(-)

3 2

[PATCH v3 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban March 31, 2022

March 31, 2022

3 2

[tools 1/3] testbot/cgi: Add SimpleCollectionPage.
by Francois Gouget March 31, 2022

March 31, 2022

SimpleCollectionPage embeds a single collection block. But unlike CollectionPage it is only a Page subclass instead of implementing both the Page and CollectionBlock interfaces. Customizing the collection block is done by creating a CollectionBlock subclass and passing the appropriate creator function to the page constructor. This better separates the page customization aspects (implement a SimpleCollectionPage subclass) from the collection block ones (implement a CollectionBlock subclass). Most of the time only the collection block needs to be customized and SimpleCollectionPage can be used as is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 5 + .../ObjectModel/CGI/SimpleCollectionPage.pm | 138 ++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 9a52f11bc..200734a6a 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -91,6 +91,11 @@ sub _initialize($$$) #my ($self, $Collection, $EnclosingPage) = @_; } +sub Create($$@) +{ + return ObjectModel::CGI::CollectionBlock->new(@_); +} + sub CallGetDetailsPage($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm new file mode 100644 index 000000000..76e4d5195 --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm @@ -0,0 +1,138 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Base class for list pages +# +# Copyright 2009 Ge van Geldorp +# Copyright 2014, 2017-2018, 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::SimpleCollectionPage; + +=head1 NAME + +ObjectModel::CGI::SimpleCollectionPage - Base class for list pages + +A page containing a single collection block. + +The SimpleCollectionPage instances have the following properties: +=over +=item Collection +The collection containing the items to be shown in the CollectionBlock widget. + +=item CollectionBlock +The widget showing the items in the specified collection. + +=item ActionPerformed +Set to true if an action was specified and succeeded. +=back + +=cut + +use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + +# Use require to avoid overriding Page::new() +require ObjectModel::CGI::CollectionBlock; + + +=pod +=over 12 + +=item C<_initialize()> + +Sets up the new page object. + +Parameters: +=over + +=item Request +=item RequiredRole +See Page::new(). + +=item Collection +This is the collection of items that should be shown in the CollectionBlock +widget. + +=item BlockCreator +If undefined the page will create an instance of the CollectionBlock class. +Otherwise it will use this function to create the CollectionBlock widget, thus +enabling use of a CollectionBlock subclass. + +=back + +=back +=cut + +sub _initialize($$$$;$) +{ + my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; + + $self->{Collection} = $Collection; + $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; + $self->{CollectionBlock} = &$BlockCreator($Collection, $self); + $self->SUPER::_initialize($Request, $RequiredRole); +} + + +# +# HTML page generation +# + +sub GetTitle($) +{ + my ($self) = @_; + + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; +} + +sub GenerateTitle($) +{ + my ($self) = @_; + + my $Title = $self->GetTitle(); + if ($Title) + { + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; + } +} + +sub GenerateBody($) +{ + my ($self) = @_; + + print "<div class='CollectionPageBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + $self->{CollectionBlock}->GenerateList(); + print "</div>\n"; + print "</div>\n"; +} + +sub GeneratePage($) +{ + my ($self) = @_; + + if ($self->GetParam("Action")) + { + $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); + } + $self->SUPER::GeneratePage(); +} + +1; -- 2.30.2

1 2

[tools] testbot: Fix the spelling of a couple of Perl POD entries.
by Francois Gouget March 31, 2022

March 31, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58ece69f3..9a52f11bc 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -37,7 +37,7 @@ Also, because this is only one part of a web page, some methods, such as those dealing with errors, are delegated to the EnclosingPage object which must implement the ObjectModel::CGI::Page interface. -Other methods are designed so they can be overriden by the enclosing page as +Other methods are designed so they can be overridden by the enclosing page as a way to allow it to modify how the collection block looks or behaves. These methods can be identified by their CallXxx() trampoline. The override mechanism works as follows: diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a79155950..0879557ad 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -360,7 +360,7 @@ sub GetPageTitle($) =head1 C<GetTitle()> This returns the title for the current web page or email section. -Note that this may not be valid HTML and thus my need escaping. +Note that this may not be valid HTML and thus may need escaping. =back =cut -- 2.30.2

1 0

[PATCH v3 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban March 31, 2022

March 31, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Removed unused functions. dlls/user32/message.c | 11 +- dlls/user32/user_main.c | 3 + dlls/user32/user_private.h | 6 +- dlls/user32/winproc.c | 6 + dlls/win32u/message.c | 392 ++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 6 + dlls/win32u/sysparams.c | 10 + dlls/win32u/win32u_private.h | 2 + include/ntuser.h | 12 ++ 9 files changed, 440 insertions(+), 8 deletions(-)

3 2

[PATCH v3 3/6] user32: Move unpack_message call to User32CallWindowProc.
by Jacek Caban March 31, 2022

March 31, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 412 +++-------------------------------- dlls/user32/winproc.c | 486 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 511 insertions(+), 390 deletions(-)

3 2

[tools] testbot/web: Standardize the page creation.
by Francois Gouget March 31, 2022

March 31, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 5 ++--- testbot/web/Feedback.pl | 5 ++--- testbot/web/ForgotPassword.pl | 5 ++--- testbot/web/JobDetails.pl | 5 ++--- testbot/web/Login.pl | 5 ++--- testbot/web/Logout.pl | 5 ++--- testbot/web/Register.pl | 5 ++--- testbot/web/ResetPassword.pl | 5 ++--- testbot/web/Stats.pl | 5 ++--- testbot/web/Submit.pl | 5 ++--- testbot/web/admin/BranchDetails.pl | 5 ++--- testbot/web/admin/Log.pl | 5 ++--- testbot/web/admin/SpecialJobs.pl | 5 ++--- testbot/web/admin/UserDetails.pl | 5 ++--- testbot/web/admin/VMDetails.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 16 files changed, 32 insertions(+), 48 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 1771e7ca3..5a5a37505 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -318,6 +318,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $ActivityPage = ActivityPage->new($Request, "wine-devel"); -$ActivityPage->GeneratePage(); +my $Page = ActivityPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ca1ee5ed7..6185d26d2 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -137,6 +137,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $FeedbackPage = FeedbackPage->new($Request, ""); -$FeedbackPage->GeneratePage(); +my $Page = FeedbackPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index cc0cd455d..190985264 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -131,6 +131,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ForgotPasswordPage = ForgotPasswordPage->new($Request, ""); -$ForgotPasswordPage->GeneratePage(); +my $Page = ForgotPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c4d6b1a1b..7e1df1ffa 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -741,6 +741,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $JobDetailsPage = JobDetailsPage->new($Request, ""); -$JobDetailsPage->GeneratePage(); +my $Page = JobDetailsPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ac64fc28e..b1f82a94b 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -154,6 +154,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $LoginPage = LoginPage->new($Request, ""); -$LoginPage->GeneratePage(); +my $Page = LoginPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index b0fd5cdc1..35f5c487c 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -76,6 +76,5 @@ sub GeneratePage($) package main; my $Request = shift; - -my $LogoutPage = LogoutPage->new($Request, ""); -$LogoutPage->GeneratePage(); +my $Page = LogoutPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 4cfef79fc..bbea0eb12 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -183,6 +183,5 @@ EOF package main; my $Request = shift; - -my $RegisterPage = RegisterPage->new($Request, ""); -$RegisterPage->GeneratePage(); +my $Page = RegisterPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 81655e0c4..4f672ea94 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -184,6 +184,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ResetPasswordPage = ResetPasswordPage->new($Request, ""); -$ResetPasswordPage->GeneratePage(); +my $Page = ResetPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 39c28789c..7ef65b3bf 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -397,6 +397,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $StatsPage = StatsPage->new($Request, "wine-devel"); -$StatsPage->GeneratePage(); +my $Page = StatsPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index aba2b6dc5..8323b9ab7 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1376,6 +1376,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SubmitPage->new($Request, "wine-devel"); -$SubmitPage->GeneratePage(); +my $Page = SubmitPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/BranchDetails.pl b/testbot/web/admin/BranchDetails.pl index fe3ebd118..1373e20fe 100644 --- a/testbot/web/admin/BranchDetails.pl +++ b/testbot/web/admin/BranchDetails.pl @@ -38,6 +38,5 @@ sub _initialize($$$) package main; my $Request = shift; - -my $BranchDetailsPage = BranchDetailsPage->new($Request, "admin"); -$BranchDetailsPage->GeneratePage(); +my $Page = BranchDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 8d3a8ce8b..9c18c375e 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -97,6 +97,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $LogPage = LogPage->new($Request, "admin"); -$LogPage->GeneratePage(); +my $Page = LogPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 49f80a0f9..e267cc7d5 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -256,6 +256,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SpecialJobsPage->new($Request, "admin"); -$SubmitPage->GeneratePage(); +my $Page = SpecialJobsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 7f7c710e1..f11d127ad 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -126,6 +126,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $UserDetailsPage = UserDetailsPage->new($Request, "admin"); -$UserDetailsPage->GeneratePage(); +my $Page = UserDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f39b0d674..35b26811a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -89,6 +89,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $VMDetailsPage = VMDetailsPage->new($Request, "admin"); -$VMDetailsPage->GeneratePage(); +my $Page = VMDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 94421536d..d2dd2b49d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -394,6 +394,5 @@ EOF package main; my $Request = shift; - -my $StatusPage = StatusPage->new($Request, ""); -$StatusPage->GeneratePage(); +my $Page = StatusPage->new($Request, ""); +$Page->GeneratePage(); -- 2.30.2

1 0