Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
a408bba2
Commit
a408bba2
authored
Feb 14, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mfplay: Fix IsProtected() return value.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
28f9cd5b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
player.c
dlls/mfplay/player.c
+4
-1
mfplay.c
dlls/mfplay/tests/mfplay.c
+6
-1
No files found.
dlls/mfplay/player.c
View file @
a408bba2
...
...
@@ -627,10 +627,13 @@ static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protect
TRACE
(
"%p, %p.
\n
"
,
iface
,
protected
);
if
(
!
protected
)
return
E_POINTER
;
EnterCriticalSection
(
&
item
->
player
->
cs
);
if
(
SUCCEEDED
(
hr
=
media_item_get_pd
(
item
,
&
pd
)))
{
*
protected
=
MFRequireProtectedEnvironment
(
pd
)
==
S_OK
;
*
protected
=
(
hr
=
MFRequireProtectedEnvironment
(
pd
)
)
==
S_OK
;
IMFPresentationDescriptor_Release
(
pd
);
}
LeaveCriticalSection
(
&
item
->
player
->
cs
);
...
...
dlls/mfplay/tests/mfplay.c
View file @
a408bba2
...
...
@@ -328,8 +328,10 @@ static void test_media_item(void)
hr
=
IMFPMediaItem_HasAudio
(
item
,
&
ret
,
&
selected
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFPMediaItem_IsProtected
(
item
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFPMediaItem_IsProtected
(
item
,
&
ret
);
todo_wine
ok
(
hr
==
S_FALSE
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFPMediaItem_GetDuration
(
item
,
&
MFP_POSITIONTYPE_100NS
,
&
propvar
);
...
...
@@ -380,6 +382,9 @@ static void test_media_item(void)
hr
=
IMFPMediaItem_HasAudio
(
item
,
&
ret
,
&
selected
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFPMediaItem_IsProtected
(
item
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFPMediaItem_IsProtected
(
item
,
&
ret
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected 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