ddraw: Get rid of IClassFactoryImpl.
This commit is contained in:
parent
3e2d946290
commit
9fd2d34d68
|
@ -511,21 +511,17 @@ static const struct object_creation_info object_creation[] =
|
||||||
{ &CLSID_DirectDrawClipper, CF_CreateDirectDrawClipper }
|
{ &CLSID_DirectDrawClipper, CF_CreateDirectDrawClipper }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct ddraw_class_factory
|
||||||
/******************************************************************************
|
|
||||||
* DirectDraw ClassFactory implementation
|
|
||||||
******************************************************************************/
|
|
||||||
typedef struct
|
|
||||||
{
|
{
|
||||||
IClassFactory IClassFactory_iface;
|
IClassFactory IClassFactory_iface;
|
||||||
|
|
||||||
LONG ref;
|
LONG ref;
|
||||||
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj);
|
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj);
|
||||||
} IClassFactoryImpl;
|
};
|
||||||
|
|
||||||
static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
|
static inline struct ddraw_class_factory *impl_from_IClassFactory(IClassFactory *iface)
|
||||||
{
|
{
|
||||||
return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
|
return CONTAINING_RECORD(iface, struct ddraw_class_factory, IClassFactory_iface);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
@ -542,16 +538,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
|
||||||
* Failure: E_NOINTERFACE
|
* Failure: E_NOINTERFACE
|
||||||
*
|
*
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid,
|
static HRESULT WINAPI ddraw_class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **out)
|
||||||
void **obj)
|
|
||||||
{
|
{
|
||||||
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
|
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
|
||||||
|
|
||||||
if (IsEqualGUID(riid, &IID_IUnknown)
|
if (IsEqualGUID(riid, &IID_IUnknown)
|
||||||
|| IsEqualGUID(riid, &IID_IClassFactory))
|
|| IsEqualGUID(riid, &IID_IClassFactory))
|
||||||
{
|
{
|
||||||
IClassFactory_AddRef(iface);
|
IClassFactory_AddRef(iface);
|
||||||
*obj = iface;
|
*out = iface;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -569,12 +564,12 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *
|
||||||
* The new refcount
|
* The new refcount
|
||||||
*
|
*
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface)
|
static ULONG WINAPI ddraw_class_factory_AddRef(IClassFactory *iface)
|
||||||
{
|
{
|
||||||
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
struct ddraw_class_factory *factory = impl_from_IClassFactory(iface);
|
||||||
ULONG ref = InterlockedIncrement(&This->ref);
|
ULONG ref = InterlockedIncrement(&factory->ref);
|
||||||
|
|
||||||
TRACE("%p increasing refcount to %u.\n", This, ref);
|
TRACE("%p increasing refcount to %u.\n", factory, ref);
|
||||||
|
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
@ -589,15 +584,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface)
|
||||||
* The new refcount
|
* The new refcount
|
||||||
*
|
*
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
|
static ULONG WINAPI ddraw_class_factory_Release(IClassFactory *iface)
|
||||||
{
|
{
|
||||||
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
struct ddraw_class_factory *factory = impl_from_IClassFactory(iface);
|
||||||
ULONG ref = InterlockedDecrement(&This->ref);
|
ULONG ref = InterlockedDecrement(&factory->ref);
|
||||||
|
|
||||||
TRACE("%p decreasing refcount to %u.\n", This, ref);
|
TRACE("%p decreasing refcount to %u.\n", factory, ref);
|
||||||
|
|
||||||
if (ref == 0)
|
if (!ref)
|
||||||
HeapFree(GetProcessHeap(), 0, This);
|
HeapFree(GetProcessHeap(), 0, factory);
|
||||||
|
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
@ -615,15 +610,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
|
||||||
* ???
|
* ???
|
||||||
*
|
*
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface,
|
static HRESULT WINAPI ddraw_class_factory_CreateInstance(IClassFactory *iface,
|
||||||
IUnknown *UnkOuter, REFIID riid, void **obj)
|
IUnknown *outer_unknown, REFIID riid, void **out)
|
||||||
{
|
{
|
||||||
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
struct ddraw_class_factory *factory = impl_from_IClassFactory(iface);
|
||||||
|
|
||||||
TRACE("iface %p, outer_unknown %p, riid %s, object %p.\n",
|
TRACE("iface %p, outer_unknown %p, riid %s, out %p.\n",
|
||||||
iface, UnkOuter, debugstr_guid(riid), obj);
|
iface, outer_unknown, debugstr_guid(riid), out);
|
||||||
|
|
||||||
return This->pfnCreateInstance(UnkOuter, riid, obj);
|
return factory->pfnCreateInstance(outer_unknown, riid, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
@ -638,7 +633,7 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *
|
||||||
* S_OK, because it's a stub
|
* S_OK, because it's a stub
|
||||||
*
|
*
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock)
|
static HRESULT WINAPI ddraw_class_factory_LockServer(IClassFactory *iface, BOOL dolock)
|
||||||
{
|
{
|
||||||
FIXME("iface %p, dolock %#x stub!\n", iface, dolock);
|
FIXME("iface %p, dolock %#x stub!\n", iface, dolock);
|
||||||
|
|
||||||
|
@ -650,11 +645,11 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *ifac
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
static const IClassFactoryVtbl IClassFactory_Vtbl =
|
static const IClassFactoryVtbl IClassFactory_Vtbl =
|
||||||
{
|
{
|
||||||
IDirectDrawClassFactoryImpl_QueryInterface,
|
ddraw_class_factory_QueryInterface,
|
||||||
IDirectDrawClassFactoryImpl_AddRef,
|
ddraw_class_factory_AddRef,
|
||||||
IDirectDrawClassFactoryImpl_Release,
|
ddraw_class_factory_Release,
|
||||||
IDirectDrawClassFactoryImpl_CreateInstance,
|
ddraw_class_factory_CreateInstance,
|
||||||
IDirectDrawClassFactoryImpl_LockServer
|
ddraw_class_factory_LockServer
|
||||||
};
|
};
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
@ -676,8 +671,8 @@ static const IClassFactoryVtbl IClassFactory_Vtbl =
|
||||||
*/
|
*/
|
||||||
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
||||||
{
|
{
|
||||||
|
struct ddraw_class_factory *factory;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
IClassFactoryImpl *factory;
|
|
||||||
|
|
||||||
TRACE("rclsid %s, riid %s, object %p.\n",
|
TRACE("rclsid %s, riid %s, object %p.\n",
|
||||||
debugstr_guid(rclsid), debugstr_guid(riid), ppv);
|
debugstr_guid(rclsid), debugstr_guid(riid), ppv);
|
||||||
|
|
Loading…
Reference in New Issue