May 2022 - Wine-commits - list.winehq.org

Jacek Caban : winemac: Remove CF_BITMAP format handling.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: fad7029c1c1c46c2d85ee2cc71133ddb595e3a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fad7029c1c1c46c2d85ee2cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 21 22:19:40 2022 +0200 winemac: Remove CF_BITMAP format handling. It's synthesized in user32 from DIB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 101 ------------------------------------------- 1 file changed, 101 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9a498cde2f7..be0ddbecd8c 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -67,7 +67,6 @@ typedef struct _WINE_CLIPFORMAT **************************************************************************/ static HANDLE import_clipboard_data(CFDataRef data); -static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_html(CFDataRef data); @@ -78,7 +77,6 @@ static HANDLE import_utf8_to_unicodetext(CFDataRef data); static HANDLE import_utf16_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); -static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); @@ -142,7 +140,6 @@ static const struct BOOL synthesized; } builtin_format_ids[] = { - { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, @@ -470,66 +467,6 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse) } -/*********************************************************************** - * create_dib_from_bitmap - * - * Allocates a packed DIB and copies the bitmap data into it. - */ -static HGLOBAL create_dib_from_bitmap(HBITMAP bitmap) -{ - HANDLE ret = 0; - BITMAPINFOHEADER header; - HDC hdc = NtUserGetDCEx(0, 0, DCX_USESTYLE); - DWORD header_size; - BITMAPINFO *bmi; - - memset(&header, 0, sizeof(header)); - header.biSize = sizeof(header); - if (!GetDIBits(hdc, bitmap, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS)) goto done; - - header_size = bitmap_info_size((BITMAPINFO *)&header, DIB_RGB_COLORS); - if (!(ret = GlobalAlloc(GMEM_FIXED, header_size + header.biSizeImage))) goto done; - bmi = (BITMAPINFO *)ret; - memset(bmi, 0, header_size); - memcpy(bmi, &header, header.biSize); - GetDIBits(hdc, bitmap, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS); - -done: - NtUserReleaseDC(0, hdc); - return ret; -} - - -/************************************************************************** - * create_bitmap_from_dib - * - * Given a packed DIB, creates a bitmap object from it. - */ -static HANDLE create_bitmap_from_dib(HANDLE dib) -{ - HANDLE ret = 0; - BITMAPINFO *bmi; - - if (dib && (bmi = GlobalLock(dib))) - { - HDC hdc; - unsigned int offset; - - hdc = NtUserGetDCEx(NULL, 0, DCX_USESTYLE); - - offset = bitmap_info_size(bmi, DIB_RGB_COLORS); - - ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset, - bmi, DIB_RGB_COLORS); - - GlobalUnlock(dib); - NtUserReleaseDC(NULL, hdc); - } - - return ret; -} - - /************************************************************************** * get_html_description_field * @@ -587,23 +524,6 @@ static HANDLE import_clipboard_data(CFDataRef data) } -/************************************************************************** - * import_bmp_to_bitmap - * - * Import BMP data, converting to CF_BITMAP format. - */ -static HANDLE import_bmp_to_bitmap(CFDataRef data) -{ - HANDLE ret; - HANDLE dib = import_bmp_to_dib(data); - - ret = create_bitmap_from_dib(dib); - - GlobalFree(dib); - return ret; -} - - /************************************************************************** * import_bmp_to_dib * @@ -995,27 +915,6 @@ static CFDataRef export_clipboard_data(HANDLE data) } -/************************************************************************** - * export_bitmap_to_bmp - * - * Export CF_BITMAP to BMP file format. - */ -static CFDataRef export_bitmap_to_bmp(HANDLE data) -{ - CFDataRef ret = NULL; - HGLOBAL dib; - - dib = create_dib_from_bitmap(data); - if (dib) - { - ret = export_dib_to_bmp(dib); - GlobalFree(dib); - } - - return ret; -} - - /************************************************************************** * export_dib_to_bmp *

1 0

