- Wine-devel - list.winehq.org

[PATCH] dwrite/opentype: Fix GPOS PairSet array offset.
by Nikolay Sivov 19 May '22

19 May '22

Passed offset already includes subtable offset. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 50e83769715..8e4bd7a62dc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4025,7 +4025,7 @@ static BOOL opentype_layout_apply_gpos_pair_adjustment(struct scriptshaping_cont value_len2 * sizeof(WORD); pairset_offset = subtable_offset + GET_BE_WORD(format1->pairsets[coverage_index]); - pairset = table_read_ensure(table, subtable_offset + pairset_offset, pairvalue_len * pairvalue_count); + pairset = table_read_ensure(table, pairset_offset, pairvalue_len * pairvalue_count); if (!pairset) return FALSE; -- 2.35.1

1 0

[v3 PATCH 1/2] vbscript: Implement Weekday().
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: improve error handling dlls/vbscript/global.c | 46 +++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1d3929ba249..15625157814 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1982,10 +1982,50 @@ static HRESULT Global_Month(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wMonth); } -static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres = S_OK; + int first_day = 0; + SYSTEMTIME st; + + TRACE("(%s)\n", debugstr_variant(args)); + + assert(args_cnt == 1 || args_cnt == 2); + + /* [vbSunday = 1, vbSaturday = 7] -> wDayOfWeek [0, 6] */ + if (args_cnt == 2) + { + if (V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args + 1, &first_day); + if (SUCCEEDED(hres)) + { + if (!first_day) + { + /* vbUseSystemDayOfWeek */ + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, + sizeof(&first_day) / sizeof(WCHAR)); + first_day = (first_day + 1) % 7; + } + else if (first_day >= 1 && first_day <= 7) + { + first_day--; + } + else + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + if (FAILED(hres)) + return hres; + + if (V_VT(args) == VT_NULL) + return return_null(res); + + if (FAILED(hres = to_system_time(args, &st))) return hres; + + return return_short(res, 1 + (7 - first_day + st.wDayOfWeek) % 7); } static HRESULT Global_Year(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..d27c373a964 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2036,4 +2036,57 @@ call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) call testDateAddError() +sub testWeekday(d, firstday, wd) + dim x, x2 + x = Weekday(d, firstday) + call ok(x = wd, "weekday = " & x & " expected " & wd) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) + if firstday = vbSunday then + x = Weekday(d) + call ok(x = wd, "weekday = " & x & " expected " & wd) + end if + x = Weekday(d, vbUseSystemDayOfWeek) + x2 = Weekday(d, firstDayOfWeek) + call ok(x = x2, "weekday = " & x & " expected " & x2) +end sub + +sub testWeekdayError() + on error resume next + dim x + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), 10) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = Weekday(null, vbSunday) + call ok(Err.number = 0, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call Err.clear() + call Weekday(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, "a") + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), "a") + call ok(Err.number = 13, "Err.number = " & Err.number) +end sub + +call testWeekday(DateSerial(2000, 1, 1), vbSunday, 7) +call testWeekday(DateSerial(2000, 1, 1), vbMonday, 6) +call testWeekday(DateSerial(2000, 1, 1), vbTuesday, 5) +call testWeekday(DateSerial(2000, 1, 1), vbWednesday, 4) +call testWeekday(DateSerial(2000, 1, 1), vbThursday, 3) +call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) +call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) +call testWeekdayError() + Call reportSuccess() -- 2.35.1

2 3

[tools 1/3] testbot/web: Add support for adding and removing roles.
by Francois Gouget 19 May '22

19 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't forsee a need to add / remove roles but it is useful to at least be able to see which ones exist. In that it's similar to the Branches pages and fills a hole in the website administration interface. These pages are also little more than a 's/Branch/Role/g' of the Branches pages and should not require much maintenance. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 ++ testbot/web/admin/RoleDetails.pl | 42 +++++++++++++++++++++++++ testbot/web/admin/RolesList.pl | 30 ++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 testbot/web/admin/RoleDetails.pl create mode 100644 testbot/web/admin/RolesList.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 0dacbf6dd..3a78a44d4 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -558,6 +558,8 @@ EOF "'>Special Jobs (old)</a></li>\n"; print " <li><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></li>\n"; + print " <li><a href='", MakeSecureURL("/admin/RolesList.pl"), + "'>Roles</a></li>\n"; print " <li class='divider'> </li>\n"; print " <li><a href='", MakeSecureURL("/admin/VMsList.pl"), "'>VMs</a></li>\n"; diff --git a/testbot/web/admin/RoleDetails.pl b/testbot/web/admin/RoleDetails.pl new file mode 100644 index 000000000..3f6d02eb8 --- /dev/null +++ b/testbot/web/admin/RoleDetails.pl @@ -0,0 +1,42 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Role details page +# +# Copyright 2010 VMware, Inc. +# +# 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 RoleDetailsPage; + +use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + +use WineTestBot::Roles; + + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole, CreateRoles()); +} + + +package main; + +my $Request = shift; +my $Page = RoleDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/RolesList.pl b/testbot/web/admin/RolesList.pl new file mode 100644 index 000000000..3fb765b0a --- /dev/null +++ b/testbot/web/admin/RolesList.pl @@ -0,0 +1,30 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Role 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 +# 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 main; + +use ObjectModel::CGI::CollectionPage; +use WineTestBot::Roles; + +my $Request = shift; +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateRoles()); +$Page->GeneratePage(); -- 2.30.2

