- Wine-Devel - list.winehq.org

Re: [PATCH v2 0/2] MR121: gdi32: A couple of EMF DC fixes. - approved
by Alexandre Julliard (＠julliard) May 24, 2022

May 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/121

1 0

Re: [PATCH v2 0/6] MR118: windows.media.speech: IAsyncAction implementation. - approved
by Alexandre Julliard (＠julliard) May 24, 2022

May 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/118

1 0

Re: [PATCH v2 0/6] MR120: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) May 24, 2022

May 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/120

1 0

Re: [PATCH v2 0/6] MR119: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) May 24, 2022

May 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/119

1 0

[PATCH v2 0/4] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger May 24, 2022

May 24, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> -- v2: d3d9/tests: Extend color_fill_test. wined3d: Store clear colors in subresources (v3). wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors (v2). wined3d: Add a memory_colour_fill path for clearing the entire level to zero. https://gitlab.winehq.org/wine/wine/-/merge_requests/109

3 8

[PATCH 0/5] MR83: MPEG audio decoder seeking and quality control
by Anton Baskanov (＠baskanov) May 24, 2022

May 24, 2022

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

3 6

[tools v2 1/3] testbot/web: Add support for adding and removing roles.
by Francois Gouget May 24, 2022

May 24, 2022

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. --- v1 failed to apply because the context had a bit from a patch in my worktree adding a copy of the "Special Jobs" page (I guess that patch should not be part of my "configuration tweaks for my copy of the TestBot" patches). --- 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 c42a4f2b4..40f519737 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -559,6 +559,8 @@ EOF "'>Special Jobs</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

[PATCH 1/2] mmdevapi: Truncate strings from PropertyStore's GetValue to 62 chars.
by Gabriel Ivăncescu May 24, 2022

May 24, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Not sure if this is the best solution, but... dlls/mmdevapi/devenum.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index ed1daa8..f5799be 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1378,6 +1378,8 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); + HRESULT hres; + TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) @@ -1397,7 +1399,16 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY return S_OK; } - return MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv); + hres = MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv); + if (FAILED(hres)) + return hres; + + /* Some broken apps and libs (e.g. Split/Second with fmodex) + can't deal with strings longer than 62 characters + NUL. */ + if (pv->vt == VT_LPWSTR && wcslen(pv->pwszVal) > 62) + pv->pwszVal[62] = '\0'; + + return hres; } static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv) -- 2.34.1

2 7

[PATCH v6 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) May 24, 2022

May 24, 2022

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v6: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

2 10

[PATCH] conhost: Set correct face name when the specified font is not available
by Hugh McMaster May 24, 2022

May 24, 2022

conhost.exe currently copies the user-specified face name from the LOGFONT structure. This results in an invalid face name when the specified font is not available. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 582badf43b5..5e8c3e15a4f 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -678,6 +678,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + WCHAR face_name[LF_FACESIZE]; CPINFO cpinfo; HDC dc; @@ -703,6 +704,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) old_font = SelectObject( dc, font ); GetTextMetricsW( dc, &tm ); + font_info->face_len = GetTextFaceW( dc, ARRAY_SIZE(face_name), face_name ) - 1; SelectObject( dc, old_font ); ReleaseDC( console->win, dc ); @@ -712,9 +714,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ); font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); + memcpy( font_info->face_name, face_name, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) -- 2.36.1

2 1