Jacek Caban : winemac: Remove CF_METAFILEPICT format handling.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 96e9359fe5b43f242a184d222889db1ed53eb84d URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e9359fe5b43f242a184d22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 21 22:39:08 2022 +0200 winemac: Remove CF_METAFILEPICT format handling. It's synthesized in user32 from EMF. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 57 -------------------------------------------- 1 file changed, 57 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index be0ddbecd8c..ec8aa130211 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -70,7 +70,6 @@ static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_html(CFDataRef data); -static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_utf8_to_text(CFDataRef data); static HANDLE import_utf8_to_unicodetext(CFDataRef data); @@ -81,7 +80,6 @@ static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_html(HANDLE data); -static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf16(HANDLE data); @@ -144,7 +142,6 @@ static const struct { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.oemtext"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_PALETTE, CFSTR("org.winehq.builtin.palette"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_PENDATA, CFSTR("org.winehq.builtin.pendata"), import_clipboard_data, export_clipboard_data, FALSE }, @@ -610,33 +607,6 @@ static HANDLE import_html(CFDataRef data) } -/************************************************************************** - * import_metafilepict - * - * Import metafile picture data, converting it to CF_METAFILEPICT. - */ -static HANDLE import_metafilepict(CFDataRef data) -{ - HANDLE ret = 0; - CFIndex len = CFDataGetLength(data); - METAFILEPICT *mfp; - - TRACE("data %s\n", debugstr_cf(data)); - - if (len >= sizeof(*mfp) && (ret = GlobalAlloc(GMEM_FIXED, sizeof(*mfp)))) - { - const BYTE *bytes = (const BYTE*)CFDataGetBytePtr(data); - - mfp = GlobalLock(ret); - memcpy(mfp, bytes, sizeof(*mfp)); - mfp->hMF = SetMetaFileBitsEx(len - sizeof(*mfp), bytes + sizeof(*mfp)); - GlobalUnlock(ret); - } - - return ret; -} - - /************************************************************************** * import_nsfilenames_to_hdrop * @@ -1113,33 +1083,6 @@ failed: } -/************************************************************************** - * export_metafilepict - * - * Export a metafile to data. - */ -static CFDataRef export_metafilepict(HANDLE data) -{ - CFMutableDataRef ret = NULL; - METAFILEPICT *mfp = GlobalLock(data); - unsigned int size = GetMetaFileBitsEx(mfp->hMF, 0, NULL); - - TRACE("data %p\n", data); - - ret = CFDataCreateMutable(NULL, sizeof(*mfp) + size); - if (ret) - { - CFDataAppendBytes(ret, (UInt8*)mfp, sizeof(*mfp)); - CFDataIncreaseLength(ret, size); - GetMetaFileBitsEx(mfp->hMF, size, (BYTE*)CFDataGetMutableBytePtr(ret) + sizeof(*mfp)); - } - - GlobalUnlock(data); - TRACE(" -> %s\n", debugstr_cf(ret)); - return ret; -} - - /************************************************************************** * export_text_to_utf8 *

1 0

