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

Francois Gouget : testbot/web: Use Collection::GetSortedItems() to sort record groups.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: tools Branch: master Commit: 659655fffe0235438b81b46d1504a2c69d414981 URL: https://source.winehq.org/git/tools.git/?a=commit;h=659655fffe0235438b81b46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 7 00:30:49 2022 +0200 testbot/web: Use Collection::GetSortedItems() to sort record groups. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/RecordGroups.pm | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 2a1e21f..b82d265 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -111,7 +111,7 @@ sub GetActivity($;$) } my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $RecordGroup (@{$RecordGroups->GetSortedItems()}) { my $Group = { id => $RecordGroup->Id, start => $RecordGroup->Timestamp }; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index f094543..c3022ae 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -43,6 +43,16 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. And use GetColValue() for performance. + return $self->GetColValue("Timestamp") <=> $B->GetColValue("Timestamp") || + $self->GetColValue("Id") <=> $B->GetColValue("Id"); +} + package WineTestBot::RecordGroups; @@ -57,7 +67,7 @@ use WineTestBot::WineTestBotObjects; BEGIN { our @ISA = qw(WineTestBot::WineTestBotCollection); - our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + our @EXPORT = qw(CreateRecordGroups SaveRecord); } use ObjectModel::BasicPropertyDescriptor; @@ -96,16 +106,6 @@ sub CreateRecordGroups(;$) \@PropertyDescriptors, $ScopeObject); } -sub CompareRecordGroups($$) -{ - my ($RecordGroup1, $RecordGroup2) = @_; - - # The Timestamps have a 1 second granularity and may have duplicates. - # So use the Id to break ties. - return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || - $RecordGroup1->Id <=> $RecordGroup2->Id; -} - =pod =over 12

1 0

Francois Gouget : testbot: Optimize the VM comparison method.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: tools Branch: master Commit: 0f125123ca3c99d13ce1632e61a8e58a2806bfcf URL: https://source.winehq.org/git/tools.git/?a=commit;h=0f125123ca3c99d13ce1632… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 7 00:30:58 2022 +0200 testbot: Optimize the VM comparison method. Using Item::GetColValue() is faster than relying on Item::AUTOLOAD. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index ee0c1be..2e475b7 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -177,16 +177,17 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +# Sort retired and deleted VMs last +my %_CmpRole = ("retired" => 1, "deleted" => 2); + sub Compare($$) { my ($self, $B) = @_; - # Sort retired and deleted VMs last - my %RoleOrders = ("retired" => 1, "deleted" => 2); - - return ($RoleOrders{$self->Role} || 0) <=> ($RoleOrders{$B->Role} || 0) || - $self->SortOrder <=> $B->SortOrder || - $self->Name <=> $B->Name; + # Use GetColValue() for performance. + return ($_CmpRole{$self->GetColValue("Role")} || 0) <=> ($_CmpRole{$B->GetColValue("Role")} || 0) || + $self->GetColValue("SortOrder") <=> $B->GetColValue("SortOrder") || + $self->GetColValue("Name") <=> $B->GetColValue("Name"); } sub HasEnabledRole($)

1 0

