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
409c60f9
Commit
409c60f9
authored
Apr 04, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Apr 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/tests: Fix some VMR9 test failures.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c191a1d4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
15 deletions
+28
-15
vmr9.c
dlls/quartz/tests/vmr9.c
+28
-15
No files found.
dlls/quartz/tests/vmr9.c
View file @
409c60f9
...
@@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode)
...
@@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode)
hr
=
IBaseFilter_QueryInterface
(
filter
,
&
IID_IVMRFilterConfig9
,
(
void
**
)
&
config
);
hr
=
IBaseFilter_QueryInterface
(
filter
,
&
IID_IVMRFilterConfig9
,
(
void
**
)
&
config
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
mode
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
mode
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
||
broken
(
hr
==
E_FAIL
)
,
"Got hr %#x.
\n
"
,
hr
);
IVMRFilterConfig9_Release
(
config
);
IVMRFilterConfig9_Release
(
config
);
}
}
return
filter
;
return
filter
;
...
@@ -65,7 +65,7 @@ static void test_filter_config(void)
...
@@ -65,7 +65,7 @@ static void test_filter_config(void)
ok
(
mode
==
VMRMode_Windowed
,
"Got mode %#x.
\n
"
,
mode
);
ok
(
mode
==
VMRMode_Windowed
,
"Got mode %#x.
\n
"
,
mode
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
VMR9Mode_Windowed
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
VMR9Mode_Windowed
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
||
broken
(
hr
==
E_FAIL
)
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVMRFilterConfig9_GetRenderingMode
(
config
,
&
mode
);
hr
=
IVMRFilterConfig9_GetRenderingMode
(
config
,
&
mode
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
@@ -82,7 +82,7 @@ static void test_filter_config(void)
...
@@ -82,7 +82,7 @@ static void test_filter_config(void)
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
VMR9Mode_Windowless
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
VMR9Mode_Windowless
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
||
broken
(
hr
==
E_FAIL
)
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVMRFilterConfig9_GetRenderingMode
(
config
,
&
mode
);
hr
=
IVMRFilterConfig9_GetRenderingMode
(
config
,
&
mode
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
@@ -134,7 +134,7 @@ static void test_filter_config(void)
...
@@ -134,7 +134,7 @@ static void test_filter_config(void)
/* Despite MSDN, you can still change the rendering mode after setting the
/* Despite MSDN, you can still change the rendering mode after setting the
* stream count. */
* stream count. */
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
VMR9Mode_Windowless
);
hr
=
IVMRFilterConfig9_SetRenderingMode
(
config
,
VMR9Mode_Windowless
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
||
broken
(
hr
==
E_FAIL
)
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVMRFilterConfig9_GetRenderingMode
(
config
,
&
mode
);
hr
=
IVMRFilterConfig9_GetRenderingMode
(
config
,
&
mode
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
@@ -150,19 +150,30 @@ static void test_filter_config(void)
...
@@ -150,19 +150,30 @@ static void test_filter_config(void)
ok
(
!
ref
,
"Got outstanding refcount %d.
\n
"
,
ref
);
ok
(
!
ref
,
"Got outstanding refcount %d.
\n
"
,
ref
);
}
}
#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c)
#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE)
static
void
check_interface_
(
unsigned
int
line
,
void
*
iface_ptr
,
REFIID
iid
,
BOOL
supported
)
#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE)
static
HRESULT
check_interface_
(
unsigned
int
line
,
void
*
iface
,
REFIID
riid
,
BOOL
supported
,
BOOL
is_broken
)
{
{
IUnknown
*
iface
=
iface_ptr
;
HRESULT
hr
,
expected_hr
,
broken_hr
;
HRESULT
hr
,
expected_hr
;
IUnknown
*
unknown
=
iface
,
*
out
;
IUnknown
*
unk
;
expected_hr
=
supported
?
S_OK
:
E_NOINTERFACE
;
if
(
supported
)
{
expected_hr
=
S_OK
;
broken_hr
=
E_NOINTERFACE
;
}
else
{
expected_hr
=
E_NOINTERFACE
;
broken_hr
=
S_OK
;
}
hr
=
IUnknown_QueryInterface
(
iface
,
iid
,
(
void
**
)
&
unk
);
hr
=
IUnknown_QueryInterface
(
unknown
,
riid
,
(
void
**
)
&
out
);
ok_
(
__FILE__
,
line
)(
hr
==
expected_hr
,
"Got hr %#x, expected %#x.
\n
"
,
hr
,
expected_hr
);
ok_
(
__FILE__
,
line
)(
hr
==
expected_hr
||
broken
(
is_broken
&&
hr
==
broken_hr
),
"Got hr %#x, expected %#x.
\n
"
,
hr
,
expected_hr
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
IUnknown_Release
(
unk
);
IUnknown_Release
(
out
);
return
hr
;
}
}
static
void
test_interfaces
(
void
)
static
void
test_interfaces
(
void
)
...
@@ -188,7 +199,9 @@ static void test_interfaces(void)
...
@@ -188,7 +199,9 @@ static void test_interfaces(void)
todo_wine
check_interface
(
filter
,
&
IID_IVMRDeinterlaceControl9
,
TRUE
);
todo_wine
check_interface
(
filter
,
&
IID_IVMRDeinterlaceControl9
,
TRUE
);
check_interface
(
filter
,
&
IID_IVMRFilterConfig9
,
TRUE
);
check_interface
(
filter
,
&
IID_IVMRFilterConfig9
,
TRUE
);
todo_wine
check_interface
(
filter
,
&
IID_IVMRMixerBitmap9
,
TRUE
);
todo_wine
check_interface
(
filter
,
&
IID_IVMRMixerBitmap9
,
TRUE
);
check_interface
(
filter
,
&
IID_IVMRMonitorConfig9
,
TRUE
);
/* IVMRMonitorConfig9 may not be available if the d3d9 device has
* insufficient support. */
check_interface_broken
(
filter
,
&
IID_IVMRMonitorConfig9
,
TRUE
);
check_interface
(
filter
,
&
IID_IBasicAudio
,
FALSE
);
check_interface
(
filter
,
&
IID_IBasicAudio
,
FALSE
);
check_interface
(
filter
,
&
IID_IDirectDrawVideo
,
FALSE
);
check_interface
(
filter
,
&
IID_IDirectDrawVideo
,
FALSE
);
...
@@ -210,7 +223,7 @@ static void test_interfaces(void)
...
@@ -210,7 +223,7 @@ static void test_interfaces(void)
IBaseFilter_Release
(
filter
);
IBaseFilter_Release
(
filter
);
filter
=
create_vmr9
(
VMR9Mode_Windowless
);
filter
=
create_vmr9
(
VMR9Mode_Windowless
);
check_interface
(
filter
,
&
IID_IVMRMonitorConfig9
,
TRUE
);
check_interface
_broken
(
filter
,
&
IID_IVMRMonitorConfig9
,
TRUE
);
check_interface
(
filter
,
&
IID_IVMRWindowlessControl9
,
TRUE
);
check_interface
(
filter
,
&
IID_IVMRWindowlessControl9
,
TRUE
);
todo_wine
check_interface
(
filter
,
&
IID_IBasicVideo
,
FALSE
);
todo_wine
check_interface
(
filter
,
&
IID_IBasicVideo
,
FALSE
);
...
...
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