- Wine-Devel - list.winehq.org

Re: [PATCH v3 1/4] dwrite/tests: Add some tests for Segoe UI font family.
by Nikolay Sivov April 6, 2022

April 6, 2022

> + > +static void test_SegoeUI(void) > +{ > + HRESULT hr; > + IDWriteFactory2 *factory; > + IDWriteFontCollection *collection; > + IDWriteFontFamily *family; > + IDWriteFont *font; > + UINT32 index, count, i; > + WCHAR name[256]; > + BOOL exists, found; > + > + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, > &IID_IDWriteFactory2, (IUnknown **)&factory); > + if (hr != S_OK) > + { > + win_skip("IDWriteFactory2 is not supported\n"); > + return; > + } > + > + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, > FALSE); > + ok(hr == S_OK, "got %#x\n", hr); > + > + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", > &index, &exists); > + ok(hr == S_OK, "got %#x\n", hr); > + if (!exists) > + { > + skip("Segoe UI is not installed\n"); > + IDWriteFontCollection_Release(collection); > + IDWriteFactory2_Release(factory); > + return; > + } > + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); > + > + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); > + ok(hr == S_OK, "got %#x\n", hr); > + > + count = IDWriteFontFamily_GetFontCount(family); > + trace("family Segoe UI has %u fonts\n", count); > + > + found = FALSE; > + > + for (i = 0; i < count; i++) > + { > + hr = IDWriteFontFamily_GetFont(family, i, &font); > + ok(hr == S_OK, "got %#x\n", hr); > + > + get_font_name(font, name, ARRAY_SIZE(name)); > + if (!wcscmp(name, L"Segoe UI Symbol")) > + found = TRUE; > + > + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); > + ok(hr == S_OK, "got %#x\n", hr); > + ok(!exists, "%u: %s has character 0x25d4\n", i, > wine_dbgstr_w(name)); > + > + IDWriteFont_Release(font); > + } > + > + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); > + > + IDWriteFontFamily_Release(family); > + IDWriteFontCollection_Release(collection); > + IDWriteFactory2_Release(factory); > +} All this does is checking if font is installed, and we know it is installed on all current Windows versions, it's not some directwrite functionality. Second patch will already trigger a todo case when font is installed in Wine.

2 4

[PATCH 6/6] win32u: Move NtUserCloseClipboard implementation from user32.
by Jacek Caban April 6, 2022

April 6, 2022

3 2

[PATCH 5/6] user.exe: Remove no longer used wait_message16.
by Jacek Caban April 6, 2022

April 6, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/message.c | 15 --------------- dlls/user.exe16/user_private.h | 2 -- dlls/user32/controls.h | 2 -- dlls/user32/driver.c | 11 +---------- dlls/user32/winproc.c | 10 ---------- 5 files changed, 1 insertion(+), 39 deletions(-)

3 2

[PATCH 4/6] win32u: Move process_hardware_message implementation from user32.
by Jacek Caban April 6, 2022

April 6, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 395 +---------------------------------- dlls/user32/user_main.c | 3 +- dlls/user32/user_private.h | 4 +- dlls/win32u/message.c | 393 +++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 4 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 8 +- 7 files changed, 405 insertions(+), 406 deletions(-)

3 2

[PATCH 3/6] win32u: Move NtUserPostMessage implementation from user32.
by Jacek Caban April 6, 2022

April 6, 2022

3 2

[PATCH 2/6] win32u: Move NtUserPostThreadMessage implementation from user32.
by Jacek Caban April 6, 2022

April 6, 2022

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

3 2

[PATCH 1/6] win32u: Add missing return in NtUserExitingThread implementation.
by Jacek Caban April 6, 2022

April 6, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/9] mf/tests: Simplify handling of broken Win7 results.
by Rémi Bernon April 6, 2022

April 6, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Sending tests first instead, as the review that more tests may be useful. It's not all completely related to H264, but I'm thinking that using the ColorConvertDMO transform instead of a videoconvert element might be best to correctly support H264 transform format changes, although none of the games I've tried are doing that. dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); -- 2.35.1

1 8

[tools] testbot/cgi: Let CollectionBlock operate in read-only mode.
by Francois Gouget April 6, 2022

April 6, 2022

When in read-only mode the CollectionBlock does not allow any per-item or global action to be performed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids having to redefine GetItemActions() and GetActions() for the sole purpose of preventing the default actions on a collection block and thus removes a bit of code. When a collection block can operate either in read-only or read-write mode depending on the circumstances (failure blacklist pages) this also makes centralizing the corresponding test a no-brainer. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 39 ++++++++++++++++--- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++++ testbot/web/PatchesList.pl | 13 +------ testbot/web/index.pl | 32 +-------------- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 40ad61b2b..13c2a62bd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -53,7 +53,7 @@ use URI::Escape; =item C<new()> -Creates a table showing the content of the specified Collection with +Creates a table showing the content of the specified Collection with optional support for performing actions on selected rows, or performing global actions. Parameters: @@ -67,6 +67,8 @@ ObjectModel::CGI::Page interface. =back +Note that by default the table is in read-write mode (see SetReadWrite()). + =back =cut @@ -76,7 +78,9 @@ sub new($$$@) my ($Collection, $EnclosingPage) = @_; my $self = {Collection => $Collection, - EnclosingPage => $EnclosingPage}; + EnclosingPage => $EnclosingPage, + RW => 1, + }; $self = bless $self, $class; $self->_initialize(@_); return $self; @@ -92,6 +96,28 @@ sub Create($$@) return ObjectModel::CGI::CollectionBlock->new(@_); } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the table allows selecting rows and applying actions to +them (see GetItemActions()), as well as performing global actions (see +GetActions()). + +Otherwise none of this is allowed, regardless of what GetItemActions() and +GetActions() return. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + sub GetDetailsPage($) { my ($self) = @_; @@ -405,7 +431,7 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $ItemActions = $self->GetItemActions(); + my $ItemActions = $self->{RW} ? $self->GetItemActions() : []; $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; @@ -459,7 +485,7 @@ EOF print "</div>\n"; } - my $Actions = $self->GetActions(); + my $Actions = $self->{RW} ? $self->GetActions() : []; if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -499,6 +525,7 @@ column of checkboxes is added. sub GetItemActions($) { #my ($self) = @_; + return ["Delete"]; } @@ -523,7 +550,7 @@ sub OnItemAction($$$) { my ($self, $Item, $Action) = @_; - if ($Action eq "Delete") + if ($self->{RW} and $Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); if (defined $ErrMessage) @@ -587,7 +614,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Add " . $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 2de667b89..7bdd27e26 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -87,6 +87,13 @@ sub _initialize($$$$;$) $self->SUPER::_initialize($Request, $RequiredRole); } +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{CollectionBlock}->SetReadWrite($RW); +} + # # HTML page generation diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 49e16d8d2..854c2768a 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -64,18 +64,6 @@ sub GenerateDataCell($$$$$) } } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - package main; @@ -84,5 +72,6 @@ use WineTestBot::Patches; my $Request = shift; my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +$Page->SetReadWrite(0); $Page->SetRefreshInterval(60); $Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d2dd2b49d..85f8df39f 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -43,18 +43,6 @@ sub SortKeys($$) return \@SortedKeys; } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -207,18 +195,6 @@ sub SortKeys($$) return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,12 +205,6 @@ sub DisplayProperty($$) $PropertyName eq "Description"; } -sub GetDetailsPage($) -{ - #my ($self) = @_; - return undef; -} - package StatusPage; @@ -344,6 +314,7 @@ sub GenerateBody($) my $CutOff = time() - $Days * 24 * 60 * 60; $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); + $JobsCollectionBlock->SetReadWrite(0); # We need to collect information about the tasks of all jobs except the # pretty rare queued jobs. But doing so one job at a time is inefficient so @@ -384,6 +355,7 @@ EOF print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n"; -- 2.30.2

1 0

[tools 1/2] testbot/SetWinLocale: Add an option to change the locale of VMs.
by Francois Gouget April 6, 2022

April 6, 2022

The --vm ensures the right TestAgent connection parameters will be used to connect to the specified VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This partially reverts commit 206c7478dcb4 but with some important differences: - It does not parse the VM name to infer the locale to be used. Here --vm is purely a way to specify how to connect to that machine's TestAgentd server. - It does not add back the options for 'refreshing' snapshots, or creating new VMs for the specified locales. Those were not used and are not coming back. --- testbot/bin/SetWinLocale | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 670de4604..e41af2088 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -40,6 +40,7 @@ use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +use WineTestBot::VMs; my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; @@ -315,7 +316,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); +my ($OptVM, $OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -324,6 +325,10 @@ while (@ARGV) { $Usage = 0; } + elsif ($Arg eq "--vm") + { + $OptVM = CheckValue($Arg, $OptVM); + } elsif ($Arg eq "--show") { $OptShow = 1; @@ -415,10 +420,25 @@ while (@ARGV) } # Check and untaint parameters -my ($Keyboard, $CountryId); +my ($VM, $Keyboard, $CountryId); if (!defined $Usage) { - if (!defined $OptHostName) + if (defined $OptVM) + { + my $VMs = CreateVMs(); + $VM = $VMs->GetItem($OptVM); + if (!$VM) + { + Error("could not find the '$OptVM' VM\n"); + $Usage = 2; + } + elsif (!$Debug and $VM->Role eq "deleted") + { + Error("'$OptVM' is marked for deletion\n"); + $Usage = 2; + } + } + elsif (!defined $OptHostName) { Error("you must specify the Windows machine to work on\n"); $Usage = 2; @@ -510,14 +530,16 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] HOSTNAME\n"; + print "Usage: $name0 [options] --show (HOSTNAME|--vm VM)\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] (HOSTNAME|--vm VM)\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; + print " --vm VM Work on the specified TestBot VM, using its TestAgent\n"; + print " connection parameters.\n"; print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; @@ -604,7 +626,7 @@ if (defined $Usage) exit 0; } -$TA = TestAgent->new($OptHostName, $AgentPort); +$TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); # -- 2.30.2

1 1