Michael Stefaniuc : dmsynth: Merge the IClassFactory implementations.
Alexandre Julliard
julliard at winehq.org
Fri Jul 29 12:37:01 CDT 2011
Module: wine
Branch: master
Commit: 4afd3e46fcbbccb8ee575f41fe4772b38d0270ae
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afd3e46fcbbccb8ee575f41fe4772b38d0270ae
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Jul 29 11:57:55 2011 +0200
dmsynth: Merge the IClassFactory implementations.
---
dlls/dmsynth/dmsynth_main.c | 133 ++++++++++++++++++-------------------------
1 files changed, 56 insertions(+), 77 deletions(-)
diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index 0915d50..87cc3c7 100644
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -31,107 +31,86 @@ static HINSTANCE instance;
LONG DMSYNTH_refCount = 0;
typedef struct {
- const IClassFactoryVtbl *lpVtbl;
+ IClassFactory IClassFactory_iface;
+ HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter);
} IClassFactoryImpl;
/******************************************************************
- * DirectMusicSynth ClassFactory
+ * IClassFactory implementation
*/
-static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
- FIXME("- no interface IID: %s\n", debugstr_guid(riid));
-
- if (ppobj == NULL) return E_POINTER;
-
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) {
- DMSYNTH_LockModule();
-
- return 2; /* non-heap based object */
-}
-
-static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) {
- DMSYNTH_UnlockModule();
-
- return 1; /* non-heap based object */
+static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
+{
+ return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
}
-static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
- TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj);
- return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter);
+static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
+{
+ if (ppv == NULL)
+ return E_POINTER;
+
+ if (IsEqualGUID(&IID_IUnknown, riid))
+ TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv);
+ else if (IsEqualGUID(&IID_IClassFactory, riid))
+ TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv);
+ else {
+ FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
+ *ppv = NULL;
+ return E_NOINTERFACE;
+ }
+
+ *ppv = iface;
+ IUnknown_AddRef((IUnknown*)*ppv);
+ return S_OK;
}
-static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
- TRACE("(%d)\n", dolock);
-
- if (dolock)
- DMSYNTH_LockModule();
- else
- DMSYNTH_UnlockModule();
+static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
+{
+ DMSYNTH_LockModule();
- return S_OK;
+ return 2; /* non-heap based object */
}
-static const IClassFactoryVtbl SynthCF_Vtbl = {
- SynthCF_QueryInterface,
- SynthCF_AddRef,
- SynthCF_Release,
- SynthCF_CreateInstance,
- SynthCF_LockServer
-};
-
-static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl};
-
-/******************************************************************
- * DirectMusicSynthSink ClassFactory
- */
-static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
- FIXME("- no interface IID: %s\n", debugstr_guid(riid));
+static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
+{
+ DMSYNTH_UnlockModule();
- if (ppobj == NULL) return E_POINTER;
-
- return E_NOINTERFACE;
+ return 1; /* non-heap based object */
}
-static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) {
- DMSYNTH_LockModule();
-
- return 2; /* non-heap based object */
-}
+static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter,
+ REFIID riid, void **ppv)
+{
+ IClassFactoryImpl *This = impl_from_IClassFactory(iface);
-static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) {
- DMSYNTH_UnlockModule();
+ TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv);
- return 1; /* non-heap based object */
+ return This->fnCreateInstance(riid, ppv, pUnkOuter);
}
-static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
- TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj);
- return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter);
-}
+static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock)
+{
+ TRACE("(%d)\n", dolock);
-static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
- TRACE("(%d)\n", dolock);
+ if (dolock)
+ DMSYNTH_LockModule();
+ else
+ DMSYNTH_UnlockModule();
- if (dolock)
- DMSYNTH_LockModule();
- else
- DMSYNTH_UnlockModule();
-
- return S_OK;
+ return S_OK;
}
-static const IClassFactoryVtbl SynthSinkCF_Vtbl = {
- SynthSinkCF_QueryInterface,
- SynthSinkCF_AddRef,
- SynthSinkCF_Release,
- SynthSinkCF_CreateInstance,
- SynthSinkCF_LockServer
+static const IClassFactoryVtbl classfactory_vtbl = {
+ ClassFactory_QueryInterface,
+ ClassFactory_AddRef,
+ ClassFactory_Release,
+ ClassFactory_CreateInstance,
+ ClassFactory_LockServer
};
-static IClassFactoryImpl SynthSink_CF = {&SynthSinkCF_Vtbl};
-
+static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicSynthImpl};
+static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl},
+ DMUSIC_CreateDirectMusicSynthSinkImpl};
+
/******************************************************************
* DllMain
*
More information about the wine-cvs
mailing list