Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9515736a
Commit
9515736a
authored
Jan 03, 2023
by
Bernhard Kölbl
Committed by
Alexandre Julliard
Jan 27, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windows.media.speech: Add a worker thread to the recognition session.
Signed-off-by:
Bernhard Kölbl
<
besentv@gmail.com
>
parent
a3932d7d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
131 additions
and
10 deletions
+131
-10
private.h
dlls/windows.media.speech/private.h
+1
-0
recognizer.c
dlls/windows.media.speech/recognizer.c
+126
-6
speech.c
dlls/windows.media.speech/tests/speech.c
+4
-4
No files found.
dlls/windows.media.speech/private.h
View file @
9515736a
...
...
@@ -23,6 +23,7 @@
#include <stdarg.h>
#define COBJMACROS
#include "corerror.h"
#include "windef.h"
#include "winbase.h"
#include "winstring.h"
...
...
dlls/windows.media.speech/recognizer.c
View file @
9515736a
...
...
@@ -160,6 +160,10 @@ struct session
struct
list
completed_handlers
;
struct
list
result_handlers
;
HANDLE
worker_thread
,
worker_control_event
;
BOOLEAN
worker_running
;
CRITICAL_SECTION
cs
;
};
/*
...
...
@@ -173,6 +177,31 @@ static inline struct session *impl_from_ISpeechContinuousRecognitionSession( ISp
return
CONTAINING_RECORD
(
iface
,
struct
session
,
ISpeechContinuousRecognitionSession_iface
);
}
static
DWORD
CALLBACK
session_worker_thread_cb
(
void
*
args
)
{
ISpeechContinuousRecognitionSession
*
iface
=
args
;
struct
session
*
impl
=
impl_from_ISpeechContinuousRecognitionSession
(
iface
);
BOOLEAN
running
=
TRUE
;
DWORD
status
;
SetThreadDescription
(
GetCurrentThread
(),
L"wine_speech_recognition_session_worker"
);
while
(
running
)
{
status
=
WaitForMultipleObjects
(
1
,
&
impl
->
worker_control_event
,
FALSE
,
INFINITE
);
if
(
status
==
0
)
/* worker_control_event signaled */
{
EnterCriticalSection
(
&
impl
->
cs
);
running
=
impl
->
worker_running
;
LeaveCriticalSection
(
&
impl
->
cs
);
}
/* TODO: Send mic data to recognizer and handle results. */
}
return
0
;
}
static
HRESULT
WINAPI
session_QueryInterface
(
ISpeechContinuousRecognitionSession
*
iface
,
REFIID
iid
,
void
**
out
)
{
struct
session
*
impl
=
impl_from_ISpeechContinuousRecognitionSession
(
iface
);
...
...
@@ -208,8 +237,24 @@ static ULONG WINAPI session_Release( ISpeechContinuousRecognitionSession *iface
if
(
!
ref
)
{
HANDLE
thread
;
EnterCriticalSection
(
&
impl
->
cs
);
thread
=
impl
->
worker_thread
;
impl
->
worker_running
=
FALSE
;
impl
->
worker_thread
=
INVALID_HANDLE_VALUE
;
LeaveCriticalSection
(
&
impl
->
cs
);
SetEvent
(
impl
->
worker_control_event
);
WaitForSingleObject
(
thread
,
INFINITE
);
CloseHandle
(
thread
);
typed_event_handlers_clear
(
&
impl
->
completed_handlers
);
typed_event_handlers_clear
(
&
impl
->
result_handlers
);
impl
->
cs
.
DebugInfo
->
Spare
[
0
]
=
0
;
DeleteCriticalSection
(
&
impl
->
cs
);
IVector_ISpeechRecognitionConstraint_Release
(
impl
->
constraints
);
free
(
impl
);
}
...
...
@@ -254,8 +299,37 @@ static HRESULT session_start_async( IInspectable *invoker )
static
HRESULT
WINAPI
session_StartAsync
(
ISpeechContinuousRecognitionSession
*
iface
,
IAsyncAction
**
action
)
{
FIXME
(
"iface %p, action %p stub!
\n
"
,
iface
,
action
);
return
async_action_create
(
NULL
,
session_start_async
,
action
);
struct
session
*
impl
=
impl_from_ISpeechContinuousRecognitionSession
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, action %p.
\n
"
,
iface
,
action
);
if
(
FAILED
(
hr
=
async_action_create
(
NULL
,
session_start_async
,
action
)))
return
hr
;
EnterCriticalSection
(
&
impl
->
cs
);
if
(
impl
->
worker_running
||
impl
->
worker_thread
)
{
hr
=
COR_E_INVALIDOPERATION
;
}
else
if
(
!
(
impl
->
worker_thread
=
CreateThread
(
NULL
,
0
,
session_worker_thread_cb
,
impl
,
0
,
NULL
)))
{
hr
=
HRESULT_FROM_WIN32
(
GetLastError
());
impl
->
worker_running
=
FALSE
;
}
else
{
impl
->
worker_running
=
TRUE
;
}
LeaveCriticalSection
(
&
impl
->
cs
);
if
(
FAILED
(
hr
))
{
IAsyncAction_Release
(
*
action
);
*
action
=
NULL
;
}
return
hr
;
}
static
HRESULT
WINAPI
session_StartWithModeAsync
(
ISpeechContinuousRecognitionSession
*
iface
,
...
...
@@ -273,8 +347,45 @@ static HRESULT session_stop_async( IInspectable *invoker )
static
HRESULT
WINAPI
session_StopAsync
(
ISpeechContinuousRecognitionSession
*
iface
,
IAsyncAction
**
action
)
{
FIXME
(
"iface %p, action %p stub!
\n
"
,
iface
,
action
);
return
async_action_create
(
NULL
,
session_stop_async
,
action
);
struct
session
*
impl
=
impl_from_ISpeechContinuousRecognitionSession
(
iface
);
HANDLE
thread
;
HRESULT
hr
;
TRACE
(
"iface %p, action %p.
\n
"
,
iface
,
action
);
if
(
FAILED
(
hr
=
async_action_create
(
NULL
,
session_stop_async
,
action
)))
return
hr
;
EnterCriticalSection
(
&
impl
->
cs
);
if
(
impl
->
worker_running
&&
impl
->
worker_thread
)
{
thread
=
impl
->
worker_thread
;
impl
->
worker_thread
=
INVALID_HANDLE_VALUE
;
impl
->
worker_running
=
FALSE
;
}
else
{
hr
=
COR_E_INVALIDOPERATION
;
}
LeaveCriticalSection
(
&
impl
->
cs
);
if
(
SUCCEEDED
(
hr
))
{
SetEvent
(
impl
->
worker_control_event
);
WaitForSingleObject
(
thread
,
INFINITE
);
CloseHandle
(
thread
);
EnterCriticalSection
(
&
impl
->
cs
);
impl
->
worker_thread
=
NULL
;
LeaveCriticalSection
(
&
impl
->
cs
);
}
else
{
IAsyncAction_Release
(
*
action
);
*
action
=
NULL
;
}
return
hr
;
}
static
HRESULT
WINAPI
session_CancelAsync
(
ISpeechContinuousRecognitionSession
*
iface
,
IAsyncAction
**
action
)
...
...
@@ -818,9 +929,18 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface
list_init
(
&
session
->
completed_handlers
);
list_init
(
&
session
->
result_handlers
);
if
(
!
(
session
->
worker_control_event
=
CreateEventW
(
NULL
,
FALSE
,
FALSE
,
NULL
)))
{
hr
=
HRESULT_FROM_WIN32
(
GetLastError
());
goto
error
;
}
if
(
FAILED
(
hr
=
vector_inspectable_create
(
&
constraints_iids
,
(
IVector_IInspectable
**
)
&
session
->
constraints
)))
goto
error
;
InitializeCriticalSection
(
&
session
->
cs
);
session
->
cs
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": recognition_session.cs"
);
/* Init ISpeechRecognizer */
impl
->
ISpeechRecognizer_iface
.
lpVtbl
=
&
speech_recognizer_vtbl
;
impl
->
IClosable_iface
.
lpVtbl
=
&
closable_vtbl
;
...
...
@@ -828,13 +948,13 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface
impl
->
session
=
&
session
->
ISpeechContinuousRecognitionSession_iface
;
impl
->
ref
=
1
;
TRACE
(
"created SpeechRecognizer %p.
\n
"
,
impl
);
*
speechrecognizer
=
&
impl
->
ISpeechRecognizer_iface
;
TRACE
(
"created SpeechRecognizer %p.
\n
"
,
*
speechrecognizer
);
return
S_OK
;
error
:
if
(
session
->
constraints
)
IVector_ISpeechRecognitionConstraint_Release
(
session
->
constraints
);
if
(
session
->
worker_control_event
)
CloseHandle
(
session
->
worker_control_event
);
free
(
session
);
free
(
impl
);
...
...
dlls/windows.media.speech/tests/speech.c
View file @
9515736a
...
...
@@ -1744,8 +1744,8 @@ static void test_Recognition(void)
action2
=
(
void
*
)
0xdeadbeef
;
hr
=
ISpeechContinuousRecognitionSession_StartAsync
(
session
,
&
action2
);
todo_wine
ok
(
hr
==
COR_E_INVALIDOPERATION
,
"ISpeechContinuousRecognitionSession_StartAsync failed, hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
action2
==
NULL
,
"action2 was %p.
\n
"
,
action2
);
ok
(
hr
==
COR_E_INVALIDOPERATION
,
"ISpeechContinuousRecognitionSession_StartAsync failed, hr %#lx.
\n
"
,
hr
);
ok
(
action2
==
NULL
,
"action2 was %p.
\n
"
,
action2
);
hr
=
IAsyncAction_QueryInterface
(
action
,
&
IID_IAsyncInfo
,
(
void
**
)
&
info
);
ok
(
hr
==
S_OK
,
"IAsyncAction_QueryInterface failed, hr %#lx.
\n
"
,
hr
);
...
...
@@ -1863,8 +1863,8 @@ static void test_Recognition(void)
/* Try stopping, when already stopped. */
hr
=
ISpeechContinuousRecognitionSession_StopAsync
(
session
,
&
action
);
todo_wine
ok
(
hr
==
COR_E_INVALIDOPERATION
,
"ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
action
==
NULL
,
"action was %p.
\n
"
,
action
);
ok
(
hr
==
COR_E_INVALIDOPERATION
,
"ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.
\n
"
,
hr
);
ok
(
action
==
NULL
,
"action was %p.
\n
"
,
action
);
hr
=
ISpeechContinuousRecognitionSession_remove_ResultGenerated
(
session
,
token
);
ok
(
hr
==
S_OK
,
"ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.
\n
"
,
hr
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment