March 2022 - Wine-Devel - list.winehq.org

[tools] testbot/cgi: Improve the title for multi-word collection / item class names.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will make the titles nicer for the future FailureBlacklist pages. --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 +++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index d59310be5..ddbbd663e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -137,7 +137,9 @@ sub GetTitle($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; } sub GenerateTitle($) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 66fcab755..567a489fc 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -94,8 +94,11 @@ sub GetTitle($) { my ($self) = @_; - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); + return $self->GetParam("Key") if ($self->GetParam("Key")); + + my $Title = $self->{Collection}->GetItemName(); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Title"; } sub GenerateFormStart($) -- 2.30.2

1 0

[tools] testbot/web: The VMsList page deals with VMs so rename the $Item parameter.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMsList.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 283c54263..0ed0b0d0b 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -54,16 +54,16 @@ sub SortKeys($$$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $VM, $Action) = @_; if ($Action eq "Delete") { - $Item->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $VM->Role("deleted"); + (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); } -- 2.30.2

1 0

[tools] testbot/web: The UsersList page deals with users so rename the $Item parameter.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 3621702a4..019bc6328 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -58,12 +58,12 @@ sub DisplayProperty($$$) sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $Status = $Item->Status; + my $Status = $User->Status; my ($Class, $Label); if ($Status eq "disabled") { @@ -73,19 +73,19 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('userdeleted', 'deleted'); } - elsif ($Item->WaitingForApproval()) + elsif ($User->WaitingForApproval()) { ($Class, $Label) = ('userrequest', 'request'); } - elsif (!$Item->Activated()) + elsif (!$User->Activated()) { ($Class, $Label) = ('userapproved', 'approved'); } - elsif ($Item->HasRole("admin")) + elsif ($User->HasRole("admin")) { ($Class, $Label) = ('useradmin', 'admin'); } - elsif ($Item->HasRole("wine-devel")) + elsif ($User->HasRole("wine-devel")) { ($Class, $Label) = ('userdevel', 'wine-devel'); } @@ -93,12 +93,12 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('usernone', 'none'); } - print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($Item->GetKey()), + print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($User->GetKey()), "'><span class='$Class'>$Label</span></a></td>"; } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); } } @@ -112,20 +112,20 @@ sub GetItemActions($$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $User, $Action) = @_; if ($Action eq "Delete") { - $Item->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $User->Status('deleted'); + (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions - DeleteSessions($Item); + DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); } -- 2.30.2

1 0

[tools] testbot/web: The main page deals with jobs so rename the $Item parameter.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1f362fc32..94421536d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -91,27 +91,27 @@ sub GenerateHeaderCell($$$) sub GetDisplayValue($$$) { - my ($self, $Item, $PropertyDescriptor) = @_; + my ($self, $Job, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetName() eq "User" && - defined($Item->Patch) && - $Item->User->GetKey() eq GetBatchUser()->GetKey() && - defined($Item->Patch->FromName)) + defined($Job->Patch) && + $Job->User->GetKey() eq GetBatchUser()->GetKey() && + defined($Job->Patch->FromName)) { - return $Item->Patch->FromName; + return $Job->Patch->FromName; } - return $self->SUPER::GetDisplayValue($Item, $PropertyDescriptor); + return $self->SUPER::GetDisplayValue($Job, $PropertyDescriptor); } sub GenerateDataCell($$$$) { - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Job, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Item->GetKey()); + my $EscapedKey = uri_escape($Job->GetKey()); print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", @@ -122,11 +122,11 @@ sub GenerateDataCell($$$$) "boterror" => "<span class='boterror'>TestBot error</span>", "canceled" => "<span class='canceled'>canceled</span>", ); - my $Status = $Item->Status; + my $Status = $Job->Status; my $HTMLStatus = $HTMLChunks{$Status} || $Status; if ($Status eq "completed" || $Status eq "running" || $Status eq "boterror" || $Status eq "canceled") { - my $JobInfo = $self->{JobsInfo}->{$Item->Id}; + my $JobInfo = $self->{JobsInfo}->{$Job->Id}; my $FailuresPrefix; if ($Status eq "completed") @@ -170,15 +170,15 @@ sub GenerateDataCell($$$$) } elsif ($PropertyName eq "Ended") { - if (defined $Item->Ended) + if (defined $Job->Ended) { - my $Duration = $Item->Ended - $Item->Submitted; - my $TagId = "E". $Item->Id; + my $Duration = $Job->Ended - $Job->Submitted; + my $TagId = "E". $Job->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'></script>\n"; print "</td>\n"; } @@ -189,7 +189,7 @@ sub GenerateDataCell($$$$) } else { - $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($Job, $PropertyDescriptor, $DetailsPage); } } -- 2.30.2

