wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Cressida Silver : WWN 415
by Jeremy Newman 31 Mar '22

31 Mar '22

Module: website Branch: master Commit: f1a67185045f6c210129afa85562c30ac042a4e6 URL: https://source.winehq.org/git/website.git/?a=commit;h=f1a67185045f6c210129a… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Thu Mar 31 10:49:31 2022 -0500 WWN 415 --- news/en/2022040102.xml | 13 ++ wwn/en/wn20220401_415.xml | 378 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 391 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=f1a67185045f6c210…

1 0

Bernhard Kölbl : windows.media.speech: Implement ISpeechRecognizer_get_Constraints.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 1f35e2fe4ff6d42116e72e7e83bcea8e8b0fddf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f35e2fe4ff6d42116e72e7e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 21:00:38 2022 +0200 windows.media.speech: Implement ISpeechRecognizer_get_Constraints. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/recognizer.c | 6 ++++-- dlls/windows.media.speech/tests/speech.c | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 0894f91b36a..36836f83a98 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -324,8 +324,10 @@ static HRESULT WINAPI recognizer_GetTrustLevel( ISpeechRecognizer *iface, TrustL static HRESULT WINAPI recognizer_get_Constraints( ISpeechRecognizer *iface, IVector_ISpeechRecognitionConstraint **vector ) { - FIXME("iface %p, operation %p stub!\n", iface, vector); - return E_NOTIMPL; + struct recognizer *impl = impl_from_ISpeechRecognizer(iface); + TRACE("iface %p, operation %p.\n", iface, vector); + IVector_ISpeechRecognitionConstraint_AddRef((*vector = impl->constraints)); + return S_OK; } static HRESULT WINAPI recognizer_get_CurrentLanguage( ISpeechRecognizer *iface, ILanguage **language ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index ea160eec9da..8093c4b95b8 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -729,6 +729,7 @@ static void test_VoiceInformation(void) static void test_SpeechRecognizer(void) { static const WCHAR *speech_recognition_name = L"Windows.Media.SpeechRecognition.SpeechRecognizer"; + IVector_ISpeechRecognitionConstraint *constraints = NULL; ISpeechContinuousRecognitionSession *session = NULL; ISpeechRecognizerFactory *sr_factory = NULL; ISpeechRecognizerStatics *sr_statics = NULL; @@ -841,6 +842,12 @@ static void test_SpeechRecognizer(void) hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); + hr = ISpeechRecognizer_get_Constraints(recognizer, &constraints); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_get_Constraints failed, hr %#lx.\n", hr); + + ref = IVector_ISpeechRecognitionConstraint_Release(constraints); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); + ref = ISpeechContinuousRecognitionSession_Release(session); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0

Bernhard Kölbl : windows.media.speech: Add IIterator<Inspectable*>.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 3366fecc3cf6e3ebd8387232afb5d70fbbc047f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3366fecc3cf6e3ebd8387232… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 21:00:37 2022 +0200 windows.media.speech: Add IIterator<Inspectable*>. And implement the IIterable<Inspectable*>_First methods. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/recognizer.c | 1 + dlls/windows.media.speech/vector.c | 171 ++++++++++++++++++++++++++++++++- 3 files changed, 169 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index ba790c361aa..a5177ddd538 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -64,6 +64,7 @@ extern IActivationFactory *synthesizer_factory; struct vector_iids { const GUID *iterable; + const GUID *iterator; const GUID *vector; const GUID *view; }; diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index ec20a712ace..0894f91b36a 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -642,6 +642,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface struct vector_iids constraints_iids = { .iterable = &IID_IIterable_ISpeechRecognitionConstraint, + .iterator = &IID_IIterator_ISpeechRecognitionConstraint, .vector = &IID_IVector_ISpeechRecognitionConstraint, .view = &IID_IVectorView_ISpeechRecognitionConstraint, }; diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index 5b6a4b1c984..c23fb9dc56e 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -774,6 +774,142 @@ error: return hr; } +/* + * + * IIterator<Inspectable*> + * + */ + +struct iterator_inspectable +{ + IIterator_IInspectable IIterator_IInspectable_iface; + const GUID *iid; + LONG ref; + + IVectorView_IInspectable *view; + UINT32 index; + UINT32 size; +}; + +static inline struct iterator_inspectable *impl_from_IIterator_IInspectable( IIterator_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct iterator_inspectable, IIterator_IInspectable_iface); +} + +static HRESULT WINAPI iterator_inspectable_QueryInterface( IIterator_IInspectable *iface, REFIID iid, void **out ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_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->iid)) + { + IInspectable_AddRef((*out = &impl->IIterator_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI iterator_inspectable_AddRef( IIterator_IInspectable *iface ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI iterator_inspectable_Release( IIterator_IInspectable *iface ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVectorView_IInspectable_Release(impl->view); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI iterator_inspectable_GetIids( IIterator_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 iterator_inspectable_GetRuntimeClassName( IIterator_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI iterator_inspectable_GetTrustLevel( IIterator_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI iterator_inspectable_get_Current( IIterator_IInspectable *iface, IInspectable **value ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + return IVectorView_IInspectable_GetAt(impl->view, impl->index, value); +} + +static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectable *iface, BOOL *value ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + *value = impl->index < impl->size; + return S_OK; +} + +static HRESULT WINAPI iterator_inspectable_MoveNext( IIterator_IInspectable *iface, BOOL *value ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + if (impl->index < impl->size) impl->index++; + return IIterator_IInspectable_get_HasCurrent(iface, value); +} + +static HRESULT WINAPI iterator_inspectable_GetMany( IIterator_IInspectable *iface, UINT32 items_size, + IInspectable **items, UINT *count ) +{ + struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface); + TRACE("iface %p, items_size %u, items %p, count %p.\n", iface, items_size, items, count); + return IVectorView_IInspectable_GetMany(impl->view, impl->index, items_size, items, count); +} + +static const IIterator_IInspectableVtbl iterator_inspectable_vtbl = +{ + /* IUnknown methods */ + iterator_inspectable_QueryInterface, + iterator_inspectable_AddRef, + iterator_inspectable_Release, + /* IInspectable methods */ + iterator_inspectable_GetIids, + iterator_inspectable_GetRuntimeClassName, + iterator_inspectable_GetTrustLevel, + /* IIterator<IInspectable*> methods */ + iterator_inspectable_get_Current, + iterator_inspectable_get_HasCurrent, + iterator_inspectable_MoveNext, + iterator_inspectable_GetMany +}; + /* * * IVectorView<Inspectable*> @@ -953,8 +1089,21 @@ DEFINE_IINSPECTABLE_(iterable_view_inspectable, IIterable_IInspectable, struct v static HRESULT WINAPI iterable_view_inspectable_First( IIterable_IInspectable *iface, IIterator_IInspectable **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_view_inspectable *impl = view_impl_from_IIterable_IInspectable(iface); + struct iterator_inspectable *iter; + + TRACE("iface %p, value %p.\n", iface, value); + + if (!(iter = calloc(1, sizeof(struct iterator_inspectable)))) return E_OUTOFMEMORY; + iter->IIterator_IInspectable_iface.lpVtbl = &iterator_inspectable_vtbl; + iter->iid = impl->iids.iterator; + iter->ref = 1; + + IVectorView_IInspectable_AddRef((iter->view = &impl->IVectorView_IInspectable_iface)); + iter->size = impl->size; + + *value = &iter->IIterator_IInspectable_iface; + return S_OK; } static const struct IIterable_IInspectableVtbl iterable_view_inspectable_vtbl = @@ -1265,8 +1414,22 @@ DEFINE_IINSPECTABLE(iterable_inspectable, IIterable_IInspectable, struct vector_ static HRESULT WINAPI iterable_inspectable_First( IIterable_IInspectable *iface, IIterator_IInspectable **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_inspectable *impl = impl_from_IIterable_IInspectable(iface); + IIterable_IInspectable *iterable; + IVectorView_IInspectable *view; + HRESULT hr; + + TRACE("iface %p, value %p.\n", iface, value); + + if (FAILED(hr = IVector_IInspectable_GetView(&impl->IVector_IInspectable_iface, &view))) return hr; + + hr = IVectorView_IInspectable_QueryInterface(view, impl->iids.iterable, (void **)&iterable); + IVectorView_IInspectable_Release(view); + if (FAILED(hr)) return hr; + + hr = IIterable_IInspectable_First(iterable, value); + IIterable_IInspectable_Release(iterable); + return hr; } static const struct IIterable_IInspectableVtbl iterable_inspectable_vtbl =

1 0

Bernhard Kölbl : windows.media.speech: Add IIterable<IInspectable*> stubs.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 7f5f46874861102c44fa7f7dc0d942cc8d798980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f5f46874861102c44fa7f7d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 21:00:36 2022 +0200 windows.media.speech: Add IIterable<IInspectable*> stubs. To both IVector<IInspectable*> and IVectorView<IInspectable*>. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/recognizer.c | 1 + dlls/windows.media.speech/vector.c | 73 ++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index f7ca87ab393..ba790c361aa 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -63,6 +63,7 @@ extern IActivationFactory *synthesizer_factory; struct vector_iids { + const GUID *iterable; const GUID *vector; const GUID *view; }; diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index a7a8176303c..ec20a712ace 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -641,6 +641,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface struct session *session; struct vector_iids constraints_iids = { + .iterable = &IID_IIterable_ISpeechRecognitionConstraint, .vector = &IID_IVector_ISpeechRecognitionConstraint, .view = &IID_IVectorView_ISpeechRecognitionConstraint, }; diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index dc010d085f2..5b6a4b1c984 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -783,6 +783,7 @@ error: struct vector_view_inspectable { IVectorView_IInspectable IVectorView_IInspectable_iface; + IIterable_IInspectable IIterable_IInspectable_iface; struct vector_iids iids; LONG ref; @@ -812,6 +813,12 @@ static HRESULT WINAPI vector_view_inspectable_QueryInterface( IVectorView_IInspe return S_OK; } + if (IsEqualGUID(iid, impl->iids.iterable)) + { + IInspectable_AddRef((*out = &impl->IIterable_IInspectable_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -935,6 +942,35 @@ static const struct IVectorView_IInspectableVtbl vector_view_inspectable_vtbl = vector_view_inspectable_GetMany }; +/* + * + * IIterable<Inspectable*> + * + */ + +DEFINE_IINSPECTABLE_(iterable_view_inspectable, IIterable_IInspectable, struct vector_view_inspectable, + view_impl_from_IIterable_IInspectable, IIterable_IInspectable_iface, &impl->IVectorView_IInspectable_iface) + +static HRESULT WINAPI iterable_view_inspectable_First( IIterable_IInspectable *iface, IIterator_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static const struct IIterable_IInspectableVtbl iterable_view_inspectable_vtbl = +{ + /* IUnknown methods */ + iterable_view_inspectable_QueryInterface, + iterable_view_inspectable_AddRef, + iterable_view_inspectable_Release, + /* IInspectable methods */ + iterable_view_inspectable_GetIids, + iterable_view_inspectable_GetRuntimeClassName, + iterable_view_inspectable_GetTrustLevel, + /* IIterable<IInspectable*> methods */ + iterable_view_inspectable_First +}; + /* * * IVector<Inspectable*> @@ -944,6 +980,7 @@ static const struct IVectorView_IInspectableVtbl vector_view_inspectable_vtbl = struct vector_inspectable { IVector_IInspectable IVector_IInspectable_iface; + IIterable_IInspectable IIterable_IInspectable_iface; struct vector_iids iids; LONG ref; @@ -972,6 +1009,12 @@ static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *i return S_OK; } + if (IsEqualGUID(iid, impl->iids.iterable)) + { + IInspectable_AddRef((*out = &impl->IIterable_IInspectable_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -1050,6 +1093,7 @@ static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, I if (!(view = calloc(1, offsetof(struct vector_view_inspectable, elements[impl->size])))) return E_OUTOFMEMORY; view->IVectorView_IInspectable_iface.lpVtbl = &vector_view_inspectable_vtbl; + view->IIterable_IInspectable_iface.lpVtbl = &iterable_view_inspectable_vtbl; view->iids = impl->iids; view->ref = 1; @@ -1211,6 +1255,34 @@ static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = vector_inspectable_ReplaceAll }; +/* + * + * IIterable<Inspectable*> + * + */ + +DEFINE_IINSPECTABLE(iterable_inspectable, IIterable_IInspectable, struct vector_inspectable, IVector_IInspectable_iface) + +static HRESULT WINAPI iterable_inspectable_First( IIterable_IInspectable *iface, IIterator_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static const struct IIterable_IInspectableVtbl iterable_inspectable_vtbl = +{ + /* IUnknown methods */ + iterable_inspectable_QueryInterface, + iterable_inspectable_AddRef, + iterable_inspectable_Release, + /* IInspectable methods */ + iterable_inspectable_GetIids, + iterable_inspectable_GetRuntimeClassName, + iterable_inspectable_GetTrustLevel, + /* IIterable<IInspectable*> methods */ + iterable_inspectable_First +}; + HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) { struct vector_inspectable *impl; @@ -1219,6 +1291,7 @@ HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInsp if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->IIterable_IInspectable_iface.lpVtbl = &iterable_inspectable_vtbl; impl->iids = *iids; impl->ref = 1;

1 0

Bernhard Kölbl : windows.media.speech: Add IVectorView<Inspectable*>.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: ba387d536901bcf7787b710ccfa52376cc12dc54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba387d536901bcf7787b710c… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 21:00:35 2022 +0200 windows.media.speech: Add IVectorView<Inspectable*>. And make it obtainable from IVector<Inspectable*>_GetView. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/recognizer.c | 1 + dlls/windows.media.speech/vector.c | 180 ++++++++++++++++++++++++++++++++- 3 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 348c060c1c6..f7ca87ab393 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -64,6 +64,7 @@ extern IActivationFactory *synthesizer_factory; struct vector_iids { const GUID *vector; + const GUID *view; }; HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index e552779937b..a7a8176303c 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -642,6 +642,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface struct vector_iids constraints_iids = { .vector = &IID_IVector_ISpeechRecognitionConstraint, + .view = &IID_IVectorView_ISpeechRecognitionConstraint, }; HRESULT hr; diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index e3a802fc020..dc010d085f2 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -174,6 +174,8 @@ struct vector_view_hstring HSTRING elements[]; }; +C_ASSERT(sizeof(struct vector_view_hstring) == offsetof(struct vector_view_hstring, elements[0])); + static inline struct vector_view_hstring *impl_from_IVectorView_HSTRING( IVectorView_HSTRING *iface ) { return CONTAINING_RECORD(iface, struct vector_view_hstring, IVectorView_HSTRING_iface); @@ -772,6 +774,167 @@ error: return hr; } +/* + * + * IVectorView<Inspectable*> + * + */ + +struct vector_view_inspectable +{ + IVectorView_IInspectable IVectorView_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + IInspectable *elements[]; +}; + +C_ASSERT(sizeof(struct vector_view_inspectable) == offsetof(struct vector_view_inspectable, elements[0])); + +static inline struct vector_view_inspectable *impl_from_IVectorView_IInspectable( IVectorView_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_view_inspectable, IVectorView_IInspectable_iface); +} + +static HRESULT WINAPI vector_view_inspectable_QueryInterface( IVectorView_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_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.view)) + { + IInspectable_AddRef((*out = &impl->IVectorView_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_view_inspectable_AddRef( IVectorView_IInspectable *iface ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_view_inspectable_Release( IVectorView_IInspectable *iface ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_IInspectable(iface); + ULONG i, ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + for (i = 0; i < impl->size; ++i) IInspectable_Release(impl->elements[i]); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_view_inspectable_GetIids( IVectorView_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_view_inspectable_GetRuntimeClassName( IVectorView_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_inspectable_GetTrustLevel( IVectorView_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_inspectable_GetAt( IVectorView_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_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_view_inspectable_get_Size( IVectorView_IInspectable *iface, UINT32 *value ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_view_inspectable_IndexOf( IVectorView_IInspectable *iface, IInspectable *element, + UINT32 *index, BOOLEAN *found ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_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_view_inspectable_GetMany( IVectorView_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_view_inspectable *impl = impl_from_IVectorView_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 const struct IVectorView_IInspectableVtbl vector_view_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_view_inspectable_QueryInterface, + vector_view_inspectable_AddRef, + vector_view_inspectable_Release, + /* IInspectable methods */ + vector_view_inspectable_GetIids, + vector_view_inspectable_GetRuntimeClassName, + vector_view_inspectable_GetTrustLevel, + /* IVectorView<IInspectable*> methods */ + vector_view_inspectable_GetAt, + vector_view_inspectable_get_Size, + vector_view_inspectable_IndexOf, + vector_view_inspectable_GetMany +}; + /* * * IVector<Inspectable*> @@ -879,8 +1042,21 @@ static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + struct vector_view_inspectable *view; + ULONG i; + + TRACE("iface %p, value %p.\n", iface, value); + + if (!(view = calloc(1, offsetof(struct vector_view_inspectable, elements[impl->size])))) return E_OUTOFMEMORY; + view->IVectorView_IInspectable_iface.lpVtbl = &vector_view_inspectable_vtbl; + view->iids = impl->iids; + view->ref = 1; + + for (i = 0; i < impl->size; ++i) IInspectable_AddRef((view->elements[view->size++] = impl->elements[i])); + + *value = &view->IVectorView_IInspectable_iface; + return S_OK; } static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface,

1 0

Bernhard Kölbl : windows.media.speech: Add IVector<Inspectable*>.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 4bbc4cebc49d6398e6be73b7e11c22b26b8aaeb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbc4cebc49d6398e6be73b7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 21:00:34 2022 +0200 windows.media.speech: Add IVector<Inspectable*>. And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4bbc4cebc49d6398e6be…

1 0

Rémi Bernon : dinput/tests: Add some HidD_GetPhysicalDescriptor tests.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 70609b4d6cd9447655c94de1a7d125ce2488d3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=70609b4d6cd9447655c94de1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 30 19:50:03 2022 +0200 dinput/tests: Add some HidD_GetPhysicalDescriptor tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver_bus.c | 5 +++++ dlls/dinput/tests/hid.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index be38de1999e..6d7f86d0691 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -1156,6 +1156,11 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_SUCCESS; break; + case IOCTL_GET_PHYSICAL_DESCRIPTOR: + irp->IoStatus.Information = 0; + status = STATUS_NOT_SUPPORTED; + break; + default: ok( 0, "unexpected call\n" ); status = irp->IoStatus.Status; diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 8f984a006ac..1059d6c2b57 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -1545,6 +1545,11 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle USHORT count; BOOL ret; + SetLastError( 0xdeadbeef ); + ret = HidD_GetPhysicalDescriptor( file, buffer, sizeof(buffer) ); + ok( !ret, "HidD_GetPhysicalDescriptor succeeded\n" ); + ok( GetLastError() == ERROR_NOT_SUPPORTED, "got error %lu\n", GetLastError() ); + ret = HidD_GetPreparsedData( file, &preparsed_data ); ok( ret, "HidD_GetPreparsedData failed with error %lu\n", GetLastError() );

1 0

Mohamad Al-Jaf : hid: Implement HidD_GetPhysicalDescriptor.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 3ec8c6459acbec392a59466406aa5d51793432c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ec8c6459acbec392a594664… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Mar 30 19:50:02 2022 +0200 hid: Implement HidD_GetPhysicalDescriptor. The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index a82ba8392a1..e01ab2a35e7 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -121,6 +121,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers( HANDLE file, ULONG num_buffer ) return sync_ioctl( file, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &num_buffer, sizeof(num_buffer), NULL, 0 ); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString( HANDLE file, void *buffer, ULONG buffer_len ) { TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);

1 0

Jan Sikorski : wined3d: Increase the CS queue size.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 801f1bb433e9d49be523cf357929795a889cf51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=801f1bb433e9d49be523cf35… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 30 12:43:01 2022 +0200 wined3d: Increase the CS queue size. Final Fantasy XIV routinely runs out of space in the queue, which affects the frame rates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8d9b41c8a90..574bcdaa26f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4893,7 +4893,7 @@ enum wined3d_push_constants }; #define WINED3D_CS_QUERY_POLL_INTERVAL 10u -#define WINED3D_CS_QUEUE_SIZE 0x100000u +#define WINED3D_CS_QUEUE_SIZE 0x400000u #define WINED3D_CS_SPIN_COUNT 10000000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1)

1 0

Henri Verbeet : wined3d: Add GPU information for NVIDIA Tesla T4.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: e58f596cd3ef5bb7f57e6c118badb93fa0a8f04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58f596cd3ef5bb7f57e6c11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 16:24:49 2022 +0200 wined3d: Add GPU information for NVIDIA Tesla T4. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4464bf3ecc2..5f3e3538950 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1310,6 +1310,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"Tesla T4", CARD_NVIDIA_TESLA_T4}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7e78e40b39..4d105a57237 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -463,6 +463,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..8d9b41c8a90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3087,6 +3087,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, + CARD_NVIDIA_TESLA_T4 = 0x1eb8, CARD_REDHAT_VIRGL = 0x1010,

1 0

← Newer
1
2
3
4
5
6
7
8
...
114
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022