Alexandre Julliard : quartz: Convert coclasses registration to the IRegistrar mechanism.
Module: wine Branch: master Commit: ae2a992d703d93826de105f2484f388d0a37f49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2a992d703d93826de105f248... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 13:18:21 2010 +0100 quartz: Convert coclasses registration to the IRegistrar mechanism. --- dlls/quartz/Makefile.in | 3 +- dlls/quartz/quartz_strmif.idl | 128 ++++++++++++++++++++++++++++++++++++++++- dlls/quartz/regsvr.c | 111 ----------------------------------- 3 files changed, 128 insertions(+), 114 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 0798cdb..9a4e511 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,7 +1,7 @@ MODULE = quartz.dll IMPORTLIB = quartz IMPORTS = strmiids strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 -EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL +EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL C_SRCS = \ acmwrapper.c \ @@ -30,6 +30,7 @@ C_SRCS = \ RC_SRCS = version.rc IDL_P_SRCS = quartz_strmif.idl +IDL_R_SRCS = quartz_strmif.idl EXTRA_OBJS = dlldata.o diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl index aad6232..ede51f6 100644 --- a/dlls/quartz/quartz_strmif.idl +++ b/dlls/quartz/quartz_strmif.idl @@ -16,7 +16,131 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* just a wrapper for strmif.idl */ - cpp_quote("#include <wingdi.h>") #include "strmif.idl" + +[ + helpstring("Filter Graph"), + threading(both), + uuid(e436ebb3-524f-11ce-9f53-0020af0ba770) +] +coclass FilterGraph { interface IFilterGraph2; } + +[ + helpstring("Filter Graph no thread"), + threading(both), + uuid(e436ebb8-524f-11ce-9f53-0020af0ba770) +] +coclass FilterGraphNoThread { interface IFilterGraph2; } + +[ + helpstring("Filter Mapper"), + threading(both), + uuid(e436ebb2-524f-11ce-9f53-0020af0ba770) +] +coclass FilterMapper { interface IFilterMapper; } + +[ + helpstring("Filter Mapper2"), + threading(both), + uuid(cda42200-bd88-11d0-bd4e-00a0c911ce86) +] +coclass FilterMapper2 { interface IFilterMapper3; } + +[ + helpstring("System Clock"), + threading(both), + uuid(e436ebb1-524f-11ce-9f53-0020af0ba770) +] +coclass SystemClock { interface IReferenceClock; } + +[ + helpstring("Memory Allocator"), + threading(both), + uuid(1e651cc0-b199-11d0-8212-00c04fc32c45) +] +coclass MemoryAllocator { interface IMemAllocator; } + +[ + helpstring("Seeking"), + threading(both), + uuid(060af76c-68dd-11d0-8fc1-00c04fd9189d) +] +coclass SeekingPassThru { interface ISeekingPassThru; } + +[ + helpstring("File Source Filter"), + threading(both), + uuid(e436ebb5-524f-11ce-9f53-0020af0ba770) +] +coclass AsyncReader { interface IBaseFilter; } + +[ + helpstring("AVI Splitter"), + threading(both), + uuid(1b544c20-fd0b-11ce-8c63-00aa0044b51e) +] +coclass AviSplitter { interface IBaseFilter; } + +[ + helpstring("MPEG-I Stream Splitter"), + threading(both), + uuid(336475d0-942a-11ce-a870-00aa002feab5) +] +coclass MPEG1Splitter { interface IBaseFilter; } + +[ + helpstring("AVI Decompressor"), + threading(both), + uuid(cf49d4e0-1115-11ce-b03a-0020af0ba770) +] +coclass AVIDec { interface IBaseFilter; } + +[ + helpstring("DirectSound Audio Renderer"), + threading(both), + uuid(79376820-07d0-11cf-a24d-0020afd79767) +] +coclass DSoundRender { interface IBaseFilter; } + +[ + helpstring("Wave Audio Renderer"), + threading(both), + uuid(e30629d1-27e5-11ce-875d-00608cb78066) +] +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) +] +coclass VideoRenderer { interface IBaseFilter; } + +[ + helpstring("Default Video Renderer"), + threading(both), + uuid(6bc1cffa-8fc1-4261-ac22-cfb4cc38db50) +] +coclass VideoRendererDefault { interface IBaseFilter; } + +[ + helpstring("ACM wrapper"), + threading(both), + uuid(6a08cf80-0e18-11cf-a24d-0020afd79767) +] +coclass ACMWrapper { interface IBaseFilter; } + +[ + helpstring("Wave Parser"), + threading(both), + uuid(d51bd5a1-7548-11cf-a520-0080c77ef58a) +] +coclass WAVEParser { interface IBaseFilter; } diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index cdb33d1..d41e2f5 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -778,121 +778,10 @@ error_close_progid_key: return res; } -static GUID const CLSID_PSFactoryBuffer = { - 0x92a3a302, 0xda7c, 0x4a1f, {0xba,0x7e,0x18,0x02,0xbb,0x5d,0x2d,0x02} }; - /*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = { - { &CLSID_FilterGraph, - "Filter Graph", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_FilterGraphNoThread, - "Filter Graph", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_FilterMapper, - "Filter Mapper", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_FilterMapper2, - "Filter Mapper2", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_SystemClock, - "System Clock", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_MemoryAllocator, - "Memory Allocator", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_SeekingPassThru, - "Seeking", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AsyncReader, - "File Source Filter", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AviSplitter, - "AVI Splitter", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_MPEG1Splitter, - "MPEG-I Stream Splitter", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AVIDec, - "AVI Decompressor", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_DSoundRender, - "DirectSound Audio Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AudioRender, - "Wave Audio Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_NullRenderer, - "Null Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_VideoRenderer, - "Video Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_VideoRendererDefault, - "Default Video Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_ACMWrapper, - "ACM wrapper", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_WAVEParser, - "Wave Parser", - NULL, - "quartz.dll", - "Both" - }, { NULL } /* list terminator */ };
participants (1)
-
Alexandre Julliard