Jacek Caban : winemac: Use CFSTR_INETURLW instead of deprecated CFSTR_SHELLURLW.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 245fbfe0109397119d4b176cdb6180f9cf702b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=245fbfe0109397119d4b176c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 21 16:24:54 2022 +0200 winemac: Use CFSTR_INETURLW instead of deprecated CFSTR_SHELLURLW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 84 +------------------------------------------- 1 file changed, 1 insertion(+), 83 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ec8aa130211..b3d7f79b7a9 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -71,7 +71,6 @@ static HANDLE import_bmp_to_dib(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_html(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); -static HANDLE import_utf8_to_text(CFDataRef data); static HANDLE import_utf8_to_unicodetext(CFDataRef data); static HANDLE import_utf16_to_unicodetext(CFDataRef data); @@ -80,7 +79,6 @@ static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_html(HANDLE data); -static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf16(HANDLE data); @@ -182,7 +180,7 @@ static const struct { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, { wszHTMLFormat, NULL, import_clipboard_data, export_clipboard_data }, { wszHTMLFormat, CFSTR("public.html"), import_html, export_html, TRUE }, - { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, + { CFSTR_INETURLW, CFSTR("public.url"), import_utf8_to_unicodetext, export_unicodetext_to_utf8 }, }; /* The prefix prepended to a Win32 clipboard format name to make a Mac pasteboard type. */ @@ -725,45 +723,6 @@ done: } -/************************************************************************** - * import_utf8_to_text - * - * Import a UTF-8 string, converting the string to CF_TEXT. - */ -static HANDLE import_utf8_to_text(CFDataRef data) -{ - HANDLE ret = NULL; - HANDLE unicode_handle = import_utf8_to_unicodetext(data); - LPWSTR unicode_string = GlobalLock(unicode_handle); - - if (unicode_string) - { - int unicode_len; - HANDLE handle; - char *p; - INT len; - - unicode_len = GlobalSize(unicode_handle) / sizeof(WCHAR); - - len = WideCharToMultiByte(CP_ACP, 0, unicode_string, unicode_len, NULL, 0, NULL, NULL); - if (!unicode_len || unicode_string[unicode_len - 1]) len += 1; - handle = GlobalAlloc(GMEM_FIXED, len); - - if (handle && (p = GlobalLock(handle))) - { - WideCharToMultiByte(CP_ACP, 0, unicode_string, unicode_len, p, len, NULL, NULL); - p[len - 1] = 0; - GlobalUnlock(handle); - ret = handle; - } - GlobalUnlock(unicode_handle); - } - - GlobalFree(unicode_handle); - return ret; -} - - /************************************************************************** * import_utf8_to_unicodetext * @@ -1083,47 +1042,6 @@ failed: } -/************************************************************************** - * export_text_to_utf8 - * - * Export CF_TEXT to UTF-8. - */ -static CFDataRef export_text_to_utf8(HANDLE data) -{ - CFDataRef ret = NULL; - const char* str; - - if ((str = GlobalLock(data))) - { - int str_len = GlobalSize(data); - int wstr_len; - WCHAR *wstr; - HANDLE unicode; - char *p; - - wstr_len = MultiByteToWideChar(CP_ACP, 0, str, str_len, NULL, 0); - if (!str_len || str[str_len - 1]) wstr_len += 1; - wstr = HeapAlloc(GetProcessHeap(), 0, wstr_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, str_len, wstr, wstr_len); - wstr[wstr_len - 1] = 0; - - unicode = GlobalAlloc(GMEM_FIXED, wstr_len * sizeof(WCHAR)); - if (unicode && (p = GlobalLock(unicode))) - { - memcpy(p, wstr, wstr_len * sizeof(WCHAR)); - GlobalUnlock(unicode); - } - - ret = export_unicodetext_to_utf8(unicode); - - GlobalFree(unicode); - GlobalUnlock(data); - } - - return ret; -} - - /************************************************************************** * export_unicodetext_to_utf8 *

1 0

Francois Gouget : testbot/web: Add support for adding and removing roles.
by Alexandre Julliard 24 May '22

24 May '22

Module: tools Branch: master Commit: 500584f25168a9f65037ac7100862167b88c08e2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=500584f25168a9f65037ac7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 20:40:38 2022 +0200 testbot/web: Add support for adding and removing roles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 ++ testbot/web/admin/RoleDetails.pl | 42 +++++++++++++++++++++++++++++++++ testbot/web/admin/RolesList.pl | 30 +++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index c42a4f2..40f5197 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -559,6 +559,8 @@ EOF "'>Special Jobs</a></p></li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></p></li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/RolesList.pl"), + "'>Roles</a></p></li>\n"; print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/VMsList.pl"), "'>VMs</a></p></li>\n"; diff --git a/testbot/web/admin/RoleDetails.pl b/testbot/web/admin/RoleDetails.pl new file mode 100644 index 0000000..3f6d02e --- /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 0000000..3fb765b --- /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();

1 0

Francois Gouget : testbot: Tweak the Role fields display names.
by Alexandre Julliard 24 May '22

24 May '22

Module: tools Branch: master Commit: bc410bab595251503db1b9efaaabedb070740dcd URL: https://source.winehq.org/git/tools.git/?a=commit;h=bc410bab595251503db1b9e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 20:40:46 2022 +0200 testbot: Tweak the Role fields display names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Roles.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index c37de63..182538c 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -60,8 +60,8 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "Role name", 1, 1, "A", 20), - CreateBasicPropertyDescriptor("IsDefaultRole", "Should new users get this role by default", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("Name", "Role", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("IsDefaultRole", "Default role", !1, 1, "B", 1), ); =pod

1 0

Francois Gouget : testbot/web: Show the user roles and allow editing them.
by Alexandre Julliard 24 May '22

24 May '22

Module: tools Branch: master Commit: 36673956cc9619acb9a2d6da58cf62f10d1627ac URL: https://source.winehq.org/git/tools.git/?a=commit;h=36673956cc9619acb9a2d6d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 20:40:51 2022 +0200 testbot/web: Show the user roles and allow editing them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UserDetails.pl | 129 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index f11d127..798063d 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -2,7 +2,7 @@ # User details page # # Copyright 2009 Ge van Geldorp -# Copyright 2013 Francois Gouget +# Copyright 2013-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 @@ -20,6 +20,111 @@ use strict; + +package RolesBlock; + +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); + +use URI::Escape; + +use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Utils; + + +sub _initialize($$$) +{ + my ($self, $Collection, $EnclosingPage) = @_; + + $self->SUPER::_initialize($self, $Collection, $EnclosingPage); + $self->{User} = $self->{EnclosingPage}->{Item}; + $self->{UserName} = $self->{User}->Name; +} + +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + my %Props; + map { $Props{$_->GetName()} = $_ } @{$self->{Collection}->GetPropertyDescriptors()}; + return [ + CreateBasicPropertyDescriptor($self->{UserName}, $self->{UserName}, !1, !1, "B", 1), + $Props{IsDefaultRole}, + $Props{Name}, + ]; +} + +sub GetPropertyValue($$$) +{ + my ($self, $Row, $Col) = @_; + + return $Col->{Descriptor}->GetName() eq $self->{UserName} ? + $self->{User}->Roles->HasItem($Row->{Item}->Name) : + $self->SUPER::GetPropertyValue($Row, $Col); +} + +sub GenerateFormStart($) +{ + my ($self) = @_; + + $self->SUPER::GenerateFormStart(); + print "<input type='hidden' name='Key' value='", + uri_escape($self->{User}->GetKey()), "'>\n"; +} + +sub GetItemActions($) +{ + #my ($self) = @_; + + return ["Add role", "Remove role"]; +} + +sub OnItemAction($$$) +{ + my ($self, $Item, $Action) = @_; + + if ($self->{RW} and $Action eq "Add role") + { + return 1 if ($self->{User}->Roles->HasItem($Item->Name)); + + $self->{User}->AddRole($Item); + my $ErrMessage = $self->{User}->Roles->Save(); + if (defined $ErrMessage) + { + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + NotifyAdministrator("New administrator user: $self->{UserName}", + "$self->{UserName} now is an administrator.\n"); + return 1; + } + if ($self->{RW} and $Action eq "Remove role") + { + my $UserRole = $self->{User}->Roles->GetItem($Item->Name); + return 1 if (!$UserRole); + + my $ErrMessage = $self->{User}->Roles->DeleteItem($UserRole); + if (defined $ErrMessage) + { + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + NotifyAdministrator("Removed an administrator: $self->{UserName}", + "$self->{UserName} is no longer an administrator.\n"); + return 1; + } + + $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + return 0; +} + +sub GetActions($) +{ + #my ($self) = @_; + return []; +} + + package UserDetailsPage; use ObjectModel::CGI::ItemPage; @@ -27,6 +132,7 @@ our @ISA = qw(ObjectModel::CGI::ItemPage); use WineTestBot::CGI::Sessions; use WineTestBot::Config; +use WineTestBot::Roles; use WineTestBot::Users; @@ -35,6 +141,10 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + if (!$self->{Item}->GetIsNew()) + { + $self->{RolesBlock} = new RolesBlock(CreateRoles(), $self); + } } sub DisplayProperty($$) @@ -51,6 +161,18 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub GenerateBody($) +{ + my ($self) = @_; + + $self->SUPER::GenerateBody(); + if ($self->{RolesBlock}) + { + print "<h2><a name='Roles'></a>Roles</h2>\n"; + $self->{RolesBlock}->GenerateList(); + } +} + sub GetActions($) { my ($self) = @_; @@ -118,6 +240,11 @@ sub OnAction($$) { return $self->OnSave(); } + elsif ($self->{RolesBlock} and + grep { $_ eq $Action } @{$self->{RolesBlock}->GetItemActions()}) + { + return $self->{RolesBlock}->OnAction($self->GetParam("Action")); + } return $self->SUPER::OnAction($Action); }

1 0

Ziqing Hui : d2d1/tests: Add tests for effect register.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 9e034dc103b20c314484e97ecb68e7982c7eaf27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e034dc103b20c314484e97e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon May 23 11:44:21 2022 +0800 d2d1/tests: Add tests for effect register. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 301 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 301 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e034dc103b20c314484…

1 0

Jacek Caban : winemac: Directly use win32u for user functions in window.c.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: a566df118fc4e2935cac8f3fd3df3fa764ec4a69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a566df118fc4e2935cac8f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 21:29:29 2022 +0200 winemac: Directly use win32u for user functions in window.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/macdrv.h | 26 ++++ dlls/winemac.drv/window.c | 362 ++++++++++++++++++++++++---------------------- 2 files changed, 214 insertions(+), 174 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a566df118fc4e2935cac…

1 0

André Zwing : l3codeca.acm: Avoid mpg123 functions with suffix.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 75b70efdaa2d4baa064271098878b79f66df155f URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b70efdaa2d4baa06427109… Author: André Zwing <nerv(a)dawncrow.de> Date: Sat May 21 17:53:07 2022 +0200 l3codeca.acm: Avoid mpg123 functions with suffix. Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/l3codeca.acm/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index 451794b2624..31765766d4e 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,6 +1,7 @@ MODULE = l3codeca.acm IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) +EXTRADEFS = -DMPG123_NO_LARGENAME C_SRCS = \ mpegl3.c

1 0

André Zwing : mp3dmod: Avoid mpg123 functions with suffix.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 8d441659f7c7ae359e06a99e7abaae57792356a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d441659f7c7ae359e06a99e… Author: André Zwing <nerv(a)dawncrow.de> Date: Sat May 21 17:53:07 2022 +0200 mp3dmod: Avoid mpg123 functions with suffix. Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/mp3dmod/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index dabbb1dfeae..3ba343a4d34 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,6 +1,7 @@ MODULE = mp3dmod.dll IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) +EXTRADEFS = -DMPG123_NO_LARGENAME C_SRCS = \ mp3dmod.c

1 0