Skip to content

Commit 0f8b59a

Browse files
shaunrenjulliard
authored andcommitted
sapi: Introduce create_token_category helper in tts.
1 parent 4bbfd83 commit 0f8b59a

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

dlls/sapi/tts.c

+13-8
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,15 @@ static inline struct tts_engine_site *impl_from_ISpTTSEngineSite(ISpTTSEngineSit
8282
return CONTAINING_RECORD(iface, struct tts_engine_site, ISpTTSEngineSite_iface);
8383
}
8484

85+
static HRESULT create_token_category(const WCHAR *cat_id, ISpObjectTokenCategory **cat)
86+
{
87+
HRESULT hr;
88+
if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER,
89+
&IID_ISpObjectTokenCategory, (void **)cat)))
90+
return hr;
91+
return ISpObjectTokenCategory_SetId(*cat, cat_id, FALSE);
92+
}
93+
8594
static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token)
8695
{
8796
ISpObjectTokenCategory *cat;
@@ -90,17 +99,13 @@ static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token)
9099

91100
TRACE("(%s, %p).\n", debugstr_w(cat_id), token);
92101

93-
if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER,
94-
&IID_ISpObjectTokenCategory, (void **)&cat)))
102+
if (FAILED(hr = create_token_category(cat_id, &cat)))
95103
return hr;
96104

97-
if (FAILED(hr = ISpObjectTokenCategory_SetId(cat, cat_id, FALSE)) ||
98-
FAILED(hr = ISpObjectTokenCategory_GetDefaultTokenId(cat, &default_token_id)))
99-
{
100-
ISpObjectTokenCategory_Release(cat);
101-
return hr;
102-
}
105+
hr = ISpObjectTokenCategory_GetDefaultTokenId(cat, &default_token_id);
103106
ISpObjectTokenCategory_Release(cat);
107+
if (FAILED(hr))
108+
return hr;
104109

105110
if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER,
106111
&IID_ISpObjectToken, (void **)token)))

0 commit comments

Comments
 (0)