Skip to content

W
wine-winehq
Commit fa4950c3 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

dplayx: Get rid of LPCLASSFACTORY and use a better name for the methods.

parent 2f425fb8
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 14 deletions
dlls/dplayx/dpclassfactory.c
View file @ fa4950c3
...@@ -52,8 +52,9 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) ...@@ -52,8 +52,9 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
} }
static HRESULT WINAPI static HRESULT WINAPI IClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid,
DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { void **ppobj)
{
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
...@@ -61,21 +62,22 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { ...@@ -61,21 +62,22 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI static ULONG WINAPI IClassFactoryImpl_AddRef(IClassFactory *iface)
DP_and_DPL_AddRef(LPCLASSFACTORY iface) { {
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { static ULONG WINAPI IClassFactoryImpl_Release(IClassFactory *iface)
{
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
/* static class (reference starts @ 1), won't ever be freed */ /* static class (reference starts @ 1), won't ever be freed */
return InterlockedDecrement(&This->ref); return InterlockedDecrement(&This->ref);
} }
static HRESULT WINAPI DP_and_DPL_CreateInstance( static HRESULT WINAPI IClassFactoryImpl_CreateInstance(IClassFactory *iface, IUnknown *pOuter,
LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj REFIID riid, void **ppobj)
) { {
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
...@@ -92,18 +94,19 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance( ...@@ -92,18 +94,19 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) { static HRESULT WINAPI IClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock)
{
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK; return S_OK;
} }
static const IClassFactoryVtbl DP_and_DPL_Vtbl = { static const IClassFactoryVtbl DP_and_DPL_Vtbl = {
DP_and_DPL_QueryInterface, IClassFactoryImpl_QueryInterface,
DP_and_DPL_AddRef, IClassFactoryImpl_AddRef,
DP_and_DPL_Release, IClassFactoryImpl_Release,
DP_and_DPL_CreateInstance, IClassFactoryImpl_CreateInstance,
DP_and_DPL_LockServer IClassFactoryImpl_LockServer
}; };
static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 }; static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment