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

Bernhard Kölbl : windows.media.speech: Add IVectorView<HSTRING>.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 016b0a1b04b5247e7ec7fe0363631b84015bf3fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=016b0a1b04b5247e7ec7fe03… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:45 2022 +0200 windows.media.speech: Add IVectorView<HSTRING>. And make it obtainable from IVector<HSTRING>_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/vector.c | 186 ++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index 13a36499a46..c4112f10a3e 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -23,6 +23,169 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * IVectorView<HSTRING> + * + */ + +struct vector_view_hstring +{ + IVectorView_HSTRING IVectorView_HSTRING_iface; + LONG ref; + + UINT32 size; + HSTRING elements[]; +}; + +static inline struct vector_view_hstring *impl_from_IVectorView_HSTRING( IVectorView_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_view_hstring, IVectorView_HSTRING_iface); +} + +static HRESULT WINAPI vector_view_hstring_QueryInterface( IVectorView_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(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, &IID_IVectorView_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVectorView_HSTRING_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_hstring_AddRef( IVectorView_HSTRING *iface ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_view_hstring_Release( IVectorView_HSTRING *iface ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(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) WindowsDeleteString(impl->elements[i]); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_view_hstring_GetIids( IVectorView_HSTRING *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_hstring_GetRuntimeClassName( IVectorView_HSTRING *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_hstring_GetTrustLevel( IVectorView_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_hstring_GetAt( IVectorView_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_view_hstring_get_Size( IVectorView_HSTRING *iface, UINT32 *value ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_view_hstring_IndexOf( IVectorView_HSTRING *iface, HSTRING element, + UINT32 *index, BOOLEAN *found ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(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_hstring_GetMany( IVectorView_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT *count ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + HRESULT hr; + 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; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i - start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static const struct IVectorView_HSTRINGVtbl vector_view_hstring_vtbl = +{ + /* IUnknown methods */ + vector_view_hstring_QueryInterface, + vector_view_hstring_AddRef, + vector_view_hstring_Release, + /* IInspectable methods */ + vector_view_hstring_GetIids, + vector_view_hstring_GetRuntimeClassName, + vector_view_hstring_GetTrustLevel, + /* IVectorView<HSTRING> methods */ + vector_view_hstring_GetAt, + vector_view_hstring_get_Size, + vector_view_hstring_IndexOf, + vector_view_hstring_GetMany, +}; + /* * * IVector<HSTRING> @@ -128,8 +291,27 @@ static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *v static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + struct vector_view_hstring *view; + HRESULT hr; + ULONG i; + + TRACE("iface %p, value %p.\n", iface, value); + + if (!(view = calloc(1, offsetof(struct vector_view_hstring, elements[impl->size])))) return E_OUTOFMEMORY; + view->IVectorView_HSTRING_iface.lpVtbl = &vector_view_hstring_vtbl; + view->ref = 1; + + for (i = 0; i < impl->size; ++i) + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &view->elements[view->size++]))) goto error; + + *value = &view->IVectorView_HSTRING_iface; + return S_OK; + +error: + while (i-- > 0) WindowsDeleteString(view->elements[i]); + free(view); + return hr; } static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found )

1 0

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

29 Mar '22

Module: wine Branch: master Commit: c6b9d9bc4e895d00cb5f1b30802beaef92f1df29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b9d9bc4e895d00cb5f1b30… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:46 2022 +0200 windows.media.speech: Add IIterable<HSTRING> stubs. To both IVector<HSTRING> and IVectorView<HSTRING>. 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/vector.c | 73 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index c4112f10a3e..da3a45fbb59 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); struct vector_view_hstring { IVectorView_HSTRING IVectorView_HSTRING_iface; + IIterable_HSTRING IIterable_HSTRING_iface; LONG ref; UINT32 size; @@ -58,6 +59,12 @@ static HRESULT WINAPI vector_view_hstring_QueryInterface( IVectorView_HSTRING *i return S_OK; } + if (IsEqualGUID(iid, &IID_IIterable_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IIterable_HSTRING_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -186,6 +193,35 @@ static const struct IVectorView_HSTRINGVtbl vector_view_hstring_vtbl = vector_view_hstring_GetMany, }; +/* + * + * IIterable<HSTRING> + * + */ + +DEFINE_IINSPECTABLE_(iterable_view_hstring, IIterable_HSTRING, struct vector_view_hstring, view_impl_from_IIterable_HSTRING, + IIterable_HSTRING_iface, &impl->IVectorView_HSTRING_iface) + +static HRESULT WINAPI iterable_view_hstring_First( IIterable_HSTRING *iface, IIterator_HSTRING **value ) +{ + TRACE("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static const struct IIterable_HSTRINGVtbl iterable_view_hstring_vtbl = +{ + /* IUnknown methods */ + iterable_view_hstring_QueryInterface, + iterable_view_hstring_AddRef, + iterable_view_hstring_Release, + /* IInspectable methods */ + iterable_view_hstring_GetIids, + iterable_view_hstring_GetRuntimeClassName, + iterable_view_hstring_GetTrustLevel, + /* IIterable<HSTRING> methods */ + iterable_view_hstring_First, +}; + /* * * IVector<HSTRING> @@ -195,6 +231,7 @@ static const struct IVectorView_HSTRINGVtbl vector_view_hstring_vtbl = struct vector_hstring { IVector_HSTRING IVector_HSTRING_iface; + IIterable_HSTRING IIterable_HSTRING_iface; LONG ref; UINT32 size; @@ -222,6 +259,12 @@ static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REF return S_OK; } + if (IsEqualGUID(iid, &IID_IIterable_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IIterable_HSTRING_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -300,6 +343,7 @@ static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorVie if (!(view = calloc(1, offsetof(struct vector_view_hstring, elements[impl->size])))) return E_OUTOFMEMORY; view->IVectorView_HSTRING_iface.lpVtbl = &vector_view_hstring_vtbl; + view->IIterable_HSTRING_iface.lpVtbl = &iterable_view_hstring_vtbl; view->ref = 1; for (i = 0; i < impl->size; ++i) @@ -479,6 +523,34 @@ static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = vector_hstring_ReplaceAll, }; +/* + * + * IIterable<HSTRING> + * + */ + +DEFINE_IINSPECTABLE(iterable_hstring, IIterable_HSTRING, struct vector_hstring, IVector_HSTRING_iface) + +static HRESULT WINAPI iterable_hstring_First( IIterable_HSTRING *iface, IIterator_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static const struct IIterable_HSTRINGVtbl iterable_hstring_vtbl = +{ + /* IUnknown methods */ + iterable_hstring_QueryInterface, + iterable_hstring_AddRef, + iterable_hstring_Release, + /* IInspectable methods */ + iterable_hstring_GetIids, + iterable_hstring_GetRuntimeClassName, + iterable_hstring_GetTrustLevel, + /* IIterable<HSTRING> methods */ + iterable_hstring_First, +}; + HRESULT vector_hstring_create( IVector_HSTRING **out ) { struct vector_hstring *impl; @@ -487,6 +559,7 @@ HRESULT vector_hstring_create( IVector_HSTRING **out ) if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->IIterable_HSTRING_iface.lpVtbl = &iterable_hstring_vtbl; impl->ref = 1; *out = &impl->IVector_HSTRING_iface;

1 0

Bernhard Kölbl : windows.media.speech: Add IIterator<HSTRING>.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: a709f24292dbc7e344a26f4909b76122d541759c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a709f24292dbc7e344a26f49… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:47 2022 +0200 windows.media.speech: Add IIterator<HSTRING>. And implement the IIterable<HSTRING>_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/vector.c | 169 ++++++++++++++++++++++++++++++++++++- 1 file changed, 165 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index da3a45fbb59..c399e91593f 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -23,6 +23,141 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * IIterator<HSTRING> + * + */ + +struct iterator_hstring +{ + IIterator_HSTRING IIterator_HSTRING_iface; + LONG ref; + + IVectorView_HSTRING *view; + UINT32 index; + UINT32 size; +}; + +static inline struct iterator_hstring *impl_from_IIterator_HSTRING( IIterator_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct iterator_hstring, IIterator_HSTRING_iface); +} + +static HRESULT WINAPI iterator_hstring_QueryInterface( IIterator_HSTRING *iface, REFIID iid, void **out ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(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, &IID_IIterator_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IIterator_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI iterator_hstring_AddRef( IIterator_HSTRING *iface ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI iterator_hstring_Release( IIterator_HSTRING *iface ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVectorView_HSTRING_Release(impl->view); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI iterator_hstring_GetIids( IIterator_HSTRING *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_hstring_GetRuntimeClassName( IIterator_HSTRING *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI iterator_hstring_GetTrustLevel( IIterator_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI iterator_hstring_get_Current( IIterator_HSTRING *iface, HSTRING *value ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); + TRACE("iface %p, value %p.\n", iface, value); + return IVectorView_HSTRING_GetAt(impl->view, impl->index, value); +} + +static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, BOOL *value ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + *value = impl->index < impl->size; + return S_OK; +} + +static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, BOOL *value ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + if (impl->index < impl->size) impl->index++; + return IIterator_HSTRING_get_HasCurrent(iface, value); +} + +static HRESULT WINAPI iterator_hstring_GetMany( IIterator_HSTRING *iface, UINT32 items_size, + HSTRING *items, UINT *count ) +{ + struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface); + TRACE("iface %p, items_size %u, items %p, count %p.\n", iface, items_size, items, count); + return IVectorView_HSTRING_GetMany(impl->view, impl->index, items_size, items, count); +} + +static const IIterator_HSTRINGVtbl iterator_hstring_vtbl = +{ + /* IUnknown methods */ + iterator_hstring_QueryInterface, + iterator_hstring_AddRef, + iterator_hstring_Release, + /* IInspectable methods */ + iterator_hstring_GetIids, + iterator_hstring_GetRuntimeClassName, + iterator_hstring_GetTrustLevel, + /* IIterator<HSTRING> methods */ + iterator_hstring_get_Current, + iterator_hstring_get_HasCurrent, + iterator_hstring_MoveNext, + iterator_hstring_GetMany, +}; + /* * * IVectorView<HSTRING> @@ -204,8 +339,20 @@ DEFINE_IINSPECTABLE_(iterable_view_hstring, IIterable_HSTRING, struct vector_vie static HRESULT WINAPI iterable_view_hstring_First( IIterable_HSTRING *iface, IIterator_HSTRING **value ) { - TRACE("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_view_hstring *impl = view_impl_from_IIterable_HSTRING(iface); + struct iterator_hstring *iter; + + TRACE("iface %p, value %p.\n", iface, value); + + if (!(iter = calloc(1, sizeof(*iter)))) return E_OUTOFMEMORY; + iter->IIterator_HSTRING_iface.lpVtbl = &iterator_hstring_vtbl; + iter->ref = 1; + + IVectorView_HSTRING_AddRef((iter->view = &impl->IVectorView_HSTRING_iface)); + iter->size = impl->size; + + *value = &iter->IIterator_HSTRING_iface; + return S_OK; } static const struct IIterable_HSTRINGVtbl iterable_view_hstring_vtbl = @@ -533,8 +680,22 @@ DEFINE_IINSPECTABLE(iterable_hstring, IIterable_HSTRING, struct vector_hstring, static HRESULT WINAPI iterable_hstring_First( IIterable_HSTRING *iface, IIterator_HSTRING **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_hstring *impl = impl_from_IIterable_HSTRING(iface); + IIterable_HSTRING *iterable; + IVectorView_HSTRING *view; + HRESULT hr; + + TRACE("iface %p, value %p.\n", iface, value); + + if (FAILED(hr = IVector_HSTRING_GetView(&impl->IVector_HSTRING_iface, &view))) return hr; + + hr = IVectorView_HSTRING_QueryInterface(view, &IID_IIterable_HSTRING, (void **)&iterable); + IVectorView_HSTRING_Release(view); + if (FAILED(hr)) return hr; + + hr = IIterable_HSTRING_First(iterable, value); + IIterable_HSTRING_Release(iterable); + return hr; } static const struct IIterable_HSTRINGVtbl iterable_hstring_vtbl =

1 0

Bernhard Kölbl : windows.media.speech: Store speech commands in listconstraint.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 743d77b2f5c21b71162284b72d46845f2f7be786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=743d77b2f5c21b71162284b7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:48 2022 +0200 windows.media.speech: Store speech commands in listconstraint. And make them obtainable with ISpeechRecognitionListConstraint_get_Commands. 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/listconstraint.c | 31 +++++++++++++++------ dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/tests/speech.c | 25 ++++++++++------- dlls/windows.media.speech/vector.c | 44 ++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 19 deletions(-) diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index 0c486a415a7..ef0dff0e4d5 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -120,8 +120,19 @@ static HRESULT WINAPI list_constraint_GetTrustLevel( ISpeechRecognitionListConst static HRESULT WINAPI list_constraint_get_Commands( ISpeechRecognitionListConstraint *iface, IVector_HSTRING **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionListConstraint(iface); + IIterable_HSTRING *iterable; + HRESULT hr; + + TRACE("iface %p, value %p.\n", iface, value); + + hr = IVector_HSTRING_QueryInterface(impl->commands, &IID_IIterable_HSTRING, (void **)&iterable); + if (FAILED(hr)) return hr; + + hr = vector_hstring_create_copy(iterable, value); + IIterable_HSTRING_Release(iterable); + + return hr; } static const struct ISpeechRecognitionListConstraintVtbl speech_recognition_list_constraint_vtbl = @@ -135,7 +146,7 @@ static const struct ISpeechRecognitionListConstraintVtbl speech_recognition_list list_constraint_GetRuntimeClassName, list_constraint_GetTrustLevel, /* ISpeechRecognitionListConstraint methods */ - list_constraint_get_Commands + list_constraint_get_Commands, }; /* @@ -209,7 +220,7 @@ static const struct ISpeechRecognitionConstraintVtbl speech_recognition_constrai constraint_put_Tag, constraint_get_Type, constraint_get_Probability, - constraint_put_Probability + constraint_put_Probability, }; /* @@ -338,6 +349,7 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo ISpeechRecognitionListConstraint** listconstraint ) { struct list_constraint *impl; + HRESULT hr; TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); @@ -347,11 +359,7 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo return E_POINTER; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (FAILED(vector_hstring_create(&impl->commands))) - { - free(impl); - return E_OUTOFMEMORY; - } + if (FAILED(hr = vector_hstring_create_copy(commands, &impl->commands))) goto error; impl->ISpeechRecognitionListConstraint_iface.lpVtbl = &speech_recognition_list_constraint_vtbl; impl->ISpeechRecognitionConstraint_iface.lpVtbl = &speech_recognition_constraint_vtbl; @@ -361,6 +369,11 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo *listconstraint = &impl->ISpeechRecognitionListConstraint_iface; return S_OK; + +error: + if (impl->commands) IVector_HSTRING_Release(impl->commands); + if (impl) free(impl); + return hr; } static const struct ISpeechRecognitionListConstraintFactoryVtbl speech_recognition_list_constraint_factory_vtbl = diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index a09b5f5ef7e..3c8371ccdbe 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -67,6 +67,7 @@ HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, II 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 ); #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/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index e88cfc25d54..ea160eec9da 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -106,6 +106,7 @@ static inline struct completed_event_handler *impl_from_IHandler_RecognitionComp HRESULT WINAPI completed_event_handler_QueryInterface( IHandler_RecognitionCompleted *iface, REFIID iid, void **out ) { if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_IHandler_RecognitionCompleted)) { IUnknown_AddRef(iface); @@ -172,6 +173,7 @@ static inline struct recognition_result_handler *impl_from_IHandler_RecognitionR HRESULT WINAPI recognition_result_handler_QueryInterface( IHandler_RecognitionResult *iface, REFIID iid, void **out ) { if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_IHandler_RecognitionResult)) { IUnknown_AddRef(iface); @@ -417,9 +419,11 @@ static HRESULT WINAPI iterable_hstring_GetTrustLevel( IIterable_HSTRING *iface, static HRESULT WINAPI iterable_hstring_First( IIterable_HSTRING *iface, IIterator_HSTRING **value ) { struct iterable_hstring *impl = impl_from_Iterable_HSTRING(iface); + struct iterator_hstring *impl_iter = impl_from_IIterator_HSTRING(impl->iterator); trace("iface %p, value %p.\n", iface, value); + impl_iter->index = 0; IIterator_HSTRING_AddRef((*value = impl->iterator)); return S_OK; } @@ -956,33 +960,34 @@ static void test_SpeechRecognitionListConstraint(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ISpeechRecognitionListConstraint_get_Commands(listconstraint, &hstring_vector); - todo_wine ok(hr == S_OK, "ISpeechRecognitionListConstraint_Commands failed, hr %#lx.\n", hr); - - if (!SUCCEEDED(hr)) - goto skip_tests; + ok(hr == S_OK, "ISpeechRecognitionListConstraint_Commands failed, hr %#lx.\n", hr); hr = IVector_HSTRING_get_Size(hstring_vector, &vector_size); - todo_wine ok(hr == S_OK, "IVector_HSTRING_get_Size failed, hr %#lx.\n", hr); - todo_wine ok(vector_size == ARRAY_SIZE(commands), "Got unexpected vector_size %u.\n", vector_size); + ok(hr == S_OK, "IVector_HSTRING_get_Size failed, hr %#lx.\n", hr); + ok(vector_size == ARRAY_SIZE(commands), "Got unexpected vector_size %u.\n", vector_size); for (i = 0; i < vector_size; i++) { HSTRING str; hr = IVector_HSTRING_GetAt(hstring_vector, i, &str); - todo_wine ok(hr == S_OK, "IVector_HSTRING_GetAt failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IVector_HSTRING_GetAt failed, hr %#lx.\n", hr); hr = WindowsCompareStringOrdinal(commands[i], str, &str_cmp); - todo_wine ok(hr == S_OK, "WindowsCompareStringOrdinal failed, hr %#lx.\n", hr); - todo_wine ok(!str_cmp, "Strings not equal.\n"); + ok(hr == S_OK, "WindowsCompareStringOrdinal failed, hr %#lx.\n", hr); + ok(!str_cmp, "Strings not equal.\n"); WindowsDeleteString(str); } ref = IVector_HSTRING_Release(hstring_vector); - todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); hr = ISpeechRecognitionConstraint_get_Tag(constraint, &tag_out); todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_get_Tag failed, hr %#lx.\n", hr); + + if (FAILED(hr)) + goto skip_tests; + hr = WindowsCompareStringOrdinal(tag, tag_out, &str_cmp); todo_wine ok(hr == S_OK, "WindowsCompareStringOrdinal failed, hr %#lx.\n", hr); todo_wine ok(!str_cmp, "Strings not equal.\n"); diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index c399e91593f..fcb7f483e03 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -727,3 +727,47 @@ HRESULT vector_hstring_create( IVector_HSTRING **out ) TRACE("created %p\n", *out); return S_OK; } + +HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + IIterator_HSTRING *iterator; + UINT32 capacity = 0; + BOOL available; + HRESULT hr; + + TRACE("iterable %p, out %p.\n", iterable, out); + + if (FAILED(hr = vector_hstring_create(out))) return hr; + if (FAILED(hr = IIterable_HSTRING_First(iterable, &iterator))) goto error; + + for (IIterator_HSTRING_get_HasCurrent(iterator, &available); available; IIterator_HSTRING_MoveNext(iterator, &available)) + capacity++; + + IIterator_HSTRING_Release(iterator); + + impl = impl_from_IVector_HSTRING(*out); + impl->size = 0; + impl->capacity = capacity; + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) goto error; + + if (FAILED(hr = IIterable_HSTRING_First(iterable, &iterator))) goto error; + + for (IIterator_HSTRING_get_HasCurrent(iterator, &available); available; IIterator_HSTRING_MoveNext(iterator, &available)) + { + HSTRING str; + if (FAILED(hr = IIterator_HSTRING_get_Current(iterator, &str))) goto error; + if (FAILED(hr = WindowsDuplicateString(str, &impl->elements[impl->size]))) goto error; + WindowsDeleteString(str); + impl->size++; + } + + IIterator_HSTRING_Release(iterator); + + TRACE("created %p\n", *out); + return S_OK; + +error: + IVector_HSTRING_Release(*out); + return hr; +}

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.210.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: e48fa8446accc1ba2725da27b59b690cf7e13cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48fa8446accc1ba2725da27… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Mar 29 19:03:35 2022 +0200 winevulkan: Update to VK spec version 1.3.210. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 36 +++++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 64 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 97 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e48fa8446accc1ba2725…

1 0

Dmitry Timoshkov : sc: Add support for the 'query' command.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 921c86a35d95279a1d2c00faeef8db8e4732f85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=921c86a35d95279a1d2c00fa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 22 17:22:35 2022 +0300 sc: Add support for the 'query' command. Output is modelled on behaviour observed under the Windows 10. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 4e642874237..9e8bfb61f42 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -175,6 +175,58 @@ static void usage( void ) exit( 1 ); } +static const WCHAR *service_type_string( DWORD type ) +{ + switch (type) + { + case SERVICE_WIN32_OWN_PROCESS: return L"WIN32_OWN_PROCESS"; + case SERVICE_WIN32_SHARE_PROCESS: return L"WIN32_SHARE_PROCESS"; + case SERVICE_WIN32: return L"WIN32"; + default: return L""; + } +} + +static const WCHAR *service_state_string( DWORD state ) +{ + static const WCHAR * const state_str[] = { L"", L"STOPPED", L"START_PENDING", + L"STOP_PENDING", L"RUNNING", L"CONTINUE_PENDING", L"PAUSE_PENDING", L"PAUSED" }; + + if (state < ARRAY_SIZE( state_str )) return state_str[ state ]; + return L""; +} + +static BOOL query_service( SC_HANDLE manager, const WCHAR *name ) +{ + SC_HANDLE service; + SERVICE_STATUS status; + BOOL ret = FALSE; + + service = OpenServiceW( manager, name, SERVICE_QUERY_STATUS ); + if (service) + { + ret = QueryServiceStatus( service, &status ); + if (!ret) + WINE_ERR("failed to query service status %lu\n", GetLastError()); + else + printf( "SERVICE_NAME: %ls\n" + " TYPE : %lx %ls\n" + " STATE : %lx %ls\n" + " WIN32_EXIT_CODE : %lu (0x%lx)\n" + " SERVICE_EXIT_CODE : %lu (0x%lx)\n" + " CHECKPOINT : 0x%lx\n" + " WAIT_HINT : 0x%lx\n", + name, status.dwServiceType, service_type_string( status.dwServiceType ), + status.dwCurrentState, service_state_string( status.dwCurrentState ), + status.dwWin32ExitCode, status.dwWin32ExitCode, + status.dwServiceSpecificExitCode, status.dwServiceSpecificExitCode, + status.dwCheckPoint, status.dwWaitHint ); + CloseServiceHandle( service ); + } + else WINE_ERR("failed to open service %lu\n", GetLastError()); + + return ret; +} + int __cdecl wmain( int argc, const WCHAR *argv[] ) { SC_HANDLE manager, service; @@ -285,6 +337,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_ERR("failed to open service %lu\n", GetLastError()); } + else if (!wcsicmp( argv[1], L"query" )) + { + ret = query_service( manager, argv[2] ); + } else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n");

1 0

Dmitry Timoshkov : sc: Print service status after 'start' and 'stop' commands.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: e75ebfb31f03d9de67fb3240aa2556abc4a900cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e75ebfb31f03d9de67fb3240… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 22 17:22:37 2022 +0300 sc: Print service status after 'start' and 'stop' commands. Like Windows 10 sc.exe does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 9e8bfb61f42..3b029f33c78 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -322,6 +322,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = StartServiceW( service, argc - 3, argv + 3 ); if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + else query_service( manager, argv[2] ); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -333,6 +334,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + else query_service( manager, argv[2] ); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError());

1 0

Dmitry Timoshkov : sc: Don't silently fail when something doesn't work as expected in a few more places.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: bc54bcf878717adae9b3205349556ab2c6df5353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc54bcf878717adae9b32053… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 22 17:22:40 2022 +0300 sc: Don't silently fail when something doesn't work as expected in a few more places. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 3b029f33c78..43148ab99d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -295,7 +295,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (parse_failure_params( argc - 3, argv + 3, &sfa )) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service failure actions %lu\n", GetLastError()); HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else @@ -310,7 +310,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = DeleteService( service ); - if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -321,7 +321,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = StartServiceW( service, argc - 3, argv + 3 ); - if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to start service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); } @@ -333,7 +333,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); - if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to stop service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); }

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*AM/PM in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 37278557dd5f9c377e84ac1bc4922ce53c8f16c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37278557dd5f9c377e84ac1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:35 2022 +0200 kernelbase: Reimplement LOCALE_*AM/PM in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index e3960c1e74e..b3cc0b0d3f0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1028,10 +1028,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_S1159: - return -1; + return locale_return_string( locale->s1159, type, buffer, len ); case LOCALE_S2359: - return -1; + return locale_return_string( locale->s2359, type, buffer, len ); case LOCALE_SDAYNAME1: case LOCALE_SDAYNAME2: @@ -1216,10 +1216,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SSHORTESTAM: - return -1; + return locale_return_string( locale->sshortestam, type, buffer, len ); case LOCALE_SSHORTESTPM: - return -1; + return locale_return_string( locale->sshortestpm, type, buffer, len ); case LOCALE_SENGLANGUAGE: return locale_return_string( locale->senglanguage, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 62cd33e6b0fd60dbd2a12d6734ff821f8ca5187d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62cd33e6b0fd60dbd2a12d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:41 2022 +0200 kernelbase: Reimplement LOCALE_*CURRNAME/CURRENCY in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- dlls/oleaut32/tests/vartest.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b3cc0b0d3f0..98e0041f901 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -970,10 +970,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SCURRENCY: - return -1; + return locale_return_string( locale->scurrency, type, buffer, len ); case LOCALE_SINTLSYMBOL: - return -1; + return locale_return_string( locale->sintlsymbol, type, buffer, len ); case LOCALE_SMONDECIMALSEP: return -1; @@ -1241,10 +1241,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGCURRNAME: - return -1; + return locale_return_string( locale->sengcurrname, type, buffer, len ); case LOCALE_SNATIVECURRNAME: - return -1; + return locale_return_string( locale->snativecurrname, type, buffer, len ); case LOCALE_ICALENDARTYPE: return -1; diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 03eb566f555..db0562e2d03 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2460,10 +2460,10 @@ static void test_VarParseNumFromStrMisc(void) lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); /* Windows <= 8.1 uses an old currency symbol: "fr. 5" */ - todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres); + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08lx\n", hres); if (hres == S_OK) { - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); EXPECT2(3,FAILDIG); }

1 0