April 2022 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/web: Use SimpleCollectionPage for the VMs page.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: b06fc8af3d41468e47ea7834f373fc61c27ccd80 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b06fc8af3d41468e47ea783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:15:13 2022 +0200 testbot/web: Use SimpleCollectionPage for the VMs page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/VMsList.pl | 49 ++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 1895225..d957b44 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -2,6 +2,7 @@ # VM list page # # Copyright 2009 Ge van Geldorp +# Copyright 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 @@ -19,58 +20,62 @@ use strict; -package VMsListPage; +package VMsBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); - -use WineTestBot::VMs; +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub _initialize($$$) +sub Create($$) { - my ($self, $Request, $RequiredRole) = @_; + my ($Collection, $EnclosingPage) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreateVMs()); + return VMsBlock->new($Collection, $EnclosingPage); } -sub DisplayProperty($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || $PropertyName eq "Role" || $PropertyName eq "Status" || $PropertyName eq "Description"; } -sub SortKeys($$$) +sub SortKeys($$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($self, $Keys) = @_; return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub OnItemAction($$$$) +sub OnItemAction($$$) { - my ($self, $CollectionBlock, $VM, $Action) = @_; + my ($self, $VM, $Action) = @_; if ($Action eq "Delete") { $VM->Role("deleted"); - # Setting $self->{ErrField} is only useful on form pages - (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); - return !defined $self->{ErrMessage}; + my ($_ErrProperty, $ErrMessage) = $VM->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); + return $self->SUPER::OnItemAction($VM, $Action); } package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::VMs; -my $VMsListPage = VMsListPage->new($Request, "admin"); -$VMsListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); +$Page->GeneratePage();

1 0

Francois Gouget : testbot: The last GetTaskURL() parameter is in fact a log name.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: a332ac13efd3a29bf305dc2048992a95b1233567 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a332ac13efd3a29bf305dc2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:25 2022 +0200 testbot: The last GetTaskURL() parameter is in fact a log name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index d93a938..13529c3 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -34,6 +34,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BatchQuote ShQuote ShArgv2Cmd); use Fcntl qw(O_CREAT O_EXCL O_WRONLY); +use URI::Escape; use WineTestBot::Config; @@ -84,11 +85,11 @@ sub MakeSecureURL($) sub GetTaskURL($$$;$$) { - my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $ShowLog) = @_; + my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; my $StepTask = 100 * $StepNo + $TaskNo; my $URL = "/JobDetails.pl?Key=$JobId"; $URL .= "&s$StepTask=1" if ($ShowScreenshot); - $URL .= "&f$StepTask=$ShowLog" if ($ShowLog); + $URL .= "&f$StepTask=". uri_escape($LogName) if ($LogName); return "$URL#k$StepTask"; }

1 0

Francois Gouget : testbot/cgi: Sessions does not need CGI::Cookie.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: 5377631158b5723dfe18893c56cd84af82063fbb URL: https://source.winehq.org/git/tools.git/?a=commit;h=5377631158b5723dfe18893… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:41 2022 +0200 testbot/cgi: Sessions does not need CGI::Cookie. Getting and setting cookies is done through the PageBase class. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 4ca62ba..39634e3 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -55,7 +55,6 @@ our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); use Bytes::Random::Secure; -use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor;

1 0

