[PATCH 0/3] MR5010: sapi: Add stubs for ISpeechObjectToken(s).

[PATCH 1/3] sapi: Add ISpeechObjectToken stub.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tests/token.c |  27 +++++
 dlls/sapi/token.c       | 225 ++++++++++++++++++++++++++++++++++++++--
 include/sapi.idl        |   2 +-
 3 files changed, 247 insertions(+), 7 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index a7d164389d9..0fe142f89a8 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -604,6 +604,8 @@ static void test_object_token(void)
     static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\Software\Wine\Winetest\sapi\TestToken";

ISpObjectToken *token;
+    IDispatch *disp;
+    ISpeechObjectToken *speech_token;
     ISpDataKey *sub_key;
     HRESULT hr;
     LPWSTR tempW, token_id;
@@ -611,6 +613,31 @@ static void test_object_token(void)
     DWORD regid;
     IUnknown *obj;

+    hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpObjectToken, (void **)&token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectToken_QueryInterface( token, &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = ISpObjectToken_QueryInterface( token, &IID_ISpeechObjectToken, (void **)&speech_token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectToken_Release( speech_token );
+
+    ISpObjectToken_Release( token );
+
+    hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpeechObjectToken, (void **)&speech_token );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectToken_Release( speech_token );
+
+
     hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
                            &IID_ISpObjectToken, (void **)&token );
     ok( hr == S_OK, "got %08lx\n", hr );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index f599bdb6b14..fd4efb9a95a 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -51,6 +51,7 @@ static struct data_key *impl_from_ISpRegDataKey( ISpRegDataKey *iface )
 struct object_token
 {
     ISpObjectToken ISpObjectToken_iface;
+    ISpeechObjectToken ISpeechObjectToken_iface;
     LONG ref;

ISpRegDataKey *data_key;
@@ -62,6 +63,11 @@ static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface )
     return CONTAINING_RECORD( iface, struct object_token, ISpObjectToken_iface );
 }

+static struct object_token *impl_from_ISpeechObjectToken( ISpeechObjectToken *iface )
+{
+    return CONTAINING_RECORD( iface, struct object_token, ISpeechObjectToken_iface );
+}
+
 static HRESULT WINAPI data_key_QueryInterface( ISpRegDataKey *iface, REFIID iid, void **obj )
 {
     struct data_key *This = impl_from_ISpRegDataKey( iface );
@@ -1160,15 +1166,19 @@ static HRESULT WINAPI token_QueryInterface( ISpObjectToken *iface,
     if (IsEqualIID( iid, &IID_IUnknown ) ||
         IsEqualIID( iid, &IID_ISpDataKey ) ||
         IsEqualIID( iid, &IID_ISpObjectToken ))
+        *obj = &This->ISpObjectToken_iface;
+    else if (IsEqualIID( iid, &IID_IDispatch ) ||
+             IsEqualIID( iid, &IID_ISpeechObjectToken ))
+        *obj = &This->ISpeechObjectToken_iface;
+    else
     {
-        ISpObjectToken_AddRef( iface );
-        *obj = iface;
-        return S_OK;
+        *obj = NULL;
+        FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
+        return E_NOINTERFACE;
     }

-    FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
-    *obj = NULL;
-    return E_NOINTERFACE;
+    IUnknown_AddRef( (IUnknown *)*obj );
+    return S_OK;
 }

static ULONG WINAPI token_AddRef( ISpObjectToken *iface )
@@ -1495,6 +1505,208 @@ const struct ISpObjectTokenVtbl token_vtbl =
     token_MatchesAttributes
 };