1 0

[tools] testbot/web: The Activity page does not need URI::Escape.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index cbe3f8721..1771e7ca3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -25,7 +25,6 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use POSIX qw(strftime); -use URI::Escape; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; -- 2.30.2

1 0

[tools] testbot/cgi: Automatically use https for the Wine Wiki.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Presumably at some point it was an http-only site but nowadays it's available over https just like all the others. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 58102d397..a54b0e206 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -423,7 +423,7 @@ ${ProjectName} Test Bot <div id='tabs'> <ul> <li><a href='//www.winehq.org/'>WineHQ</a></li> - <li><a href='http://wiki.winehq.org'>Wiki</a></li> + <li><a href='//wiki.winehq.org'>Wiki</a></li> <li><a href='//appdb.winehq.org/'>AppDB</a></li> <li><a href='//bugs.winehq.org/'>Bugzilla</a></li> <li class='s'><a href='//${WebHostName}/'>TestBot</a></li> -- 2.30.2

1 0

[tools] testbot/cgi: Use SameSite=Lax on our session cookies.
by Francois Gouget March 30, 2022

March 30, 2022

So far we were not specifying SameSite which means it defaulted to None in older browsers which potentially allowed some cross-site attacks. Newer browser would now default to Lax so explicitly use that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- My understanding of SameSite=Strict is that one would not be logged in after following a link found in one of the TestBot's emails. That does not seem very practical so SameSite=Lax seems like a better choice. It implies that the TestBot should not allow sensitive changes through the Get method... On the one hand I don't think the TestBot makes a distinction between Get and Post. But on the other hand I don't think one can do anything sensitive with the TestBot (at least for non-admin users). This latter part probably requires some more investigation independently from this patch. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index a54b0e206..4837b9f54 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -137,6 +137,7 @@ sub UnsetCookies($) -Expires => "Sun, 25 Jul 1997 05:00:00 GMT", -Domain => $ENV{"HTTP_HOST"}, -Path => "/", + -SameSite => "Lax", -Secure => $UseSSL); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -147,6 +148,7 @@ sub UnsetCookies($) -Expires => "Sun, 25 Jul 1997 05:00:00 GMT", -Domain => $ENV{"HTTP_HOST"}, -Path => "/", + -SameSite => "Lax", -Secure => !1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -178,6 +180,7 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, + -SameSite => "Lax", -Secure => $UseSSL, -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); @@ -199,6 +202,7 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, + -SameSite => "Lax", -Secure => !1, -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); -- 2.30.2

1 0

[tools] testbot/web: Document why ErrField is not set when failing to delete an item.
by Francois Gouget March 30, 2022

March 30, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMsList.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 019bc6328..ae514e901 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -117,7 +117,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $User->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 0ed0b0d0b..18952253f 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -59,7 +59,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $VM->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } -- 2.30.2

1 0

[PATCH 1/4] riched20: draw OLE object in richedit with OleDraw
by Dongwan Kim March 30, 2022

March 30, 2022

