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
15b3eba7
Commit
15b3eba7
authored
Jun 25, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qcap/vfwcapture: Don't expose IAMStreamConfig from the filter.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
16322578
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
17 deletions
+11
-17
qcap.c
dlls/qcap/tests/qcap.c
+1
-1
vfwcapture.c
dlls/qcap/vfwcapture.c
+10
-16
No files found.
dlls/qcap/tests/qcap.c
View file @
15b3eba7
...
...
@@ -1809,7 +1809,7 @@ static void test_COM_vfwcapture(void)
/* Unsupported interfaces */
hr
=
IBaseFilter_QueryInterface
(
bf
,
&
IID_IAMStreamConfig
,
(
void
**
)
&
unk
);
todo_wine
ok
(
hr
==
E_NOINTERFACE
,
"QueryInterface for IID_IAMStreamConfig failed: %08x
\n
"
,
hr
);
ok
(
hr
==
E_NOINTERFACE
,
"QueryInterface for IID_IAMStreamConfig failed: %08x
\n
"
,
hr
);
hr
=
IBaseFilter_QueryInterface
(
bf
,
&
IID_IAMVideoProcAmp
,
(
void
**
)
&
unk
);
todo_wine
ok
(
hr
==
E_NOINTERFACE
,
"QueryInterface for IID_IAMVideoProcAmp failed: %08x
\n
"
,
hr
);
hr
=
IBaseFilter_QueryInterface
(
bf
,
&
IID_IOverlayNotify
,
(
void
**
)
&
unk
);
...
...
dlls/qcap/vfwcapture.c
View file @
15b3eba7
...
...
@@ -125,8 +125,6 @@ static HRESULT vfw_capture_query_interface(BaseFilter *iface, REFIID iid, void *
if
(
IsEqualGUID
(
iid
,
&
IID_IPersistPropertyBag
))
*
out
=
&
filter
->
IPersistPropertyBag_iface
;
else
if
(
IsEqualGUID
(
iid
,
&
IID_IAMStreamConfig
))
*
out
=
&
filter
->
IAMStreamConfig_iface
;
else
if
(
IsEqualGUID
(
iid
,
&
IID_IAMVideoProcAmp
))
*
out
=
&
filter
->
IAMVideoProcAmp_iface
;
else
...
...
@@ -187,26 +185,22 @@ static const IBaseFilterVtbl VfwCapture_Vtbl =
};
/* AMStreamConfig interface, we only need to implement {G,S}etFormat */
static
HRESULT
WINAPI
AMStreamConfig_QueryInterface
(
IAMStreamConfig
*
iface
,
REFIID
riid
,
void
**
ret_iface
)
static
HRESULT
WINAPI
AMStreamConfig_QueryInterface
(
IAMStreamConfig
*
iface
,
REFIID
iid
,
void
**
out
)
{
VfwCapture
*
This
=
impl_from_IAMStreamConfig
(
iface
);
return
IUnknown_QueryInterface
(
This
->
filter
.
outer_unk
,
riid
,
ret_iface
);
VfwCapture
*
filter
=
impl_from_IAMStreamConfig
(
iface
);
return
IPin_QueryInterface
(
&
filter
->
source
.
pin
.
IPin_iface
,
iid
,
out
);
}
static
ULONG
WINAPI
AMStreamConfig_AddRef
(
IAMStreamConfig
*
iface
)
static
ULONG
WINAPI
AMStreamConfig_AddRef
(
IAMStreamConfig
*
iface
)
{
VfwCapture
*
This
=
impl_from_IAMStreamConfig
(
iface
);
return
IUnknown_AddRef
(
This
->
filter
.
outer_unk
);
VfwCapture
*
filter
=
impl_from_IAMStreamConfig
(
iface
);
return
IPin_AddRef
(
&
filter
->
source
.
pin
.
IPin_iface
);
}
static
ULONG
WINAPI
AMStreamConfig_Release
(
IAMStreamConfig
*
iface
)
static
ULONG
WINAPI
AMStreamConfig_Release
(
IAMStreamConfig
*
iface
)
{
VfwCapture
*
This
=
impl_from_IAMStreamConfig
(
iface
);
return
IUnknown_Release
(
This
->
filter
.
outer_unk
);
VfwCapture
*
filter
=
impl_from_IAMStreamConfig
(
iface
);
return
IPin_Release
(
&
filter
->
source
.
pin
.
IPin_iface
);
}
static
HRESULT
WINAPI
...
...
@@ -580,7 +574,7 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID *
else
if
(
IsEqualIID
(
riid
,
&
IID_IKsPropertySet
))
*
ppv
=
&
filter
->
IKsPropertySet_iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IAMStreamConfig
))
return
IUnknown_QueryInterface
(
&
filter
->
filter
.
IBaseFilter_iface
,
riid
,
ppv
)
;
*
ppv
=
&
filter
->
IAMStreamConfig_iface
;
if
(
*
ppv
)
{
...
...
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