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
c4832019
Commit
c4832019
authored
May 20, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
May 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qedit/nullrenderer: Don't expose IAMFilterMiscFlags.
This reverts
443e24fe
. Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
19b5b68c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
41 deletions
+1
-41
nullrenderer.c
dlls/qedit/nullrenderer.c
+0
-40
nullrenderer.c
dlls/qedit/tests/nullrenderer.c
+1
-1
No files found.
dlls/qedit/nullrenderer.c
View file @
c4832019
...
@@ -30,7 +30,6 @@ typedef struct NullRendererImpl
...
@@ -30,7 +30,6 @@ typedef struct NullRendererImpl
{
{
BaseRenderer
renderer
;
BaseRenderer
renderer
;
IUnknown
IUnknown_inner
;
IUnknown
IUnknown_inner
;
IAMFilterMiscFlags
IAMFilterMiscFlags_iface
;
IUnknown
*
outer_unk
;
IUnknown
*
outer_unk
;
}
NullRendererImpl
;
}
NullRendererImpl
;
...
@@ -82,8 +81,6 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
...
@@ -82,8 +81,6 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
))
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
))
*
ppv
=
&
This
->
IUnknown_inner
;
*
ppv
=
&
This
->
IUnknown_inner
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IAMFilterMiscFlags
))
*
ppv
=
&
This
->
IAMFilterMiscFlags_iface
;
else
else
{
{
HRESULT
hr
;
HRESULT
hr
;
...
@@ -174,42 +171,6 @@ static const IBaseFilterVtbl NullRenderer_Vtbl =
...
@@ -174,42 +171,6 @@ static const IBaseFilterVtbl NullRenderer_Vtbl =
BaseFilterImpl_QueryVendorInfo
BaseFilterImpl_QueryVendorInfo
};
};
static
NullRendererImpl
*
impl_from_IAMFilterMiscFlags
(
IAMFilterMiscFlags
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
NullRendererImpl
,
IAMFilterMiscFlags_iface
);
}
static
HRESULT
WINAPI
AMFilterMiscFlags_QueryInterface
(
IAMFilterMiscFlags
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
NullRendererImpl
*
This
=
impl_from_IAMFilterMiscFlags
(
iface
);
return
IUnknown_QueryInterface
(
This
->
outer_unk
,
riid
,
ppv
);
}
static
ULONG
WINAPI
AMFilterMiscFlags_AddRef
(
IAMFilterMiscFlags
*
iface
)
{
NullRendererImpl
*
This
=
impl_from_IAMFilterMiscFlags
(
iface
);
return
IUnknown_AddRef
(
This
->
outer_unk
);
}
static
ULONG
WINAPI
AMFilterMiscFlags_Release
(
IAMFilterMiscFlags
*
iface
)
{
NullRendererImpl
*
This
=
impl_from_IAMFilterMiscFlags
(
iface
);
return
IUnknown_Release
(
This
->
outer_unk
);
}
static
ULONG
WINAPI
AMFilterMiscFlags_GetMiscFlags
(
IAMFilterMiscFlags
*
iface
)
{
return
AM_FILTER_MISC_FLAGS_IS_RENDERER
;
}
static
const
IAMFilterMiscFlagsVtbl
IAMFilterMiscFlags_Vtbl
=
{
AMFilterMiscFlags_QueryInterface
,
AMFilterMiscFlags_AddRef
,
AMFilterMiscFlags_Release
,
AMFilterMiscFlags_GetMiscFlags
};
HRESULT
NullRenderer_create
(
IUnknown
*
pUnkOuter
,
void
**
ppv
)
HRESULT
NullRenderer_create
(
IUnknown
*
pUnkOuter
,
void
**
ppv
)
{
{
static
const
WCHAR
sink_name
[]
=
{
'I'
,
'n'
,
0
};
static
const
WCHAR
sink_name
[]
=
{
'I'
,
'n'
,
0
};
...
@@ -223,7 +184,6 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv)
...
@@ -223,7 +184,6 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv)
pNullRenderer
=
CoTaskMemAlloc
(
sizeof
(
NullRendererImpl
));
pNullRenderer
=
CoTaskMemAlloc
(
sizeof
(
NullRendererImpl
));
pNullRenderer
->
IUnknown_inner
.
lpVtbl
=
&
IInner_VTable
;
pNullRenderer
->
IUnknown_inner
.
lpVtbl
=
&
IInner_VTable
;
pNullRenderer
->
IAMFilterMiscFlags_iface
.
lpVtbl
=
&
IAMFilterMiscFlags_Vtbl
;
if
(
pUnkOuter
)
if
(
pUnkOuter
)
pNullRenderer
->
outer_unk
=
pUnkOuter
;
pNullRenderer
->
outer_unk
=
pUnkOuter
;
...
...
dlls/qedit/tests/nullrenderer.c
View file @
c4832019
...
@@ -68,7 +68,7 @@ static void test_interfaces(void)
...
@@ -68,7 +68,7 @@ static void test_interfaces(void)
check_interface
(
filter
,
&
IID_IPersist
,
TRUE
);
check_interface
(
filter
,
&
IID_IPersist
,
TRUE
);
check_interface
(
filter
,
&
IID_IUnknown
,
TRUE
);
check_interface
(
filter
,
&
IID_IUnknown
,
TRUE
);
todo_wine
check_interface
(
filter
,
&
IID_IAMFilterMiscFlags
,
FALSE
);
check_interface
(
filter
,
&
IID_IAMFilterMiscFlags
,
FALSE
);
check_interface
(
filter
,
&
IID_IBasicAudio
,
FALSE
);
check_interface
(
filter
,
&
IID_IBasicAudio
,
FALSE
);
check_interface
(
filter
,
&
IID_IBasicVideo
,
FALSE
);
check_interface
(
filter
,
&
IID_IBasicVideo
,
FALSE
);
check_interface
(
filter
,
&
IID_IKsPropertySet
,
FALSE
);
check_interface
(
filter
,
&
IID_IKsPropertySet
,
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