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
646d3a10
Commit
646d3a10
authored
Jun 21, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/memallocator: Set the sample end time only if the start time is valid.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b9073b1e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
memallocator.c
dlls/quartz/memallocator.c
+14
-14
memallocator.c
dlls/quartz/tests/memallocator.c
+1
-1
No files found.
dlls/quartz/memallocator.c
View file @
646d3a10
...
...
@@ -560,27 +560,27 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T
return
hr
;
}
static
HRESULT
WINAPI
StdMediaSample2_SetTime
(
IMediaSample2
*
iface
,
REFERENCE_TIME
*
pStart
,
REFERENCE_TIME
*
pE
nd
)
static
HRESULT
WINAPI
StdMediaSample2_SetTime
(
IMediaSample2
*
iface
,
REFERENCE_TIME
*
start
,
REFERENCE_TIME
*
e
nd
)
{
StdMediaSample2
*
This
=
impl_from_IMediaSample2
(
iface
);
StdMediaSample2
*
sample
=
impl_from_IMediaSample2
(
iface
);
TRACE
(
"
(%p)->(%p, %p)
\n
"
,
iface
,
pStart
,
pE
nd
);
TRACE
(
"
iface %p, start %p, end %p.
\n
"
,
iface
,
start
,
e
nd
);
if
(
pS
tart
)
if
(
s
tart
)
{
This
->
props
.
tStart
=
*
pStart
;
This
->
props
.
dwSampleFlags
|=
AM_SAMPLE_TIMEVALID
;
}
else
This
->
props
.
dwSampleFlags
&=
~
AM_SAMPLE_TIMEVALID
;
sample
->
props
.
tStart
=
*
start
;
sample
->
props
.
dwSampleFlags
|=
AM_SAMPLE_TIMEVALID
;
if
(
pEnd
)
{
This
->
props
.
tStop
=
*
pEnd
;
This
->
props
.
dwSampleFlags
|=
AM_SAMPLE_STOPVALID
;
if
(
end
)
{
sample
->
props
.
tStop
=
*
end
;
sample
->
props
.
dwSampleFlags
|=
AM_SAMPLE_STOPVALID
;
}
else
sample
->
props
.
dwSampleFlags
&=
~
AM_SAMPLE_STOPVALID
;
}
else
This
->
props
.
dwSampleFlags
&=
~
AM_SAMPLE_STOPVALID
;
sample
->
props
.
dwSampleFlags
&=
~
(
AM_SAMPLE_TIMEVALID
|
AM_SAMPLE_STOPVALID
)
;
return
S_OK
;
}
...
...
dlls/quartz/tests/memallocator.c
View file @
646d3a10
...
...
@@ -245,7 +245,7 @@ static void test_sample_time(void)
hr
=
IMediaSample2_GetProperties
(
sample2
,
sizeof
(
props
),
(
BYTE
*
)
&
props
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
!
props
.
dwSampleFlags
,
"Got flags %#x.
\n
"
,
props
.
dwSampleFlags
);
ok
(
!
props
.
dwSampleFlags
,
"Got flags %#x.
\n
"
,
props
.
dwSampleFlags
);
start
=
0x123
;
end
=
0x321
;
...
...
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