+static HRESULT WINAPI speech_token_QueryInterface( ISpeechObjectToken *iface,
+                                                   REFIID iid, void **obj )
+{
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+
+    TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
+
+    return ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj );
+}
+
+static ULONG WINAPI speech_token_AddRef( ISpeechObjectToken *iface )
+{
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectToken_AddRef( &This->ISpObjectToken_iface );
+}
+
+static ULONG WINAPI speech_token_Release( ISpeechObjectToken *iface )
+{
+    struct object_token *This = impl_from_ISpeechObjectToken( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectToken_Release( &This->ISpObjectToken_iface );
+}
+
+static HRESULT WINAPI speech_token_GetTypeInfoCount( ISpeechObjectToken *iface,
+                                                     UINT *count )
+{
+
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetTypeInfo( ISpeechObjectToken *iface,
+                                                UINT index,
+                                                LCID lcid,
+                                                ITypeInfo **type_info )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetIDsOfNames( ISpeechObjectToken *iface,
+                                                  REFIID iid,
+                                                  LPOLESTR *names,
+                                                  UINT count,
+                                                  LCID lcid,
+                                                  DISPID *dispids )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_Invoke( ISpeechObjectToken *iface,
+                                           DISPID dispid,
+                                           REFIID iid,
+                                           LCID lcid,
+                                           WORD flags,
+                                           DISPPARAMS *params,
+                                           VARIANT *result,
+                                           EXCEPINFO *excepinfo,
+                                           UINT *argerr )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_get_Id( ISpeechObjectToken *iface,
+                                           BSTR *id )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_get_DataKey( ISpeechObjectToken *iface,
+                                                ISpeechDataKey **key )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_get_Category( ISpeechObjectToken *iface,
+                                                ISpeechObjectTokenCategory **cat )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetDescription( ISpeechObjectToken *iface,
+                                                   LONG locale, BSTR *desc )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_SetId( ISpeechObjectToken *iface,
+                                          BSTR id, BSTR category_id,
+                                          VARIANT_BOOL create )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetAttribute( ISpeechObjectToken *iface,
+                                                 BSTR name, BSTR *value )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_CreateInstance( ISpeechObjectToken *iface,
+                                                   IUnknown *outer,
+                                                   SpeechTokenContext clsctx,
+                                                   IUnknown **object )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_Remove( ISpeechObjectToken *iface,
+                                           BSTR clsid )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_GetStorageFileName( ISpeechObjectToken *iface,
+                                                       BSTR clsid,
+                                                       BSTR key,
+                                                       BSTR name,
+                                                       SpeechTokenShellFolder folder,
+                                                       BSTR *path )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_RemoveStorageFileName( ISpeechObjectToken *iface,
+                                                          BSTR clsid,
+                                                          BSTR key,
+                                                          VARIANT_BOOL remove )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_IsUISupported( ISpeechObjectToken *iface,
+                                                  const BSTR type,
+                                                  const VARIANT *data,
+                                                  IUnknown *object,
+                                                  VARIANT_BOOL *supported )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_DisplayUI( ISpeechObjectToken *iface,
+                                              LONG hwnd,
+                                              BSTR title,
+                                              const BSTR type,
+                                              const VARIANT *data,
+                                              IUnknown *object )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_token_MatchesAttributes( ISpeechObjectToken *iface,
+                                                      const BSTR attributes,
+                                                      VARIANT_BOOL *matches )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+const struct ISpeechObjectTokenVtbl speech_token_vtbl =
+{
+    speech_token_QueryInterface,
+    speech_token_AddRef,
+    speech_token_Release,
+    speech_token_GetTypeInfoCount,
+    speech_token_GetTypeInfo,
+    speech_token_GetIDsOfNames,
+    speech_token_Invoke,
+    speech_token_get_Id,
+    speech_token_get_DataKey,
+    speech_token_get_Category,
+    speech_token_GetDescription,
+    speech_token_SetId,
+    speech_token_GetAttribute,
+    speech_token_CreateInstance,
+    speech_token_Remove,
+    speech_token_GetStorageFileName,
+    speech_token_RemoveStorageFileName,
+    speech_token_IsUISupported,
+    speech_token_DisplayUI,
+    speech_token_MatchesAttributes
+};
+
 HRESULT token_create( IUnknown *outer, REFIID iid, void **obj )
 {
     struct object_token *This = malloc( sizeof(*This) );
@@ -1502,6 +1714,7 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj )

if (!This) return E_OUTOFMEMORY;
     This->ISpObjectToken_iface.lpVtbl = &token_vtbl;
+    This->ISpeechObjectToken_iface.lpVtbl = &speech_token_vtbl;
     This->ref = 1;

This->data_key = NULL;
diff --git a/include/sapi.idl b/include/sapi.idl
index 16b8348d73b..6a593eb6b18 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -1293,7 +1293,7 @@ library SpeechLib
     coclass SpObjectToken
     {
         interface ISpObjectToken;
-        [default] interface ISpDataKey;
+        [default] interface ISpeechObjectToken;
     }

[

[PATCH 2/3] sapi: Add ISpeechObjectTokens stub.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tests/token.c |  30 ++++++++++
 dlls/sapi/token.c       | 129 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 153 insertions(+), 6 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 0fe142f89a8..9350c304e41 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -246,12 +246,42 @@ static void test_token_enum(void)
 {
     ISpObjectTokenEnumBuilder *token_enum;
     HRESULT hr;
+    IDispatch *disp;
+    ISpeechObjectTokens *speech_tokens;
     ISpObjectToken *tokens[5];
     ISpObjectToken *out_tokens[5];
     WCHAR token_id[MAX_PATH];
     ULONG count;
     int i;

+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum,
+                                                   &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum,
+                                                   &IID_ISpeechObjectTokens,
+                                                   (void **)&speech_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectTokens_Release( speech_tokens );
+
+    ISpObjectTokenEnumBuilder_Release( token_enum );
+
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_IDispatch, (void **)&disp );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IDispatch_Release( disp );
+
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpeechObjectTokens, (void **)&speech_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    ISpeechObjectTokens_Release( speech_tokens );
+
+
     hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
                            &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
     ok( hr == S_OK, "got %08lx\n", hr );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index fd4efb9a95a..4688e6a07b9 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -579,6 +579,7 @@ struct token_with_score
 struct token_enum
 {
     ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface;
+    ISpeechObjectTokens ISpeechObjectTokens_iface;
     LONG ref;

BOOL init;
@@ -593,6 +594,11 @@ static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnu
     return CONTAINING_RECORD( iface, struct token_enum, ISpObjectTokenEnumBuilder_iface );
 }

+static struct token_enum *impl_from_ISpeechObjectTokens( ISpeechObjectTokens *iface )
+{
+    return CONTAINING_RECORD( iface, struct token_enum, ISpeechObjectTokens_iface );
+}
+
 static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface,
                                                  LPCWSTR req, LPCWSTR opt,
                                                  IEnumSpObjectTokens **enum_tokens )
@@ -765,15 +771,19 @@ static HRESULT WINAPI token_enum_QueryInterface( ISpObjectTokenEnumBuilder *ifac
     if (IsEqualIID( iid, &IID_IUnknown ) ||
         IsEqualIID( iid, &IID_IEnumSpObjectTokens ) ||
         IsEqualIID( iid, &IID_ISpObjectTokenEnumBuilder ))
+        *obj = &This->ISpObjectTokenEnumBuilder_iface;
+    else if (IsEqualIID( iid, &IID_IDispatch ) ||
+             IsEqualIID( iid, &IID_ISpeechObjectTokens ))
+        *obj = &This->ISpeechObjectTokens_iface;
+    else
     {
-        ISpObjectTokenEnumBuilder_AddRef( iface );
-        *obj = iface;
-        return S_OK;
+        *obj = NULL;
+        FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
+        return E_NOINTERFACE;
     }

-    FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
-    *obj = NULL;
-    return E_NOINTERFACE;
+    IUnknown_AddRef( (IUnknown *)*obj );
+    return S_OK;
 }

static ULONG WINAPI token_enum_AddRef( ISpObjectTokenEnumBuilder *iface )
@@ -1135,6 +1145,112 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl =
     token_enum_Sort
 };

+static HRESULT WINAPI speech_tokens_QueryInterface( ISpeechObjectTokens *iface,
+                                                    REFIID iid, void **obj )
+{
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
+
+    return ISpObjectTokenEnumBuilder_QueryInterface(
+        &This->ISpObjectTokenEnumBuilder_iface, iid, obj );
+}
+
+static ULONG WINAPI speech_tokens_AddRef( ISpeechObjectTokens *iface )
+{
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectTokenEnumBuilder_AddRef( &This->ISpObjectTokenEnumBuilder_iface );
+}
+
+static ULONG WINAPI speech_tokens_Release( ISpeechObjectTokens *iface )
+{
+    struct token_enum *This = impl_from_ISpeechObjectTokens( iface );
+
+    TRACE( "(%p)\n", This );
+
+    return ISpObjectTokenEnumBuilder_Release( &This->ISpObjectTokenEnumBuilder_iface );
+}
+
+static HRESULT WINAPI speech_tokens_GetTypeInfoCount( ISpeechObjectTokens *iface,
+                                                      UINT *count )
+{
+
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_GetTypeInfo( ISpeechObjectTokens *iface,
+                                                 UINT index,
+                                                 LCID lcid,
+                                                 ITypeInfo **type_info )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_GetIDsOfNames( ISpeechObjectTokens *iface,
+                                                   REFIID iid,
+                                                   LPOLESTR *names,
+                                                   UINT count,
+                                                   LCID lcid,
+                                                   DISPID *dispids )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_Invoke( ISpeechObjectTokens *iface,
+                                            DISPID dispid,
+                                            REFIID iid,
+                                            LCID lcid,
+                                            WORD flags,
+                                            DISPPARAMS *params,
+                                            VARIANT *result,
+                                            EXCEPINFO *excepinfo,
+                                            UINT *argerr )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_get_Count( ISpeechObjectTokens *iface,
+                                               LONG *count )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface,
+                                          LONG index, ISpeechObjectToken **token )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI speech_tokens_get__NewEnum( ISpeechObjectTokens *iface,
+                                                  IUnknown **new_enum )
+{
+    FIXME( "stub\n" );
+    return E_NOTIMPL;
+}
+
+static const ISpeechObjectTokensVtbl speech_tokens_vtbl =
+{
+    speech_tokens_QueryInterface,
+    speech_tokens_AddRef,
+    speech_tokens_Release,
+    speech_tokens_GetTypeInfoCount,
+    speech_tokens_GetTypeInfo,
+    speech_tokens_GetIDsOfNames,
+    speech_tokens_Invoke,
+    speech_tokens_get_Count,
+    speech_tokens_Item,
+    speech_tokens_get__NewEnum
+};
+
 HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj )
 {
     struct token_enum *This = malloc( sizeof(*This) );
@@ -1142,6 +1258,7 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj )

