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
42929b75
Commit
42929b75
authored
Sep 20, 2018
by
Zebediah Figura
Committed by
Alexandre Julliard
Sep 22, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/filtergraph: Don't recursively render pins whose names begin with ~.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c1af8227
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
5 deletions
+39
-5
filtergraph.c
dlls/quartz/filtergraph.c
+11
-5
filtergraph.c
dlls/quartz/tests/filtergraph.c
+28
-0
No files found.
dlls/quartz/filtergraph.c
View file @
42929b75
...
...
@@ -1367,16 +1367,22 @@ static HRESULT render_output_pins(IFilterGraphImpl *graph, IBaseFilter *filter)
BOOL
renderall
=
TRUE
;
IEnumPins
*
enumpins
;
IPin
*
pin
,
*
peer
;
PIN_INFO
info
;
IBaseFilter_EnumPins
(
filter
,
&
enumpins
);
while
(
IEnumPins_Next
(
enumpins
,
1
,
&
pin
,
NULL
)
==
S_OK
)
{
PIN_DIRECTION
dir
=
PINDIR_INPUT
;
IPin_QueryDirection
(
pin
,
&
dir
);
if
(
dir
==
PINDIR_OUTPUT
)
IPin_QueryPinInfo
(
pin
,
&
info
);
IBaseFilter_Release
(
info
.
pFilter
);
if
(
info
.
dir
==
PINDIR_OUTPUT
)
{
if
(
info
.
achName
[
0
]
==
'~'
)
{
TRACE
(
"Skipping non-rendered pin %s.
\n
"
,
debugstr_w
(
info
.
achName
));
IPin_Release
(
pin
);
continue
;
}
if
(
IPin_ConnectedTo
(
pin
,
&
peer
)
==
VFW_E_NOT_CONNECTED
)
{
HRESULT
hr
;
...
...
dlls/quartz/tests/filtergraph.c
View file @
42929b75
...
...
@@ -1485,6 +1485,8 @@ static void test_graph_builder_render(void)
ok
(
parser_pins
[
1
].
peer
==
&
sink1_pin
.
IPin_iface
,
"Got peer %p.
\n
"
,
parser_pins
[
1
].
peer
);
IFilterGraph2_Disconnect
(
graph
,
source_pin
.
peer
);
IFilterGraph2_Disconnect
(
graph
,
&
source_pin
.
IPin_iface
);
IFilterGraph2_Disconnect
(
graph
,
parser_pins
[
0
].
peer
);
IFilterGraph2_Disconnect
(
graph
,
&
parser_pins
[
0
].
IPin_iface
);
IFilterGraph2_RemoveFilter
(
graph
,
&
sink1
.
IBaseFilter_iface
);
IFilterGraph2_AddFilter
(
graph
,
&
sink1
.
IBaseFilter_iface
,
NULL
);
...
...
@@ -1492,6 +1494,32 @@ static void test_graph_builder_render(void)
hr
=
IFilterGraph2_Render
(
graph
,
&
source_pin
.
IPin_iface
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
source_pin
.
peer
==
&
sink1_pin
.
IPin_iface
,
"Got peer %p.
\n
"
,
source_pin
.
peer
);
IFilterGraph2_Disconnect
(
graph
,
source_pin
.
peer
);
IFilterGraph2_Disconnect
(
graph
,
&
source_pin
.
IPin_iface
);
/* A pin whose name (not ID) begins with a tilde is not rendered. */
IFilterGraph2_RemoveFilter
(
graph
,
&
sink2
.
IBaseFilter_iface
);
IFilterGraph2_RemoveFilter
(
graph
,
&
parser
.
IBaseFilter_iface
);
IFilterGraph2_AddFilter
(
graph
,
&
parser
.
IBaseFilter_iface
,
NULL
);
parser_pins
[
1
].
name
[
0
]
=
'~'
;
hr
=
IFilterGraph2_Render
(
graph
,
&
source_pin
.
IPin_iface
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
source_pin
.
peer
==
&
parser_pins
[
0
].
IPin_iface
,
"Got peer %p.
\n
"
,
source_pin
.
peer
);
ok
(
!
parser_pins
[
1
].
peer
,
"Got peer %p.
\n
"
,
parser_pins
[
1
].
peer
);
ok
(
!
sink1_pin
.
peer
,
"Got peer %p.
\n
"
,
sink1_pin
.
peer
);
IFilterGraph2_Disconnect
(
graph
,
source_pin
.
peer
);
IFilterGraph2_Disconnect
(
graph
,
&
source_pin
.
IPin_iface
);
parser_pins
[
1
].
name
[
0
]
=
0
;
parser_pins
[
1
].
id
[
0
]
=
'~'
;
hr
=
IFilterGraph2_Render
(
graph
,
&
source_pin
.
IPin_iface
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
source_pin
.
peer
==
&
parser_pins
[
0
].
IPin_iface
,
"Got peer %p.
\n
"
,
source_pin
.
peer
);
ok
(
parser_pins
[
1
].
peer
==
&
sink1_pin
.
IPin_iface
,
"Got peer %p.
\n
"
,
parser_pins
[
1
].
peer
);
IFilterGraph2_Disconnect
(
graph
,
source_pin
.
peer
);
IFilterGraph2_Disconnect
(
graph
,
&
source_pin
.
IPin_iface
);
ref
=
IFilterGraph2_Release
(
graph
);
ok
(
!
ref
,
"Got outstanding refcount %d.
\n
"
,
ref
);
...
...
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