mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 20:28:26 +00:00
quartz: Vend CLSID_NullRenderer from qedit.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
96eb82f701
commit
e9ad430ab6
|
@ -4,6 +4,7 @@ IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
main.c \
|
main.c \
|
||||||
mediadet.c \
|
mediadet.c \
|
||||||
|
nullrenderer.c \
|
||||||
samplegrabber.c \
|
samplegrabber.c \
|
||||||
timeline.c
|
timeline.c
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,7 @@ static const struct object_creation_info object_creation[] =
|
||||||
{
|
{
|
||||||
{ &CLSID_AMTimeline, AMTimeline_create },
|
{ &CLSID_AMTimeline, AMTimeline_create },
|
||||||
{ &CLSID_MediaDet, MediaDet_create },
|
{ &CLSID_MediaDet, MediaDet_create },
|
||||||
|
{ &CLSID_NullRenderer, NullRenderer_create },
|
||||||
{ &CLSID_SampleGrabber, SampleGrabber_create },
|
{ &CLSID_SampleGrabber, SampleGrabber_create },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Null Renderer (Promiscuous, not rendering anything at all!)
|
* Null renderer filter
|
||||||
*
|
*
|
||||||
* Copyright 2004 Christian Costa
|
* Copyright 2004 Christian Costa
|
||||||
* Copyright 2008 Maarten Lankhorst
|
* Copyright 2008 Maarten Lankhorst
|
||||||
|
@ -19,25 +19,12 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#define COBJMACROS
|
||||||
|
|
||||||
#include "quartz_private.h"
|
|
||||||
#include "pin.h"
|
|
||||||
|
|
||||||
#include "uuids.h"
|
|
||||||
#include "vfwmsgs.h"
|
|
||||||
#include "amvideo.h"
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "dshow.h"
|
#include "dshow.h"
|
||||||
#include "evcode.h"
|
|
||||||
#include "strmif.h"
|
|
||||||
#include "ddraw.h"
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
#include "wine/strmbase.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
|
WINE_DEFAULT_DEBUG_CHANNEL(qedit);
|
||||||
|
|
||||||
typedef struct NullRendererImpl
|
typedef struct NullRendererImpl
|
||||||
{
|
{
|
||||||
|
@ -89,7 +76,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
|
||||||
{
|
{
|
||||||
NullRendererImpl *This = impl_from_IUnknown(iface);
|
NullRendererImpl *This = impl_from_IUnknown(iface);
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv);
|
TRACE("filter %p, iid %s, out %p.\n", This, debugstr_guid(riid), ppv);
|
||||||
|
|
||||||
*ppv = NULL;
|
*ppv = NULL;
|
||||||
|
|
||||||
|
@ -112,7 +99,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))
|
if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))
|
||||||
FIXME("No interface for %s!\n", qzdebugstr_guid(riid));
|
FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
|
||||||
|
|
||||||
return E_NOINTERFACE;
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
|
@ -32,6 +32,13 @@ coclass AMTimeline { interface IAMTimeline; interface IPersistStream; interface
|
||||||
]
|
]
|
||||||
coclass MediaDet { interface IMediaDet; }
|
coclass MediaDet { interface IMediaDet; }
|
||||||
|
|
||||||
|
[
|
||||||
|
helpstring("Null Renderer"),
|
||||||
|
threading(both),
|
||||||
|
uuid(c1f400a4-3f08-11d3-9f0b-006008039e37)
|
||||||
|
]
|
||||||
|
coclass NullRenderer { interface IBaseFilter; }
|
||||||
|
|
||||||
[
|
[
|
||||||
helpstring("Sample Grabber"),
|
helpstring("Sample Grabber"),
|
||||||
threading(both),
|
threading(both),
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
|
|
||||||
HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
||||||
HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
||||||
|
HRESULT NullRenderer_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
|
||||||
HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#endif /* __QEDIT_PRIVATE_INCLUDED__ */
|
#endif /* __QEDIT_PRIVATE_INCLUDED__ */
|
||||||
|
|
|
@ -16,7 +16,6 @@ C_SRCS = \
|
||||||
main.c \
|
main.c \
|
||||||
memallocator.c \
|
memallocator.c \
|
||||||
mpegsplit.c \
|
mpegsplit.c \
|
||||||
nullrenderer.c \
|
|
||||||
parser.c \
|
parser.c \
|
||||||
pin.c \
|
pin.c \
|
||||||
regsvr.c \
|
regsvr.c \
|
||||||
|
|
|
@ -74,7 +74,6 @@ static const struct object_creation_info object_creation[] =
|
||||||
{ &CLSID_AviSplitter, AVISplitter_create },
|
{ &CLSID_AviSplitter, AVISplitter_create },
|
||||||
{ &CLSID_MPEG1Splitter, MPEGSplitter_create },
|
{ &CLSID_MPEG1Splitter, MPEGSplitter_create },
|
||||||
{ &CLSID_VideoRenderer, VideoRenderer_create },
|
{ &CLSID_VideoRenderer, VideoRenderer_create },
|
||||||
{ &CLSID_NullRenderer, NullRenderer_create },
|
|
||||||
{ &CLSID_VideoMixingRenderer, VMR7Impl_create },
|
{ &CLSID_VideoMixingRenderer, VMR7Impl_create },
|
||||||
{ &CLSID_VideoMixingRenderer9, VMR9Impl_create },
|
{ &CLSID_VideoMixingRenderer9, VMR9Impl_create },
|
||||||
{ &CLSID_VideoRendererDefault, VideoRendererDefault_create },
|
{ &CLSID_VideoRendererDefault, VideoRendererDefault_create },
|
||||||
|
|
|
@ -59,7 +59,6 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
|
||||||
HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||||
|
|
|
@ -119,13 +119,6 @@ coclass DSoundRender { interface IBaseFilter; }
|
||||||
]
|
]
|
||||||
coclass AudioRender { interface IBaseFilter; }
|
coclass AudioRender { interface IBaseFilter; }
|
||||||
|
|
||||||
[
|
|
||||||
helpstring("Null Renderer"),
|
|
||||||
threading(both),
|
|
||||||
uuid(c1f400a4-3f08-11d3-9f0b-006008039e37)
|
|
||||||
]
|
|
||||||
coclass NullRenderer { interface IBaseFilter; }
|
|
||||||
|
|
||||||
[
|
[
|
||||||
helpstring("Video Renderer"),
|
helpstring("Video Renderer"),
|
||||||
threading(both),
|
threading(both),
|
||||||
|
|
Loading…
Reference in a new issue