if (!This) return E_OUTOFMEMORY;
     This->ISpObjectTokenEnumBuilder_iface.lpVtbl = &token_enum_vtbl;
+    This->ISpeechObjectTokens_iface.lpVtbl = &speech_tokens_vtbl;
     This->ref = 1;
     This->req = NULL;
     This->opt = NULL;

[PATCH 3/3] sapi: Add stub implementation for ISpeechObjectTokens::get__NewEnum.

[Shaun Ren]

From: Shaun Ren

---
 dlls/sapi/tests/token.c |  24 +++++++++
 dlls/sapi/token.c       | 117 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c
index 9350c304e41..a725dfa78ac 100644
--- a/dlls/sapi/tests/token.c
+++ b/dlls/sapi/tests/token.c
@@ -248,6 +248,8 @@ static void test_token_enum(void)
     HRESULT hr;
     IDispatch *disp;
     ISpeechObjectTokens *speech_tokens;
+    IUnknown *unk;
+    IEnumVARIANT *enumvar;
     ISpObjectToken *tokens[5];
     ISpObjectToken *out_tokens[5];
     WCHAR token_id[MAX_PATH];
@@ -348,6 +350,28 @@ static void test_token_enum(void)
                            &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
     ok( hr == S_OK, "got %08lx\n", hr );

+    hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum,
+                                                   &IID_ISpeechObjectTokens,
+                                                   (void **)&speech_tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpObjectTokenEnumBuilder_AddTokens( token_enum, 3, tokens );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
+    hr = ISpeechObjectTokens_get__NewEnum( speech_tokens, &unk );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    hr = IUnknown_QueryInterface( unk, &IID_IEnumVARIANT, (void **)&enumvar );
+    ok( hr == S_OK, "got %08lx\n", hr );
+    IUnknown_Release( unk );
+    IEnumVARIANT_Release( enumvar );
+
+    ISpeechObjectTokens_Release( speech_tokens );
+    ISpObjectTokenEnumBuilder_Release( token_enum );
+
+    hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum );
+    ok( hr == S_OK, "got %08lx\n", hr );
+
     /* Vendor attribute must exist */
     hr = ISpObjectTokenEnumBuilder_SetAttribs( token_enum, L"Vendor", NULL );
     ok( hr == S_OK, "got %08lx\n", hr );
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index 4688e6a07b9..28c433b0f27 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -599,6 +599,20 @@ static struct token_enum *impl_from_ISpeechObjectTokens( ISpeechObjectTokens *if
     return CONTAINING_RECORD( iface, struct token_enum, ISpeechObjectTokens_iface );
 }

