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
838f6834
Commit
838f6834
authored
Jun 24, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/memallocator: Return S_OK when clearing the media type.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f1c74923
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
memallocator.c
dlls/quartz/memallocator.c
+1
-1
memallocator.c
dlls/quartz/tests/memallocator.c
+2
-2
No files found.
dlls/quartz/memallocator.c
View file @
838f6834
...
...
@@ -686,7 +686,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED
This
->
props
.
pMediaType
=
NULL
;
}
if
(
!
pMediaType
)
return
S_
FALSE
;
return
S_
OK
;
if
(
!
(
This
->
props
.
pMediaType
=
CoTaskMemAlloc
(
sizeof
(
AM_MEDIA_TYPE
))))
return
E_OUTOFMEMORY
;
...
...
dlls/quartz/tests/memallocator.c
View file @
838f6834
...
...
@@ -487,7 +487,7 @@ static void test_sample_properties(void)
ok
(
!
mt
,
"Got media type %p.
\n
"
,
mt
);
hr
=
IMediaSample_SetMediaType
(
sample
,
NULL
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
mt
=
(
AM_MEDIA_TYPE
*
)
0xdeadbeef
;
hr
=
IMediaSample_GetMediaType
(
sample
,
&
mt
);
...
...
@@ -513,7 +513,7 @@ static void test_sample_properties(void)
ok
(
!
memcmp
(
props
.
pMediaType
,
&
expect_mt
,
sizeof
(
AM_MEDIA_TYPE
)),
"Media types didn't match.
\n
"
);
hr
=
IMediaSample_SetMediaType
(
sample
,
NULL
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
mt
=
(
AM_MEDIA_TYPE
*
)
0xdeadbeef
;
hr
=
IMediaSample_GetMediaType
(
sample
,
&
mt
);
...
...
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