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
d293200f
Commit
d293200f
authored
Feb 18, 2021
by
Anton Baskanov
Committed by
Alexandre Julliard
Feb 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
aab10e6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
filtergraph.c
dlls/quartz/filtergraph.c
+1
-3
filtergraph.c
dlls/quartz/tests/filtergraph.c
+2
-2
No files found.
dlls/quartz/filtergraph.c
View file @
d293200f
...
...
@@ -4744,6 +4744,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code,
if
(
!
(
entry
=
list_head
(
&
graph
->
media_events
)))
{
ResetEvent
(
graph
->
media_event_handle
);
LeaveCriticalSection
(
&
graph
->
cs
);
return
E_ABORT
;
}
...
...
@@ -4754,9 +4755,6 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code,
*
param2
=
event
->
param2
;
free
(
event
);
if
(
list_empty
(
&
graph
->
media_events
))
ResetEvent
(
graph
->
media_event_handle
);
LeaveCriticalSection
(
&
graph
->
cs
);
return
S_OK
;
}
...
...
dlls/quartz/tests/filtergraph.c
View file @
d293200f
...
...
@@ -5260,7 +5260,7 @@ static void test_set_notify_flags(void)
hr
=
IMediaEventEx_GetEvent
(
media_event
,
&
code
,
&
param1
,
&
param2
,
50
);
ok
(
hr
==
E_ABORT
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
WaitForSingleObject
(
event
,
0
)
==
WAIT_TIMEOUT
,
"Event should not be signaled.
\n
"
);
ok
(
WaitForSingleObject
(
event
,
0
)
==
WAIT_TIMEOUT
,
"Event should not be signaled.
\n
"
);
hr
=
IMediaEventEx_SetNotifyFlags
(
media_event
,
0
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
...
@@ -5474,7 +5474,7 @@ static void test_events(void)
hr
=
IMediaEventEx_GetEvent
(
media_event
,
&
code
,
&
param1
,
&
param2
,
50
);
ok
(
hr
==
E_ABORT
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
WaitForSingleObject
(
event
,
0
)
==
WAIT_TIMEOUT
,
"Event should not be signaled.
\n
"
);
ok
(
WaitForSingleObject
(
event
,
0
)
==
WAIT_TIMEOUT
,
"Event should not be signaled.
\n
"
);
hr
=
IMediaControl_Stop
(
media_control
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\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