Zebediah Figura : quartz: Vend CLSID_NullRenderer from qedit.
Alexandre Julliard
julliard at winehq.org
Thu Apr 18 16:41:11 CDT 2019
Module: wine
Branch: master
Commit: e9ad430ab61af81f094401984fdd4c4d8d39bfb1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ad430ab61af81f094401984fdd4c4d8d39bfb1
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Apr 15 23:20:53 2019 -0500
quartz: Vend CLSID_NullRenderer from qedit.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qedit/Makefile.in | 1 +
dlls/qedit/main.c | 1 +
dlls/{quartz => qedit}/nullrenderer.c | 25 ++++++-------------------
dlls/qedit/qedit_classes.idl | 7 +++++++
dlls/qedit/qedit_private.h | 1 +
dlls/quartz/Makefile.in | 1 -
dlls/quartz/main.c | 1 -
dlls/quartz/quartz_private.h | 1 -
dlls/quartz/quartz_strmif.idl | 7 -------
9 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index 35ec0e3..b47ee26 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -4,6 +4,7 @@ IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
C_SRCS = \
main.c \
mediadet.c \
+ nullrenderer.c \
samplegrabber.c \
timeline.c
diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c
index 578e9df..a271f9a 100644
--- a/dlls/qedit/main.c
+++ b/dlls/qedit/main.c
@@ -60,6 +60,7 @@ static const struct object_creation_info object_creation[] =
{
{ &CLSID_AMTimeline, AMTimeline_create },
{ &CLSID_MediaDet, MediaDet_create },
+ { &CLSID_NullRenderer, NullRenderer_create },
{ &CLSID_SampleGrabber, SampleGrabber_create },
};
diff --git a/dlls/quartz/nullrenderer.c b/dlls/qedit/nullrenderer.c
similarity index 93%
rename from dlls/quartz/nullrenderer.c
rename to dlls/qedit/nullrenderer.c
index e17d19e..c19a90d 100644
--- a/dlls/quartz/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -1,5 +1,5 @@
/*
- * Null Renderer (Promiscuous, not rendering anything at all!)
+ * Null renderer filter
*
* Copyright 2004 Christian Costa
* Copyright 2008 Maarten Lankhorst
@@ -19,25 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
-#include "quartz_private.h"
-#include "pin.h"
-
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "amvideo.h"
-#include "windef.h"
-#include "winbase.h"
+#define COBJMACROS
#include "dshow.h"
-#include "evcode.h"
-#include "strmif.h"
-#include "ddraw.h"
-
-#include "wine/unicode.h"
#include "wine/debug.h"
+#include "wine/strmbase.h"
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
typedef struct NullRendererImpl
{
@@ -89,7 +76,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
{
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;
@@ -112,7 +99,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
}
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;
}
diff --git a/dlls/qedit/qedit_classes.idl b/dlls/qedit/qedit_classes.idl
index 7dca0f1..35a5abd 100644
--- a/dlls/qedit/qedit_classes.idl
+++ b/dlls/qedit/qedit_classes.idl
@@ -33,6 +33,13 @@ coclass AMTimeline { interface IAMTimeline; interface IPersistStream; interface
coclass MediaDet { interface IMediaDet; }
[
+ helpstring("Null Renderer"),
+ threading(both),
+ uuid(c1f400a4-3f08-11d3-9f0b-006008039e37)
+]
+coclass NullRenderer { interface IBaseFilter; }
+
+[
helpstring("Sample Grabber"),
threading(both),
uuid(c1f400a0-3f08-11d3-9f0b-006008039e37)
diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h
index 708c53d..344656d 100644
--- a/dlls/qedit/qedit_private.h
+++ b/dlls/qedit/qedit_private.h
@@ -34,6 +34,7 @@
HRESULT AMTimeline_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;
#endif /* __QEDIT_PRIVATE_INCLUDED__ */
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 147d395..efd96db 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -16,7 +16,6 @@ C_SRCS = \
main.c \
memallocator.c \
mpegsplit.c \
- nullrenderer.c \
parser.c \
pin.c \
regsvr.c \
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index 4575c6e..08287a7 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -74,7 +74,6 @@ static const struct object_creation_info object_creation[] =
{ &CLSID_AviSplitter, AVISplitter_create },
{ &CLSID_MPEG1Splitter, MPEGSplitter_create },
{ &CLSID_VideoRenderer, VideoRenderer_create },
- { &CLSID_NullRenderer, NullRenderer_create },
{ &CLSID_VideoMixingRenderer, VMR7Impl_create },
{ &CLSID_VideoMixingRenderer9, VMR9Impl_create },
{ &CLSID_VideoRendererDefault, VideoRendererDefault_create },
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 2104f80..8d4b6a3 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -59,7 +59,6 @@ HRESULT MPEGSplitter_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 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 QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl
index 44dc668..ab1af89 100644
--- a/dlls/quartz/quartz_strmif.idl
+++ b/dlls/quartz/quartz_strmif.idl
@@ -120,13 +120,6 @@ coclass DSoundRender { interface IBaseFilter; }
coclass AudioRender { interface IBaseFilter; }
[
- helpstring("Null Renderer"),
- threading(both),
- uuid(c1f400a4-3f08-11d3-9f0b-006008039e37)
-]
-coclass NullRenderer { interface IBaseFilter; }
-
-[
helpstring("Video Renderer"),
threading(both),
uuid(70e102b0-5556-11ce-97c0-00aa0055595a)
More information about the wine-cvs
mailing list