windows.media.speech: Add IVector<HSTRING>.

And use it in listconstraint.

Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/windows.media.speech/Makefile.in

@@ -6,6 +6,7 @@ C_SRCS = \
 	listconstraint.c \
 	main.c \
 	recognizer.c \
-	synthesizer.c
+	synthesizer.c \
+	vector.c
 
 IDL_SRCS = classes.idl

dlls/windows.media.speech/listconstraint.c

@@ -36,6 +36,7 @@ struct list_constraint
     LONG ref;
 
     BOOLEAN enabled;
+    IVector_HSTRING *commands;
 };
 
 /*
@@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i
     TRACE("iface %p, ref %lu.\n", iface, ref);
 
     if (!ref)
+    {
+        IVector_HSTRING_Release(impl->commands);
         free(impl);
+    }
 
     return ref;
 }
@@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo
 
     TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint);
 
+    *listconstraint = NULL;
+
     if (!commands)
         return E_POINTER;
 
-    if (!(impl = calloc(1, sizeof(*impl))))
+    if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY;
+    if (FAILED(vector_hstring_create(&impl->commands)))
     {
-        *listconstraint = NULL;
+        free(impl);
         return E_OUTOFMEMORY;
     }
 

dlls/windows.media.speech/private.h

@@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *
 HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args );
 HRESULT typed_event_handlers_clear( struct list* list );
 
+HRESULT vector_hstring_create( 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 )                                        \
     {                                                                                              \

dlls/windows.media.speech/vector.c

@@ -0,0 +1,313 @@
+/* WinRT Windows.Media.Speech implementation
+ *
+ * Copyright 2022 Bernhard Kölbl for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(speech);
+
+/*
+ *
+ * IVector<HSTRING>
+ *
+ */
+
+struct vector_hstring
+{
+    IVector_HSTRING IVector_HSTRING_iface;
+    LONG ref;
+
+    UINT32 size;
+    UINT32 capacity;
+    HSTRING *elements;
+};
+
+static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface )
+{
+    return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface);
+}
+
+static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out )
+{
+    struct vector_hstring *impl = impl_from_IVector_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_IVector_HSTRING))
+    {
+        IInspectable_AddRef((*out = &impl->IVector_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_hstring_AddRef( IVector_HSTRING *iface )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+    ULONG ref = InterlockedIncrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+    return ref;
+}
+
+static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+    ULONG ref = InterlockedDecrement(&impl->ref);
+
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+
+    if (!ref)
+    {
+        IVector_HSTRING_Clear(iface);
+        free(impl);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI vector_hstring_GetIids( IVector_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_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name )
+{
+    FIXME( "iface %p, class_name %p stub!\n", iface, class_name );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level )
+{
+    FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value )
+{
+    struct vector_hstring *impl = impl_from_IVector_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_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+    TRACE( "iface %p, value %p.\n", iface, value );
+    *value = impl->size;
+    return S_OK;
+}
+
+static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value )
+{
+    FIXME("iface %p, value %p stub!\n", iface, value);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found )
+{
+    struct vector_hstring *impl = impl_from_IVector_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_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+    HSTRING tmp;
+    HRESULT hr;
+
+    TRACE( "iface %p, index %u, value %p.\n", iface, index, value );
+
+    if (index >= impl->size) return E_BOUNDS;
+
+    if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr;
+
+    WindowsDeleteString(impl->elements[index]);
+    impl->elements[index] = tmp;
+    return S_OK;
+}
+
+static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+    HSTRING tmp, *tmp2 = impl->elements;
+    HRESULT hr;
+
+    TRACE( "iface %p, index %u, value %p.\n", iface, index, value );
+
+    if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr;
+
+    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 = tmp2;
+            return E_OUTOFMEMORY;
+        }
+    }
+
+    memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements));
+    impl->elements[index] = tmp;
+    return S_OK;
+}
+
+static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+
+    TRACE("iface %p, index %u.\n", iface, index);
+
+    if (index >= impl->size) return E_BOUNDS;
+
+    WindowsDeleteString(impl->elements[index]);
+    memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements));
+    return S_OK;
+}
+
+static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+
+    TRACE("iface %p, value %p.\n", iface, value);
+
+    return IVector_HSTRING_InsertAt(iface, impl->size, value);
+}
+
+static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+
+    TRACE("iface %p.\n", iface);
+
+    if (impl->size) WindowsDeleteString(impl->elements[--impl->size]);
+    return S_OK;
+}
+
+static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface )
+{
+    struct vector_hstring *impl = impl_from_IVector_HSTRING(iface);
+
+    TRACE("iface %p.\n", iface);
+
+    while (impl->size) IVector_HSTRING_RemoveAtEnd(iface);
+    free(impl->elements);
+    impl->capacity = 0;
+    impl->elements = NULL;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index,
+                                              UINT32 items_size, HSTRING *items, UINT32 *count )
+{
+    struct vector_hstring *impl = impl_from_IVector_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 HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items )
+{
+    HRESULT hr;
+    ULONG i;
+
+    TRACE("iface %p, count %u, items %p.\n", iface, count, items);
+
+    hr = IVector_HSTRING_Clear(iface);
+    for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]);
+    return hr;
+}
+
+static const struct IVector_HSTRINGVtbl vector_hstring_vtbl =
+{
+    /* IUnknown methods */
+    vector_hstring_QueryInterface,
+    vector_hstring_AddRef,
+    vector_hstring_Release,
+    /* IInspectable methods */
+    vector_hstring_GetIids,
+    vector_hstring_GetRuntimeClassName,
+    vector_hstring_GetTrustLevel,
+    /* IVector<HSTRING> methods */
+    vector_hstring_GetAt,
+    vector_hstring_get_Size,
+    vector_hstring_GetView,
+    vector_hstring_IndexOf,
+    vector_hstring_SetAt,
+    vector_hstring_InsertAt,
+    vector_hstring_RemoveAt,
+    vector_hstring_Append,
+    vector_hstring_RemoveAtEnd,
+    vector_hstring_Clear,
+    vector_hstring_GetMany,
+    vector_hstring_ReplaceAll,
+};
+
+HRESULT vector_hstring_create( IVector_HSTRING **out )
+{
+    struct vector_hstring *impl;
+
+    TRACE("out %p.\n", out);
+
+    if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY;
+    impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl;
+    impl->ref = 1;
+
+    *out = &impl->IVector_HSTRING_iface;
+    TRACE("created %p\n", *out);
+    return S_OK;
+}