Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
de95a030
Commit
de95a030
authored
Mar 02, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf: Fix GetClock() for shutdown state.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5ec5eb07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
session.c
dlls/mf/session.c
+9
-3
mf.c
dlls/mf/tests/mf.c
+4
-0
No files found.
dlls/mf/session.c
View file @
de95a030
...
...
@@ -1364,13 +1364,19 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
static
HRESULT
WINAPI
mfsession_GetClock
(
IMFMediaSession
*
iface
,
IMFClock
**
clock
)
{
struct
media_session
*
session
=
impl_from_IMFMediaSession
(
iface
);
HRESULT
hr
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
clock
);
*
clock
=
(
IMFClock
*
)
session
->
clock
;
IMFClock_AddRef
(
*
clock
);
EnterCriticalSection
(
&
session
->
cs
);
if
(
SUCCEEDED
(
hr
=
session_is_shut_down
(
session
)))
{
*
clock
=
(
IMFClock
*
)
session
->
clock
;
IMFClock_AddRef
(
*
clock
);
}
LeaveCriticalSection
(
&
session
->
cs
);
return
S_OK
;
return
hr
;
}
static
HRESULT
WINAPI
mfsession_GetSessionCapabilities
(
IMFMediaSession
*
iface
,
DWORD
*
caps
)
...
...
dlls/mf/tests/mf.c
View file @
de95a030
...
...
@@ -1100,6 +1100,7 @@ todo_wine
hr
=
IMFClock_GetProperties
(
clock
,
&
clock_props
);
ok
(
hr
==
MF_E_CLOCK_NO_TIME_SOURCE
,
"Unexpected hr %#x.
\n
"
,
hr
);
IMFClock_Release
(
clock
);
IMFRateControl_Release
(
rate_control
);
IMFRateSupport_Release
(
rate_support
);
...
...
@@ -1117,6 +1118,9 @@ todo_wine
hr
=
IMFMediaSession_Close
(
session
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaSession_GetClock
(
session
,
&
clock
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#x.
\n
"
,
hr
);
IMFMediaSession_Release
(
session
);
/* Custom topology loader, GUID is not registered. */
...
...
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