windows.media.speech: Add IAsyncOperation<Inspectable*> stub.

And return an instance of it in ISpeechRecognizer_CompileConstraintsAsync.

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

@@ -2,6 +2,7 @@ MODULE = windows.media.speech.dll
 IMPORTS = combase uuid
 
 C_SRCS = \
+	async.c \
 	event_handlers.c \
 	listconstraint.c \
 	main.c \

dlls/windows.media.speech/async.c

@@ -0,0 +1,156 @@
+/* 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);
+
+/*
+ *
+ * IAsyncOperation<IInspectable*>
+ *
+ */
+
+struct async_operation
+{
+    IAsyncOperation_IInspectable IAsyncOperation_IInspectable_iface;
+    const GUID *iid;
+    LONG ref;
+};
+
+static inline struct async_operation *impl_from_IAsyncOperation_IInspectable(IAsyncOperation_IInspectable *iface)
+{
+    return CONTAINING_RECORD(iface, struct async_operation, IAsyncOperation_IInspectable_iface);
+}
+
+static HRESULT WINAPI async_operation_QueryInterface( IAsyncOperation_IInspectable *iface, REFIID iid, void **out )
+{
+    struct async_operation *impl = impl_from_IAsyncOperation_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->IAsyncOperation_IInspectable_iface));
+        return S_OK;
+    }
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+    *out = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI async_operation_AddRef( IAsyncOperation_IInspectable *iface )
+{
+    struct async_operation *impl = impl_from_IAsyncOperation_IInspectable(iface);
+    ULONG ref = InterlockedIncrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+    return ref;
+}
+
+static ULONG WINAPI async_operation_Release( IAsyncOperation_IInspectable *iface )
+{
+    struct async_operation *impl = impl_from_IAsyncOperation_IInspectable(iface);
+
+    ULONG ref = InterlockedDecrement(&impl->ref);
+    TRACE("iface %p, ref %lu.\n", iface, ref);
+
+    if (!ref)
+        free(impl);
+
+    return ref;
+}
+
+static HRESULT WINAPI async_operation_GetIids( IAsyncOperation_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 async_operation_GetRuntimeClassName( IAsyncOperation_IInspectable *iface, HSTRING *class_name )
+{
+    FIXME("iface %p, class_name %p stub!\n", iface, class_name);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI async_operation_GetTrustLevel( IAsyncOperation_IInspectable *iface, TrustLevel *trust_level )
+{
+    FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI async_operation_put_Completed( IAsyncOperation_IInspectable *iface,
+                                                     IAsyncOperationCompletedHandler_IInspectable *handler )
+{
+    FIXME("iface %p, handler %p stub!\n", iface, handler);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI async_operation_get_Completed( IAsyncOperation_IInspectable *iface,
+                                                     IAsyncOperationCompletedHandler_IInspectable **handler )
+{
+    FIXME("iface %p, handler %p stub!\n", iface, handler);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI async_operation_GetResults( IAsyncOperation_IInspectable *iface, IInspectable **results )
+{
+    FIXME("iface %p, results %p stub!\n", iface, results);
+    return E_NOTIMPL;
+}
+
+static const struct IAsyncOperation_IInspectableVtbl async_operation_vtbl =
+{
+    /* IUnknown methods */
+    async_operation_QueryInterface,
+    async_operation_AddRef,
+    async_operation_Release,
+    /* IInspectable methods */
+    async_operation_GetIids,
+    async_operation_GetRuntimeClassName,
+    async_operation_GetTrustLevel,
+    /* IAsyncOperation<IInspectable*> */
+    async_operation_put_Completed,
+    async_operation_get_Completed,
+    async_operation_GetResults
+};
+
+HRESULT async_operation_create( const GUID *iid, IAsyncOperation_IInspectable **out )
+{
+    struct async_operation *impl;
+
+    if (!(impl = calloc(1, sizeof(*impl))))
+    {
+        *out = NULL;
+        return E_OUTOFMEMORY;
+    }
+
+    impl->IAsyncOperation_IInspectable_iface.lpVtbl = &async_operation_vtbl;
+    impl->iid = iid;
+    impl->ref = 1;
+
+    *out = &impl->IAsyncOperation_IInspectable_iface;
+    TRACE("created %p\n", *out);
+    return S_OK;
+}

dlls/windows.media.speech/private.h

@@ -69,6 +69,8 @@ struct vector_iids
     const GUID *view;
 };
 
+HRESULT async_operation_create( const GUID *iid, IAsyncOperation_IInspectable **out );
+
 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 );

dlls/windows.media.speech/recognizer.c

@@ -124,7 +124,7 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog
 
 static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action )
 {
-    FIXME("iface %p, action %p semi stub!\n", iface, action);
+    FIXME("iface %p, action %p stub!\n", iface, action);
     return E_NOTIMPL;
 }
 
@@ -351,8 +351,9 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec
 static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *iface,
                                                           IAsyncOperation_SpeechRecognitionCompilationResult **operation )
 {
-    FIXME("iface %p, operation %p stub!\n", iface, operation);
+    IAsyncOperation_IInspectable **value = (IAsyncOperation_IInspectable **)operation;
-    return E_NOTIMPL;
+    FIXME("iface %p, operation %p semi-stub!\n", iface, operation);
+    return async_operation_create(&IID_IAsyncOperation_SpeechRecognitionCompilationResult, value);
 }
 
 static HRESULT WINAPI recognizer_RecognizeAsync( ISpeechRecognizer *iface,

dlls/windows.media.speech/tests/speech.c

@@ -949,15 +949,15 @@ static void test_SpeechRecognizer(void)
         compilation_handler.thread_id = GetCurrentThreadId();
 
         hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation);
-        todo_wine ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr);
+        ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr);
-
-        if (FAILED(hr)) goto skip_operation;
 
         handler = (void*)0xdeadbeef;
         hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler);
         todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
         todo_wine ok(handler == NULL, "Handler had value %p.\n", handler);
 
+        if (FAILED(hr)) goto skip_operation;
+
         compilation_result = (void*)0xdeadbeef;
         hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result);
         todo_wine ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr);
@@ -1081,10 +1081,10 @@ static void test_SpeechRecognizer(void)
         todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr);
         todo_wine ok(async_status == Completed, "Status was %#x.\n", async_status);
 
+skip_operation:
         ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation);
         ok(!ref, "Got unexpected ref %lu.\n", ref);
 
-skip_operation:
         ref = ISpeechContinuousRecognitionSession_Release(session);
         ok(ref == 1, "Got unexpected ref %lu.\n", ref);
 

include/windows.foundation.idl

@@ -168,7 +168,9 @@ namespace Windows {
             interface Windows.Foundation.Collections.IVector<IInspectable *>;
             interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>;
             interface Windows.Foundation.EventHandler<IInspectable *>;
+            interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>;
             interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
+            interface Windows.Foundation.IAsyncOperation<IInspectable *>;
             interface Windows.Foundation.IAsyncOperation<boolean>;
             interface Windows.Foundation.IReference<INT32>;
             interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;