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
bc588e9c
Commit
bc588e9c
authored
Nov 23, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/tests: Avoid some test failures related to timing.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
029ec25e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
vmr7.c
dlls/quartz/tests/vmr7.c
+8
-3
vmr9.c
dlls/quartz/tests/vmr9.c
+9
-8
No files found.
dlls/quartz/tests/vmr7.c
View file @
bc588e9c
...
...
@@ -1181,7 +1181,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control
thread
=
send_frame
(
input
);
ok
(
WaitForSingleObject
(
thread
,
100
)
==
WAIT_TIMEOUT
,
"Thread should block in Receive().
\n
"
);
hr
=
IMediaControl_GetState
(
control
,
0
,
&
state
);
hr
=
IMediaControl_GetState
(
control
,
100
0
,
&
state
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IPin_BeginFlush
(
pin
);
...
...
@@ -1201,10 +1201,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control
hr
=
IMediaControl_GetState
(
control
,
0
,
&
state
);
todo_wine
ok
(
hr
==
VFW_S_STATE_INTERMEDIATE
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
state
==
State_Paused
,
"Got state %#x.
\n
"
,
state
);
thread
=
send_frame
(
input
);
ok
(
WaitForSingleObject
(
thread
,
100
)
==
WAIT_TIMEOUT
,
"Thread should block in Receive().
\n
"
);
hr
=
IMediaControl_GetState
(
control
,
1000
,
&
state
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
state
==
State_Paused
,
"Got state %#x.
\n
"
,
state
);
hr
=
IMediaControl_Run
(
control
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
join_thread
(
thread
);
...
...
@@ -2108,8 +2113,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our
params
.
message
=
WM_SYSCOLORCHANGE
;
thread
=
CreateThread
(
NULL
,
0
,
notify_message_proc
,
&
params
,
0
,
NULL
);
ok
(
WaitForSingleObject
(
thread
,
100
)
==
WAIT_TIMEOUT
,
"Thread should block.
\n
"
);
ret
=
GetQueueStatus
(
QS_SENDMESSAGE
|
QS_POST
MESSAGE
);
ok
(
ret
==
((
QS_SENDMESSAGE
<<
16
)
|
QS_SENDMESSAGE
),
"Got unexpected status %#x.
\n
"
,
ret
);
ret
=
MsgWaitForMultipleObjects
(
0
,
NULL
,
FALSE
,
1000
,
QS_SEND
MESSAGE
);
ok
(
!
ret
,
"Did not find a sent message.
\n
"
);
while
(
PeekMessageA
(
&
msg
,
0
,
0
,
0
,
PM_REMOVE
))
DispatchMessageA
(
&
msg
);
ok
(
!
WaitForSingleObject
(
thread
,
1000
),
"Wait timed out.
\n
"
);
...
...
dlls/quartz/tests/vmr9.c
View file @
bc588e9c
...
...
@@ -1220,10 +1220,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control
hr
=
IMediaControl_GetState
(
control
,
0
,
&
state
);
todo_wine
ok
(
hr
==
VFW_S_STATE_INTERMEDIATE
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
state
==
State_Paused
,
"Got state %#x.
\n
"
,
state
);
thread
=
send_frame
(
input
);
ok
(
WaitForSingleObject
(
thread
,
100
)
==
WAIT_TIMEOUT
,
"Thread should block in Receive().
\n
"
);
hr
=
IMediaControl_GetState
(
control
,
1000
,
&
state
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
state
==
State_Paused
,
"Got state %#x.
\n
"
,
state
);
hr
=
IMediaControl_Run
(
control
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
join_thread
(
thread
);
...
...
@@ -1432,18 +1437,14 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont
hr
=
join_thread
(
send_frame_time
(
input
,
-
2
,
0x00ff0000
));
/* red */
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
thread
=
send_frame_time
(
input
,
2
,
0x00ff00ff
);
/* magenta */
ok
(
WaitForSingleObject
(
thread
,
500
)
==
WAIT_TIMEOUT
,
"Thread should block in Receive().
\n
"
);
hr
=
join_thread
(
thread
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
thread
=
send_frame_time
(
input
,
1000000
,
0x00ffffff
);
/* white */
ok
(
WaitForSingleObject
(
thread
,
100
)
==
WAIT_TIMEOUT
,
"Thread should block in Receive().
\n
"
);
hr
=
IPin_BeginFlush
(
pin
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
join_thread
(
thread
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
/* If the frame makes it to Receive() in time to be rendered, we get S_OK. */
ok
(
hr
==
S_OK
||
hr
==
S_FALSE
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IPin_EndFlush
(
pin
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
...
@@ -2351,8 +2352,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our
params
.
message
=
WM_SYSCOLORCHANGE
;
thread
=
CreateThread
(
NULL
,
0
,
notify_message_proc
,
&
params
,
0
,
NULL
);
ok
(
WaitForSingleObject
(
thread
,
100
)
==
WAIT_TIMEOUT
,
"Thread should block.
\n
"
);
ret
=
GetQueueStatus
(
QS_SENDMESSAGE
|
QS_POST
MESSAGE
);
ok
(
ret
==
((
QS_SENDMESSAGE
<<
16
)
|
QS_SENDMESSAGE
),
"Got unexpected status %#x.
\n
"
,
ret
);
ret
=
MsgWaitForMultipleObjects
(
0
,
NULL
,
FALSE
,
1000
,
QS_SEND
MESSAGE
);
ok
(
!
ret
,
"Did not find a sent message.
\n
"
);
while
(
PeekMessageA
(
&
msg
,
0
,
0
,
0
,
PM_REMOVE
))
DispatchMessageA
(
&
msg
);
ok
(
!
WaitForSingleObject
(
thread
,
1000
),
"Wait timed out.
\n
"
);
...
...
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