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
e4dbaeeb
Commit
e4dbaeeb
authored
Jan 06, 2016
by
Anton Baskanov
Committed by
Alexandre Julliard
Jan 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Handle NULL target format in FilterGraph::ConvertTimeFormat.
Signed-off-by:
Anton Baskanov
<
baskanov@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e034c419
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
filtergraph.c
dlls/quartz/filtergraph.c
+3
-0
filtergraph.c
dlls/quartz/tests/filtergraph.c
+21
-0
No files found.
dlls/quartz/filtergraph.c
View file @
e4dbaeeb
...
...
@@ -2530,6 +2530,9 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL
if
(
!
pSourceFormat
)
pSourceFormat
=
&
This
->
timeformatseek
;
if
(
!
pTargetFormat
)
pTargetFormat
=
&
This
->
timeformatseek
;
if
(
IsEqualGUID
(
pTargetFormat
,
pSourceFormat
))
*
pTarget
=
Source
;
else
...
...
dlls/quartz/tests/filtergraph.c
View file @
e4dbaeeb
...
...
@@ -255,6 +255,7 @@ static void test_mediacontrol(void)
{
HRESULT
hr
;
LONGLONG
pos
=
0xdeadbeef
;
GUID
format
=
GUID_NULL
;
IMediaSeeking
*
seeking
=
NULL
;
IMediaFilter
*
filter
=
NULL
;
IMediaControl
*
control
=
NULL
;
...
...
@@ -282,6 +283,26 @@ static void test_mediacontrol(void)
return
;
}
format
=
GUID_NULL
;
hr
=
IMediaSeeking_GetTimeFormat
(
seeking
,
&
format
);
ok
(
hr
==
S_OK
,
"GetTimeFormat failed: %08x
\n
"
,
hr
);
ok
(
IsEqualGUID
(
&
format
,
&
TIME_FORMAT_MEDIA_TIME
),
"GetTimeFormat: unexpected format %s
\n
"
,
wine_dbgstr_guid
(
&
format
));
pos
=
0xdeadbeef
;
hr
=
IMediaSeeking_ConvertTimeFormat
(
seeking
,
&
pos
,
NULL
,
0x123456789a
,
NULL
);
ok
(
hr
==
S_OK
,
"ConvertTimeFormat failed: %08x
\n
"
,
hr
);
ok
(
pos
==
0x123456789a
,
"ConvertTimeFormat: expected 123456789a, got (%x%08x)
\n
"
,
(
DWORD
)(
pos
>>
32
),
(
DWORD
)
pos
);
pos
=
0xdeadbeef
;
hr
=
IMediaSeeking_ConvertTimeFormat
(
seeking
,
&
pos
,
&
TIME_FORMAT_MEDIA_TIME
,
0x123456789a
,
NULL
);
ok
(
hr
==
S_OK
,
"ConvertTimeFormat failed: %08x
\n
"
,
hr
);
ok
(
pos
==
0x123456789a
,
"ConvertTimeFormat: expected 123456789a, got (%x%08x)
\n
"
,
(
DWORD
)(
pos
>>
32
),
(
DWORD
)
pos
);
pos
=
0xdeadbeef
;
hr
=
IMediaSeeking_ConvertTimeFormat
(
seeking
,
&
pos
,
NULL
,
0x123456789a
,
&
TIME_FORMAT_MEDIA_TIME
);
ok
(
hr
==
S_OK
,
"ConvertTimeFormat failed: %08x
\n
"
,
hr
);
ok
(
pos
==
0x123456789a
,
"ConvertTimeFormat: expected 123456789a, got (%x%08x)
\n
"
,
(
DWORD
)(
pos
>>
32
),
(
DWORD
)
pos
);
hr
=
IMediaSeeking_GetCurrentPosition
(
seeking
,
&
pos
);
ok
(
hr
==
S_OK
,
"GetCurrentPosition failed: %08x
\n
"
,
hr
);
ok
(
pos
==
0
,
"Position != 0 (%x%08x)
\n
"
,
(
DWORD
)(
pos
>>
32
),
(
DWORD
)
pos
);
...
...
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