When OLE object provides IViewObject::Draw, Richedit can draw it even though the OLE object does not support CF_BITMAP nor CF_ENHMETAFILE. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/riched20/richole.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..1a62f0b9f36 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5653,6 +5653,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) STGMEDIUM stgm; DIBSECTION dibsect; ENHMETAHEADER emh; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5691,8 +5692,13 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("unsupported format\n"); - pSize->cx = pSize->cy = 0; + if( IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, pSize) != S_OK){ + FIXME("unsupported format\n"); + pSize->cx = pSize->cy = 0; + } + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + pSize->cx = MulDiv(pSize->cx, pixs , 2540); + pSize->cy = MulDiv(pSize->cy, pixs , 2540); IDataObject_Release(ido); return; } @@ -5735,6 +5741,8 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) BOOL has_size; HBITMAP old_bm; RECT rc; + HRESULT hr; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5755,7 +5763,17 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("Couldn't get storage medium\n"); + IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sz); + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + rc.left = x; + rc.top = y - MulDiv(sz.cy, pixs, 2540); + rc.right = x + MulDiv(sz.cx, pixs, 2540); + rc.bottom = y ; + hr = OleDraw(run->reobj->obj.poleobj, DVASPECT_CONTENT, c->hDC, &rc); + if (FAILED(hr)) + { + FIXME("Couldn't draw ole object\n"); + } IDataObject_Release(ido); return; } -- 2.30.2

3 8

[PATCH 1/5] windows.media.speech: Add IVector<Inspectable*>.
by Bernhard Kölbl March 30, 2022

March 30, 2022

And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 6 + dlls/windows.media.speech/recognizer.c | 21 +- dlls/windows.media.speech/vector.c | 279 +++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3c8371ccdbe..348c060c1c6 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -61,6 +61,11 @@ extern IActivationFactory *synthesizer_factory; +struct vector_iids +{ + const GUID *vector; +}; + HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); @@ -68,6 +73,7 @@ HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index da219d6bd0a..5f88331c703 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -233,6 +233,7 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; + IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -296,6 +297,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -637,13 +639,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface { struct recognizer *impl; struct session *session; + struct vector_iids constraints_iids = + { + .vector = &IID_IVector_ISpeechRecognitionConstraint, + }; + HRESULT hr; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); *speechrecognizer = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) + { + hr = E_OUTOFMEMORY; + goto error; + } if (language) FIXME("language parameter unused. Stub!\n"); @@ -658,11 +669,19 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) + goto error; TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; + +error: + if (session) free(session); + if (impl) free(impl); + + return hr; } static const struct ISpeechRecognizerFactoryVtbl speech_recognizer_factory_vtbl = diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index fcb7f483e03..e3a802fc020 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -771,3 +771,282 @@ error: IVector_HSTRING_Release(*out); return hr; } + +/* + * + * IVector<Inspectable*> + * + */ + +struct vector_inspectable +{ + IVector_IInspectable IVector_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector_inspectable *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_inspectable, IVector_IInspectable_iface); +} + +static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, impl->iids.vector)) + { + IInspectable_AddRef((*out = &impl->IVector_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_inspectable_AddRef( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_inspectable_Release( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVector_IInspectable_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_inspectable_GetIids( IVector_IInspectable *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef((*value = impl->elements[index])); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface, + IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + IInspectable **tmp = impl->elements; + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_IInspectable_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_inspectable_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) IInspectable_Release(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Clear( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_IInspectable_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef((items[i - start_index] = impl->elements[i])); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_IInspectable_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append(iface, items[i]); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_inspectable_QueryInterface, + vector_inspectable_AddRef, + vector_inspectable_Release, + /* IInspectable methods */ + vector_inspectable_GetIids, + vector_inspectable_GetRuntimeClassName, + vector_inspectable_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_inspectable_GetAt, + vector_inspectable_get_Size, + vector_inspectable_GetView, + vector_inspectable_IndexOf, + vector_inspectable_SetAt, + vector_inspectable_InsertAt, + vector_inspectable_RemoveAt, + vector_inspectable_Append, + vector_inspectable_RemoveAtEnd, + vector_inspectable_Clear, + vector_inspectable_GetMany, + vector_inspectable_ReplaceAll +}; + +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) +{ + struct vector_inspectable *impl; + + TRACE("iid %s, out %p.\n", debugstr_guid(iids->vector), out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->iids = *iids; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 8