+struct enum_var
+{
+    IEnumVARIANT IEnumVARIANT_iface;
+    LONG ref;
+
+    ISpObjectTokenEnumBuilder *token_enum;
+    ULONG index;
+};
+
+static struct enum_var *impl_from_IEnumVARIANT( IEnumVARIANT *iface )
+{
+    return CONTAINING_RECORD( iface, struct enum_var, IEnumVARIANT_iface );
+}
+
 static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface,
                                                  LPCWSTR req, LPCWSTR opt,
                                                  IEnumSpObjectTokens **enum_tokens )
@@ -1145,6 +1159,86 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl =
     token_enum_Sort
 };

+static HRESULT WINAPI enum_var_QueryInterface( IEnumVARIANT *iface,
+                                               REFIID iid, void **obj )
+{
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+
+    TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
+
+    if (IsEqualIID( iid, &IID_IUnknown ) ||
+        IsEqualIID( iid, &IID_IEnumVARIANT ))
+    {
+        IEnumVARIANT_AddRef( iface );
+        *obj = iface;
+        return S_OK;
+    }
+
+    *obj = NULL;
+    FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI enum_var_AddRef( IEnumVARIANT *iface )
+{
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+    ULONG ref = InterlockedIncrement( &This->ref );
+
+    TRACE( "(%p) ref = %lu\n", This, ref );
+    return ref;
+}
+
+static ULONG WINAPI enum_var_Release( IEnumVARIANT *iface )
+{
+    struct enum_var *This = impl_from_IEnumVARIANT( iface );
+    ULONG ref = InterlockedDecrement(&This->ref);
+
+    TRACE( "(%p) ref = %lu\n", This, ref );
+
+    if (!ref)
+    {
+        ISpObjectTokenEnumBuilder_Release( This->token_enum );
+        free( This );
+    }
+    return ref;
+}
+
+static HRESULT WINAPI enum_var_Next( IEnumVARIANT *iface, ULONG count,
+                                     VARIANT *vars, ULONG *fetched )
+{
+    FIXME("stub\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_var_Skip( IEnumVARIANT *iface, ULONG count )
+{
+    FIXME("stub\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_var_Reset( IEnumVARIANT *iface )
+{
+    FIXME("stub\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enum_var_Clone( IEnumVARIANT *iface, IEnumVARIANT **new_enum )
+{
+    FIXME("stub\n");
+    return E_NOTIMPL;
+}
+
+static const IEnumVARIANTVtbl enum_var_vtbl =
+{
+    enum_var_QueryInterface,
+    enum_var_AddRef,
+    enum_var_Release,
+    enum_var_Next,
+    enum_var_Skip,
+    enum_var_Reset,
+    enum_var_Clone
+};
+
 static HRESULT WINAPI speech_tokens_QueryInterface( ISpeechObjectTokens *iface,
                                                     REFIID iid, void **obj )
 {
@@ -1233,8 +1327,27 @@ static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface,
 static HRESULT WINAPI speech_tokens_get__NewEnum( ISpeechObjectTokens *iface,
                                                   IUnknown **new_enum )
 {
-    FIXME( "stub\n" );
-    return E_NOTIMPL;
+    struct enum_var *enum_var;
+    HRESULT hr;
+
+    TRACE( "(%p)->(%p)\n", iface, new_enum );
+
+    if (!new_enum) return E_POINTER;
+    if (!(enum_var = malloc( sizeof(*enum_var) ))) return E_OUTOFMEMORY;
+
+    enum_var->IEnumVARIANT_iface.lpVtbl = &enum_var_vtbl;
+    enum_var->ref = 1;
+    enum_var->index = 0;
+    if (FAILED(hr = ISpeechObjectTokens_QueryInterface( iface, &IID_ISpObjectTokenEnumBuilder,
+                                                       (void **)&enum_var->token_enum )))
+    {
+        free( enum_var );
+        return hr;
+    }
+
+    *new_enum = (IUnknown *)&enum_var->IEnumVARIANT_iface;
+
+    return S_OK;
 }

static const ISpeechObjectTokensVtbl speech_tokens_vtbl =

[PATCH 3/3] sapi: Add stub implementation for ISpeechObjectTokens::get__NewEnum.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=142737

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0a74:token: unhandled exception c0000005 at 00AF6890

=== w7u_adm (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0864:token: unhandled exception c0000005 at 00106890

=== w7u_el (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0a6c:token: unhandled exception c0000005 at 00396890

=== w8 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0bb4:token: unhandled exception c0000005 at 00E9687F

=== w8adm (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0958:token: unhandled exception c0000005 at 00E0687F

=== w864 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0bb4:token: unhandled exception c0000005 at 00CC687F

=== w1064v1507 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0fcc:token: unhandled exception c0000005 at 00D8687F

=== w1064v1809 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1ddc:token: unhandled exception c0000005 at 0032687F

=== w1064_tsign (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1ee4:token: unhandled exception c0000005 at 00A9687F

=== w10pro64 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
20a0:token: unhandled exception c0000005 at 00B8687F

=== w10pro64_en_AE_u8 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
164c:token: unhandled exception c0000005 at 0010687F

=== w11pro64 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1420:token: unhandled exception c0000005 at 7471DE48

=== w7pro64 (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
08d4:token: unhandled exception c0000005 at 00000000011D5F66

=== w864 (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0b0c:token: unhandled exception c0000005 at 00000000000A5F63

=== w1064v1507 (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
0d0c:token: unhandled exception c0000005 at 0000000000C75F66

=== w1064v1809 (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1e04:token: unhandled exception c0000005 at 0000000000E25F66

=== w1064_2qxl (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1e00:token: unhandled exception c0000005 at 0000000000575F66

=== w1064_adm (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1c20:token: unhandled exception c0000005 at 0000000000205F66

=== w1064_tsign (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1e80:token: unhandled exception c0000005 at 0000000000845F66

=== w10pro64 (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
211c:token: unhandled exception c0000005 at 0000000000275F66

=== w10pro64_ar (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
23f8:token: unhandled exception c0000005 at 00000000009B5F66

=== w10pro64_ja (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
23a4:token: unhandled exception c0000005 at 00000000001A5F66

=== w10pro64_zh_CN (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
2328:token: unhandled exception c0000005 at 0000000000445F66

=== w11pro64_amd (64 bit report) ===

sapi:
token.c:359: Test failed: got 80045001
token.c:362: Test failed: got 80045001
1bbc:token: unhandled exception c0000005 at 0000000000335F66

=== debian11 (32 bit report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit ar:MA report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit de report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit fr report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit he:IL report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit hi:IN report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit ja:JP report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11 (32 bit zh:CN report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11b (32 bit WoW report) ===

sapi:
token.c:359: Test failed: got 80045001

=== debian11b (64 bit WoW report) ===

sapi:
token.c:359: Test failed: got 80045001