ole32: Use generic class factory for pointer moniker.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
961c3dc454
commit
076c78220d
|
@ -35,7 +35,7 @@ HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk,
|
||||||
HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
||||||
HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
||||||
HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
||||||
HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
|
HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);
|
||||||
HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
|
HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
|
/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
|
||||||
|
|
|
@ -128,6 +128,17 @@ static const IClassFactoryVtbl ClassMonikerCFVtbl =
|
||||||
|
|
||||||
static IClassFactory ClassMonikerCF = { &ClassMonikerCFVtbl };
|
static IClassFactory ClassMonikerCF = { &ClassMonikerCFVtbl };
|
||||||
|
|
||||||
|
static const IClassFactoryVtbl PointerMonikerCFVtbl =
|
||||||
|
{
|
||||||
|
ClassFactory_QueryInterface,
|
||||||
|
ClassFactory_AddRef,
|
||||||
|
ClassFactory_Release,
|
||||||
|
PointerMoniker_CreateInstance,
|
||||||
|
ClassFactory_LockServer
|
||||||
|
};
|
||||||
|
|
||||||
|
static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl };
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DllGetClassObject [OLE32.@]
|
* DllGetClassObject [OLE32.@]
|
||||||
*/
|
*/
|
||||||
|
@ -155,7 +166,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
|
||||||
if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker))
|
if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker))
|
||||||
return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv);
|
return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv);
|
||||||
if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker))
|
if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker))
|
||||||
return PointerMonikerCF_Create(iid, ppv);
|
return IClassFactory_QueryInterface(&PointerMonikerCF, iid, ppv);
|
||||||
if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr))
|
if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr))
|
||||||
return ComCatCF_Create(iid, ppv);
|
return ComCatCF_Create(iid, ppv);
|
||||||
|
|
||||||
|
|
|
@ -588,31 +588,8 @@ HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk)
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI PointerMonikerCF_QueryInterface(LPCLASSFACTORY iface,
|
HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface,
|
||||||
REFIID riid, LPVOID *ppv)
|
IUnknown *pUnk, REFIID riid, void **ppv)
|
||||||
{
|
|
||||||
*ppv = NULL;
|
|
||||||
if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory))
|
|
||||||
{
|
|
||||||
*ppv = iface;
|
|
||||||
IClassFactory_AddRef(iface);
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
return E_NOINTERFACE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ULONG WINAPI PointerMonikerCF_AddRef(LPCLASSFACTORY iface)
|
|
||||||
{
|
|
||||||
return 2; /* non-heap based object */
|
|
||||||
}
|
|
||||||
|
|
||||||
static ULONG WINAPI PointerMonikerCF_Release(LPCLASSFACTORY iface)
|
|
||||||
{
|
|
||||||
return 1; /* non-heap based object */
|
|
||||||
}
|
|
||||||
|
|
||||||
static HRESULT WINAPI PointerMonikerCF_CreateInstance(LPCLASSFACTORY iface,
|
|
||||||
LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv)
|
|
||||||
{
|
{
|
||||||
IMoniker *pMoniker;
|
IMoniker *pMoniker;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
@ -635,24 +612,3 @@ static HRESULT WINAPI PointerMonikerCF_CreateInstance(LPCLASSFACTORY iface,
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI PointerMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock)
|
|
||||||
{
|
|
||||||
FIXME("(%d), stub!\n",fLock);
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const IClassFactoryVtbl PointerMonikerCFVtbl =
|
|
||||||
{
|
|
||||||
PointerMonikerCF_QueryInterface,
|
|
||||||
PointerMonikerCF_AddRef,
|
|
||||||
PointerMonikerCF_Release,
|
|
||||||
PointerMonikerCF_CreateInstance,
|
|
||||||
PointerMonikerCF_LockServer
|
|
||||||
};
|
|
||||||
static const IClassFactoryVtbl *PointerMonikerCF = &PointerMonikerCFVtbl;
|
|
||||||
|
|
||||||
HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv)
|
|
||||||
{
|
|
||||||
return IClassFactory_QueryInterface((IClassFactory *)&PointerMonikerCF, riid, ppv);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue