@@ -82,6 +82,15 @@ static inline struct tts_engine_site *impl_from_ISpTTSEngineSite(ISpTTSEngineSit
82
82
return CONTAINING_RECORD (iface , struct tts_engine_site , ISpTTSEngineSite_iface );
83
83
}
84
84
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
+
85
94
static HRESULT create_default_token (const WCHAR * cat_id , ISpObjectToken * * token )
86
95
{
87
96
ISpObjectTokenCategory * cat ;
@@ -90,17 +99,13 @@ static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token)
90
99
91
100
TRACE ("(%s, %p).\n" , debugstr_w (cat_id ), token );
92
101
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 )))
95
103
return hr ;
96
104
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 );
103
106
ISpObjectTokenCategory_Release (cat );
107
+ if (FAILED (hr ))
108
+ return hr ;
104
109
105
110
if (FAILED (hr = CoCreateInstance (& CLSID_SpObjectToken , NULL , CLSCTX_INPROC_SERVER ,
106
111
& IID_ISpObjectToken , (void * * )token )))
0 commit comments