Francois Gouget : testbot/Engine: Optimize sorting the jobs for scheduling.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: tools Branch: master Commit: ac924787cece99d383ce61101c4718aac87a4977 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ac924787cece99d383ce611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 7 00:31:09 2022 +0200 testbot/Engine: Optimize sorting the jobs for scheduling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index f606c0d..cc2ea1f 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -44,8 +44,9 @@ use WineTestBot::VMs; sub CompareJobPriority { # Process Jobs with a higher Priority value last (it's a niceness in fact), - # and older Jobs first. - return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; + # and older Jobs first. And use GetColValue() for performance. + return $a->GetColValue("Priority") <=> $b->GetColValue("Priority") || + $a->GetColValue("Id") <=> $b->GetColValue("Id"); } =pod

1 0

Francois Gouget : testbot/cgi: Improve the Add button label for multi-word item class names.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: tools Branch: master Commit: b80115f963f28bf38cf089e28f3bf8f582ba714e URL: https://source.winehq.org/git/tools.git/?a=commit;h=b80115f963f28bf38cf089e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 7 00:31:18 2022 +0200 testbot/cgi: Improve the Add button label for multi-word item class names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 13c2a62..736c3f8 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -570,6 +570,15 @@ sub OnItemAction($$$) # Actions handling # +sub GetAddButtonLabel($) +{ + my ($self) = @_; + + my $Label = $self->{Collection}->GetItemName(); + $Label =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Label"; +} + =pod =over 12 @@ -587,9 +596,7 @@ sub GetActions($) { my ($self) = @_; - return $self->GetDetailsPage() ? - ["Add ". $self->{Collection}->GetItemName()] : - []; + return $self->GetDetailsPage() ? [$self->GetAddButtonLabel()] : []; } =pod @@ -614,7 +621,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq $self->GetAddButtonLabel()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols();

1 0

Francois Gouget : testbot/cgi: Simplify link handling in CollectionBlock::GenerateDataCell().
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: tools Branch: master Commit: 819c582b020a2a245228008296d7118872a36984 URL: https://source.winehq.org/git/tools.git/?a=commit;h=819c582b020a2a245228008… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 7 00:31:27 2022 +0200 testbot/cgi: Simplify link handling in CollectionBlock::GenerateDataCell(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 736c3f8..23825d7 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -278,13 +278,6 @@ sub GenerateDataCell($$$$) if ($PropertyDescriptor->GetIsKey() && $DetailsPage) { $NeedLink = 1; - } - else - { - $NeedLink = !1; - } - if ($NeedLink) - { my $Query = "$DetailsPage?Key=" . uri_escape($Item->GetKey()); my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); if (defined($MasterColNames)) @@ -298,10 +291,7 @@ sub GenerateDataCell($$$$) print "<a href='", $self->escapeHTML($Query), "'>"; } print $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); - if ($NeedLink) - { - print "</a>"; - } + print "</a>" if ($NeedLink); print "</td>\n"; }

1 0

Francois Gouget : testbot/cgi: Clean up FormPage's property handling.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: tools Branch: master Commit: 7b3799e6b049e66bf42511141e4e8c412c737b85 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7b3799e6b049e66bf425111… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 7 00:31:43 2022 +0200 testbot/cgi: Clean up FormPage's property handling. Separate getting the value used by the form, from generating the HTML to display or edit it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 191 ++++++++++++++++++++------------ testbot/web/Submit.pl | 2 +- 2 files changed, 124 insertions(+), 69 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c6a8c6b..c419244 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -222,6 +222,17 @@ sub GetPropertyValue($$) # Form field support # +=pod +=over 12 + +=item C<GetDisplayName()> + +Returns the unescaped property's label / description / user-friendly name. +Escaping the name for HTML is the responsibility of the caller. + +=back +=cut + sub GetDisplayName($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,17 +240,54 @@ sub GetDisplayName($$) return $PropertyDescriptor->GetDisplayName(); } -sub GetDisplayValue($$) +=pod +=over 12 + +=item C<GetFormValue()> + +Returns the value to be used for this form's property. + +This is either the value received through the HTTP parameters, or if it was +not specified there, the underlying property value (see GetPropertyValue()). + +Converting that value into a form suitable for viewing (including escaping it +for HTML) or editing is the responsibility of GenerateValueView() and +GenerateValueInput() respectively. + +=back +=cut + +sub GetFormValue($$) { my ($self, $PropertyDescriptor) = @_; my $Value = $self->GetParam($PropertyDescriptor->GetName()); - if (!defined $Value) + return defined $Value ? $Value : + $self->GetPropertyValue($PropertyDescriptor); +} + +=pod +=over 12 + +=item C<GenerateValueView()> + +Generates an HTML snippet representing the value in a user-readable form. + +=back +=cut + +sub GenerateValueView($$$) +{ + my ($self, $PropertyDescriptor, $Value) = @_; + + if ($PropertyDescriptor->GetClass() eq "Basic") { - $Value = $self->GetPropertyValue($PropertyDescriptor); + if ($PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + } } - - return $Value; + print defined $Value ? $self->escapeHTML($Value) : " "; } sub GetInputType($$) @@ -276,85 +324,69 @@ sub GenerateRequired($$) } } -sub GenerateField($$$) -{ - my ($self, $PropertyDescriptor, $Display) = @_; +=pod +=over 12 - print "<div class='ItemProperty'><label>", - $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), - "</label>"; +=item C<GenerateValueInput()> - my $Value = $self->GetDisplayValue($PropertyDescriptor); - if ($Display eq "rw") +Generates an HTML snippet allowing the specified value to be edited. + +=back +=cut + +sub GenerateValueInput($$$) +{ + my ($self, $PropertyDescriptor, $Value) = @_; + + my $InputType = $self->GetInputType($PropertyDescriptor); + if ($InputType eq "checkbox") { - my $InputType = $self->GetInputType($PropertyDescriptor); - print "<div class='ItemValue'>"; - if ($InputType eq "checkbox") - { - print "<input type='checkbox' name='", $PropertyDescriptor->GetName(), - "' "; - if ($Value) - { - print "checked='checked' "; - } - print "/>"; - } - elsif ($InputType eq "select") + my $Checked = $Value ? " checked" : ""; + print "<input type='checkbox' name='", $PropertyDescriptor->GetName(), + "'$Checked/>"; + } + elsif ($InputType eq "select") + { + print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; + foreach my $V (@{$PropertyDescriptor->GetValues()}) { - print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; - foreach my $V (@{$PropertyDescriptor->GetValues()}) - { - print " <option value='", $self->escapeHTML($V), "'"; - print " selected='selected'" if ($Value eq $V); - print ">", $self->escapeHTML($V), "</option>\n"; - } - print "</select>"; + print " <option value='", $self->escapeHTML($V), "'"; + print " selected" if ($Value eq $V); + print ">", $self->escapeHTML($V), "</option>\n"; } - elsif ($InputType eq "textarea") + print "</select>"; + # No need to add a 'required' label since checkboxes always have a value + } + elsif ($InputType eq "textarea") + { + my $MaxLength = $PropertyDescriptor->GetMaxLength(); + print "<textarea name='", $PropertyDescriptor->GetName(), "' cols='"; + if ($MaxLength < 50) { - my $MaxLength = $PropertyDescriptor->GetMaxLength(); - print "<textarea name='", $PropertyDescriptor->GetName(), "' cols='"; - if ($MaxLength < 50) - { - print "$MaxLength' rows='1"; - } - else - { - print "50' rows='", int(($MaxLength + 49) / 50); - } - print "'>"; - print $self->escapeHTML($Value) if (defined $Value); - print "</textarea>"; - $self->GenerateRequired($PropertyDescriptor); + print "$MaxLength' rows='1'>"; } else { - my $Size=$PropertyDescriptor->GetMaxLength(); - $Size=45 if ($Size > 45); - print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), - "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if (defined $Value && $InputType ne "password") - { - print " value='", $self->escapeHTML($Value), "'"; - } - print " />"; - $self->GenerateRequired($PropertyDescriptor); + print "50' rows='", int(($MaxLength + 49) / 50), "'>"; } - print "</div>"; + print $self->escapeHTML($Value) if (defined $Value); + print "</textarea>"; + $self->GenerateRequired($PropertyDescriptor); } else { - if ($Value) - { - print $self->escapeHTML($Value); - } - else + my $Size=$PropertyDescriptor->GetMaxLength(); + $Size=45 if ($Size > 45); + print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), + "' maxlength='", $PropertyDescriptor->GetMaxLength(), + "' size='$Size'"; + if (defined $Value and $InputType ne "password") { - print " "; + print " value='", $self->escapeHTML($Value), "'"; } + print "/>"; + $self->GenerateRequired($PropertyDescriptor); } - - print "</div>\n"; } @@ -392,6 +424,29 @@ sub GenerateFormStart($) "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } +sub GenerateField($$$) +{ + my ($self, $PropertyDescriptor, $Display) = @_; + + print "<div class='ItemProperty'><label>", + $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), + "</label>"; + + my $Value = $self->GetFormValue($PropertyDescriptor); + if ($Display eq "rw") + { + print "<div class='ItemValue'>"; + $self->GenerateValueInput($PropertyDescriptor, $Value); + print "</div>"; + } + else + { + $self->GenerateValueView($PropertyDescriptor, $Value); + } + + print "</div>\n"; +} + sub GenerateFields($) { my ($self) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8323b9a..1ad94e4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -947,7 +947,7 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } -sub GetDisplayValue($$) +sub GetPropertyValue($$) { my ($self, $PropertyDescriptor) = @_;

1 0

Nikolay Sivov : evr/presenter: Make GetCurrentImage() work without output window.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 74e0985e1bfb22853b75b95dbc795c46ce907e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74e0985e1bfb22853b75b95d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 6 17:41:59 2022 +0300 evr/presenter: Make GetCurrentImage() work without output window. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index e70e25a19a7..d8bdbee3915 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -492,27 +492,28 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DDevice9 *device; HRESULT hr; - if (!presenter->swapchain) - return; - if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface))) { WARN("Failed to get sample surface, hr %#lx.\n", hr); return; } - if (FAILED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer))) + if (presenter->swapchain) { - WARN("Failed to get a backbuffer, hr %#lx.\n", hr); - IDirect3DSurface9_Release(surface); - return; - } + if (SUCCEEDED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer))) + { + IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); - IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); - IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); + IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); + presenter->frame_stats.presented++; - IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); - presenter->frame_stats.presented++; + IDirect3DDevice9_Release(device); + IDirect3DSurface9_Release(backbuffer); + } + else + WARN("Failed to get a backbuffer, hr %#lx.\n", hr); + } EnterCriticalSection(&presenter->cs); if (presenter->thread.queue.last_presented) @@ -521,8 +522,6 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IMFSample_AddRef(presenter->thread.queue.last_presented); LeaveCriticalSection(&presenter->cs); - IDirect3DDevice9_Release(device); - IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(surface); } @@ -1493,13 +1492,13 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon sample = presenter->thread.queue.last_presented; presenter->thread.queue.last_presented = NULL; - if (!presenter->swapchain || !sample) + if (!sample) { hr = MF_E_INVALIDREQUEST; } else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface))) { - IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DSurface9_GetDevice(surface, &device); IDirect3DSurface9_GetDesc(surface, &surface_desc); if (surface_desc.Format != D3DFMT_X8R8G8B8)

1 0

Nikolay Sivov : mf/session: Use correct format specifier for start position.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 27f13a37a0d05dcc6a5f88ab0970bd27d39e46a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f13a37a0d05dcc6a5f88ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 6 17:43:07 2022 +0300 mf/session: Use correct format specifier for start position. Fixup for 3f84ee1eb6637602e3e95fee20985444639b4602. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85cbcc29630..85b63f767fe 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2009,7 +2009,7 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format struct session_op *op; HRESULT hr; - TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); if (!start_position) return E_POINTER;