Francois Gouget : testbot/web: Better document the job details page reloads.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: d4eb21b18ef5ae4538b6c7b8b6c51352ae032fc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d4eb21b18ef5ae4538b6c7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:09:00 2022 +0200 testbot/web: Better document the job details page reloads. Also use $SCRIPT_NAME instead of hardcoding the script name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7e1df1f..ccd4044 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -256,7 +256,11 @@ sub OnCancel($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Ideally this would use something like GetMoreInfoLink() to rebuild a Get + # URL to preserve which logs and screenshots have been expanded. But the + # anchor would likely be lost anyway. + # So just do a basic reload to refresh the tasks' status. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnRestart($) @@ -278,7 +282,10 @@ sub OnRestart($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Reload to refresh the tasks' status. Note that all logs and screenshots + # have been cleared so there is no point specifying which one to open or + # adding an anchor. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnAction($$)

1 0

Francois Gouget : testbot/cgi: PageBase does not need Apache2::ServerRec.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: tools Branch: master Commit: f7d0771f1a9ab5efb2444a2c70ecdbe31095f1a2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7d0771f1a9ab5efb2444a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:14:36 2022 +0200 testbot/cgi: PageBase does not need Apache2::ServerRec. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index f76a15f..06dba89 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -39,7 +39,6 @@ use Exporter 'import'; our @EXPORT = qw(CreatePageBase); use Apache2::Const -compile => qw(REDIRECT); -use Apache2::ServerRec; use CGI::Cookie; use URI::Escape; use WineTestBot::CGI::Sessions;

1 0

Eric Pouech : winmm: Properly handle mmioRead/mmioWrite in case of errors.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 0de8d01b09b1cc7ca34f7ae3890b4a416ff801fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de8d01b09b1cc7ca34f7ae3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 30 14:57:44 2022 +0200 winmm: Properly handle mmioRead/mmioWrite in case of errors. In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 4 ++-- dlls/winmm/playsound.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..d61b3c90c49 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1234,7 +1234,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, LONG ix; ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + if (ix < 0 || ix < 2*sizeof(DWORD)) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1336,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..d844bf9b0ab 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -262,6 +262,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) INT count, bufsize, left, index; struct playsound_data s; void* data; + LONG r; s.hEvent = 0; @@ -361,7 +362,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + r = mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize); + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

1 0

Eric Pouech : mciwave: Correctly handle error return status from mmioRead.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 90ecf27d096c8165d3409513ae1cd3f55ab2d8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ecf27d096c8165d3409513… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 30 14:57:38 2022 +0200 mciwave: Correctly handle error return status from mmioRead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3ca884ed6e0 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; }

1 0

Alexandre Julliard : wrc: Store language as a simple integer.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 49bea92bdc1e71c9d05c84547dba11798c373ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=49bea92bdc1e71c9d05c8454… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:10 2022 +0200 wrc: Store language as a simple integer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 47 ++++++++++++------------- tools/wrc/newstruc.c | 29 ++++------------ tools/wrc/newstruc.h | 4 +-- tools/wrc/parser.y | 63 ++++++++++++++------------------- tools/wrc/po.c | 98 ++++++++++++++++++++++++++-------------------------- tools/wrc/utils.c | 6 ++-- tools/wrc/utils.h | 2 +- tools/wrc/wrc.c | 23 ++++-------- tools/wrc/wrc.h | 2 +- tools/wrc/wrctypes.h | 11 ++---- 10 files changed, 120 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49bea92bdc1e71c9d05c…

1 0

Alexandre Julliard : wrc: Remove resource dumping support.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 234710e8f7777796c1a2b0e0d182b68fe88aa0cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=234710e8f7777796c1a2b0e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:03 2022 +0200 wrc: Remove resource dumping support. winedump can be used to debug resource contents. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/dumpres.c | 924 -------------------------------------------------- tools/wrc/dumpres.h | 30 -- tools/wrc/parser.y | 3 - tools/wrc/utils.c | 10 + tools/wrc/utils.h | 1 + tools/wrc/wrc.c | 4 - 7 files changed, 11 insertions(+), 962 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=234710e8f7777796c1a2…

1 0

Jacek Caban : win32u: Move NtUserSendInput implementation from user32.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 6ff2d287c2a74c7701e649218d3f4fc39014ab79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff2d287c2a74c7701e64921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:47:12 2022 +0200 win32u: Move NtUserSendInput implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 +---- dlls/user32/input.c | 103 +------------------------------------ dlls/user32/message.c | 117 ------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 93 +++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/sysparams.c | 2 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 2 +- 14 files changed, 105 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ff2d287c2a74c7701e6…

1 0