1 2

winegstream fix chug
by Zlice Z 19 May '22

19 May '22

commit https://github.com/wine-mirror/wine/commit/f7a5bf7be1b43ff295723c15c296c943… Moved out of a switch-case with a break and does not return from send_buf() Causes massive chugging in Fallout 3 when the radio ends/begins a new song. Still get (wine:17951): GStreamer-CRITICAL **: 19:23:05.389: gst_segment_do_seek: assertion 'start <= stop' failed on command line though. --- src/dlls/winegstreamer/quartz_parser.c 2022-05-18 18:44:35.638648511 -0400 +++ src/dlls/winegstreamer/quartz_parser.c 2022-05-18 19:07:29.212580858 -0400 @@ -779,6 +779,7 @@ pin->seek.llCurrent, pin->seek.llStop, pin->seek.dRate))) WARN("Failed to deliver new segment, hr %#lx.\n", hr); pin->need_segment = false; + return; } if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx)

2 1

[tools] testbot/orm: Let the Collection Items field pop into existence when needed.
by Francois Gouget 19 May '22

19 May '22

Collections don't check that it exists so all setting it in the constructor does is waste memory. Documenting its existence there is enough. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 4e7a032a3..63d470bbc 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -93,7 +93,8 @@ sub new($$$$$;$$@) MasterKey => ComputeMasterKey($MasterColValues), # Filter => undef by default AllScopeItems => $AllScopeItems || {}, - Items => undef}; + # Items => undef by default + }; if ($AllScopeItems) { # Avoid memory cycles in case Items have Detailref properties: @@ -138,7 +139,8 @@ sub Clone($) MasterKey => $self->{MasterKey}, # Filter => undef by default AllScopeItems => $self->{AllScopeItems}, - Items => undef}; + # Items => undef by default + }; # See Collection::new() weaken($Copy->{AllScopeItems}); -- 2.30.2

1 0

[tools] testbot/orm: Let AddFilter() create the Collection Filter field.
by Francois Gouget 19 May '22

19 May '22

All that initializing Filter in the constructor does is waste memory. Documenting its existence there is enough. Furthermore Clone() shouldn't have been setting it to an empty hashref. Fortunately a typo made this ineffectual. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index bec5b1c5c..4e7a032a3 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -91,7 +91,7 @@ sub new($$$$$;$$@) MasterColNames => $MasterColNames, MasterColValues => $MasterColValues, MasterKey => ComputeMasterKey($MasterColValues), - Filter => undef, + # Filter => undef by default AllScopeItems => $AllScopeItems || {}, Items => undef}; if ($AllScopeItems) @@ -136,7 +136,7 @@ sub Clone($) MasterColNames => $self->{MasterColNames}, MasterColValues => $self->{MasterColValues}, MasterKey => $self->{MasterKey}, - Filters => {}, + # Filter => undef by default AllScopeItems => $self->{AllScopeItems}, Items => undef}; # See Collection::new() -- 2.30.2

1 0

[tools] testbot/orm: Remove the $ColPrefix BuildKeyWhere() parameter.
by Francois Gouget 19 May '22

19 May '22

It is unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 10cc1f3c3..dc527d465 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -132,9 +132,9 @@ sub FromDb($$$) return $Value; } -sub BuildKeyWhere($$$$) +sub BuildKeyWhere($$$) { - my ($self, $PropertyDescriptors, $ColPrefix, $Where) = @_; + my ($self, $PropertyDescriptors, $Where) = @_; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { @@ -146,7 +146,7 @@ sub BuildKeyWhere($$$$) { $Where .= " AND "; } - $Where .= $ColPrefix . $ColName . " = ?"; + $Where .= "$ColName = ?"; } } } @@ -363,8 +363,7 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), "", - $Where); + $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); push @Data, $Collection->SplitKey($RequestedKey); my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); @@ -480,7 +479,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, "", $Where); + $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -606,8 +605,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), "", - $Where); + $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . -- 2.30.2

1 0

[tools] testbot/cgi: In case of insufficient privileges redirect to the main page.
by Francois Gouget 19 May '22

19 May '22

There is no point asking already logged in users to log in again if they don't have enough privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 3a78a44d4..d68b97289 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -88,12 +88,15 @@ sub new($$$$@) { $self->CheckSecurePage(); my $Session = $self->GetCurrentSession(); - if (! defined($Session) || - ! $Session->User->HasRole($RequiredRole)) + if (!defined $Session) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); exit($self->Redirect(MakeSecureURL($LoginURL))); } + elsif (!$Session->User->HasRole($RequiredRole)) + { + exit($self->Redirect("/")); + } } $self->_initialize(@_); -- 2.30.2

1 0

[PATCH 0/4] MR91: d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality
by Alistair Leslie-Hughes (＠alesliehughes) 19 May '22

19 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/91

4 6

[PATCH 0/6] MR97: win32u: user32 conversion
by Jacek Caban (＠jacek) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/97

3 7