1 0

Rémi Bernon : include: Add ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES declaration.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: e37740c62c92c6553d6c575e8fc123577a90f77a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e37740c62c92c6553d6c575e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 6 16:09:27 2022 +0200 include: Add ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..31c6b7d69e9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5861,6 +5861,7 @@ typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 #define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 #define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 +#define ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES 12 typedef enum _JOBOBJECTINFOCLASS {

1 0

Rémi Bernon : kernel32/tests: Add some activatableClass manifest attribute tests.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: c7f72cc4003cc2714bf219d9d595ce9f87c30a98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f72cc4003cc2714bf219d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 6 16:09:28 2022 +0200 kernel32/tests: Add some activatableClass manifest attribute tests. And the matching ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES activation context section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8f925b0500f..e296ac40ced 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -120,6 +120,12 @@ static const char manifest3[] = " numMethods=\"10\"" " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" +" <activatableClass name=\"Wine.Test.Class1\" threadingModel=\"mta\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" +" <activatableClass name=\"Wine.Test.Class2\" threadingModel=\"both\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" +" <activatableClass name=\"Wine.Test.Class3\" threadingModel=\"sta\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" +"</file>" +"<file name=\"Wine.Test.dll\">" +" <activatableClass name=\"Wine.Test.Class4\" threadingModel=\"sta\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" "</file>" " <comInterfaceExternalProxyStub " " name=\"Iifaceps2\"" @@ -395,6 +401,15 @@ static const char wrong_manifest10[] = "</trustInfo>" "</assembly>"; +/* activatableClass with the wrong xmlns is invalid */ +static const char wrong_manifest11[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\" />" +"<file name=\"testlib.dll\">" +" <activatableClass name=\"Wine.Test.Class1\" threadingModel=\"both\" />" +"</file>" +"</assembly>"; + static const char wrong_depmanifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"" ARCH "\" />" @@ -1092,6 +1107,8 @@ static void test_create_fail(void) test_create_and_fail(wrong_manifest9, NULL, 0, TRUE /* WinXP */); trace("wrong_manifest10\n"); test_create_and_fail(wrong_manifest10, NULL, 0, TRUE /* WinXP */); + trace("wrong_manifest11\n"); + test_create_and_fail(wrong_manifest11, NULL, 1, FALSE); trace("UTF-16 manifest1 without BOM\n"); test_create_wide_and_fail(manifest1, FALSE ); trace("manifest2\n"); @@ -1352,6 +1369,70 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i ReleaseActCtx(handle); } +enum winrt_threading_model +{ + WINRT_THREADING_MODEL_BOTH = 0, + WINRT_THREADING_MODEL_STA = 1, + WINRT_THREADING_MODEL_MTA = 2, +}; + +struct activatable_class_data +{ + ULONG size; + DWORD unk; + DWORD module_len; + DWORD module_offset; + DWORD threading_model; +}; + +static void test_find_activatable_class(HANDLE handle, const WCHAR *classid, enum winrt_threading_model threading_model, + const WCHAR *file, ULONG exid, int line) +{ + struct activatable_class_data *activatable_class; + struct strsection_header *header; + ACTCTX_SECTION_KEYED_DATA data; + void *ptr; + BOOL ret; + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES, classid, &data); + todo_wine + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win10 v1809 */, "FindActCtxSectionStringW failed, error %lu\n", GetLastError()); + if (!ret) + { + ok_(__FILE__, line)(GetLastError() == ERROR_SXS_SECTION_NOT_FOUND, "got error %lu\n", GetLastError()); + return; + } + + ok_(__FILE__, line)(data.cbSize == sizeof(data), "got cbSize %lu\n", data.cbSize); + ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "got ulDataFormatVersion %lu\n", data.ulDataFormatVersion); + ok_(__FILE__, line)(data.lpData != NULL, "got lpData %p\n", data.lpData); + + header = (struct strsection_header *)data.lpSectionBase; + ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); + ok_(__FILE__, line)(data.lpSectionBase != NULL, "got lpSectionBase %p\n", data.lpSectionBase); + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "got ulSectionTotalLength %lu\n", data.ulSectionTotalLength); + ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE *)header + header->global_offset, + "got lpSectionGlobalData %p\n", data.lpSectionGlobalData); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->global_len, + "got ulSectionGlobalDataLength %lu\n", data.ulSectionGlobalDataLength); + ok_(__FILE__, line)(data.hActCtx == NULL, "got hActCtx %p\n", data.hActCtx); + ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "got ulAssemblyRosterIndex %lu\n", data.ulAssemblyRosterIndex); + + activatable_class = (struct activatable_class_data *)data.lpData; + ok_(__FILE__, line)(activatable_class->size == sizeof(*activatable_class), "got size %lu\n", + activatable_class->size); + ok_(__FILE__, line)(activatable_class->threading_model == threading_model, "got threading_model %lu\n", + activatable_class->threading_model); + + ptr = (BYTE *)header + activatable_class->module_offset; + ok_(__FILE__, line)(wcslen(ptr) * sizeof(WCHAR) == activatable_class->module_len, + "got module_len %lu\n", activatable_class->module_len); + ok_(__FILE__, line)(!wcscmp(ptr, file), "got data.lpSectionGlobalData %s\n", debugstr_w(ptr)); +} + static void test_find_string_fail(void) { ACTCTX_SECTION_KEYED_DATA data = {sizeof(data)}; @@ -2180,6 +2261,10 @@ static void test_actctx(void) test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps3, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_string_fail(); + test_find_activatable_class(handle, L"Wine.Test.Class1", WINRT_THREADING_MODEL_MTA, L"testlib.dll", 1, __LINE__); + test_find_activatable_class(handle, L"Wine.Test.Class2", WINRT_THREADING_MODEL_BOTH, L"testlib.dll", 1, __LINE__); + test_find_activatable_class(handle, L"Wine.Test.Class3", WINRT_THREADING_MODEL_STA, L"testlib.dll", 1, __LINE__); + test_find_activatable_class(handle, L"Wine.Test.Class4", WINRT_THREADING_MODEL_STA, L"Wine.Test.dll", 1, __LINE__); b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %lu\n", GetLastError());

1 0