From 8a4f71c61e4c3e9668245f2e39be5b24065f1a80 Mon Sep 17 00:00:00 2001 From: Robert Shearman Date: Mon, 8 May 2006 15:55:14 +0100 Subject: [PATCH] ole32: Add an implementation of class monikers. --- dlls/ole32/Makefile.in | 1 + dlls/ole32/classmoniker.c | 771 +++++++++++++++++++++++++++++++++++++ dlls/ole32/moniker.c | 11 - dlls/ole32/moniker.h | 2 + dlls/ole32/oleproxy.c | 2 + dlls/ole32/tests/moniker.c | 5 +- 6 files changed, 780 insertions(+), 12 deletions(-) create mode 100644 dlls/ole32/classmoniker.c diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 16a602ed7b5..7ca77f9a17a 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -11,6 +11,7 @@ EXTRALIBS = -luuid $(LIBUNICODE) C_SRCS = \ antimoniker.c \ bindctx.c \ + classmoniker.c \ clipboard.c \ compobj.c \ compositemoniker.c \ diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c new file mode 100644 index 00000000000..74a0952d150 --- /dev/null +++ b/dlls/ole32/classmoniker.c @@ -0,0 +1,771 @@ +/*************************************************************************************** + * Class Monikers + * + * Copyright 1999 Noomen Hamza + * Copyright 2005 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ***************************************************************************************/ + +#include +#include +#include + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" +#include "wine/debug.h" +#include "ole2.h" +#include "wine/unicode.h" +#include "moniker.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +const GUID CLSID_ClassMoniker = { + 0x31A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} +}; + +#define CHARS_IN_GUID 39 + +/* ClassMoniker data structure */ +typedef struct ClassMoniker +{ + const IMonikerVtbl* lpVtbl; /* VTable relative to the IMoniker interface.*/ + const IROTDataVtbl* lpVtblRotData; /* VTable relative to the IROTData interface.*/ + LONG ref; /* reference counter for this object */ + CLSID clsid; /* clsid identified by this moniker */ + IUnknown *pMarshal; /* custom marshaler */ +} ClassMoniker; + +static inline IMoniker *impl_from_IROTData( IROTData *iface ) +{ + return (IMoniker *)((char*)iface - FIELD_OFFSET(ClassMoniker, lpVtblRotData)); +} + +/******************************************************************************* + * ClassMoniker_QueryInterface + *******************************************************************************/ +static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +{ + ClassMoniker *This = (ClassMoniker *)iface; + + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + + /* Perform a sanity check on the parameters.*/ + if (!ppvObject) + return E_POINTER; + + /* Initialize the return parameter */ + *ppvObject = 0; + + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + { + *ppvObject = iface; + } + else if (IsEqualIID(&IID_IROTData, riid)) + *ppvObject = (IROTData*)&(This->lpVtblRotData); + else if (IsEqualIID(&IID_IMarshal, riid)) + { + HRESULT hr = S_OK; + if (!This->pMarshal) + hr = MonikerMarshal_Create(iface, &This->pMarshal); + if (hr != S_OK) + return hr; + return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); + } + + /* Check that we obtained an interface.*/ + if (!*ppvObject) + return E_NOINTERFACE; + + /* Query Interface always increases the reference count by one when it is successful */ + IMoniker_AddRef(iface); + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_AddRef + ******************************************************************************/ +static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface) +{ + ClassMoniker *This = (ClassMoniker *)iface; + + TRACE("(%p)\n",This); + + return InterlockedIncrement(&This->ref); +} + +/****************************************************************************** + * ClassMoniker_Destroy (local function) + *******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Destroy(ClassMoniker* This) +{ + TRACE("(%p)\n",This); + + if (This->pMarshal) IUnknown_Release(This->pMarshal); + + HeapFree(GetProcessHeap(),0,This); + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_Release + ******************************************************************************/ +static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) +{ + ClassMoniker *This = (ClassMoniker *)iface; + ULONG ref; + + TRACE("(%p)\n",This); + + ref = InterlockedDecrement(&This->ref); + + /* destroy the object if there's no more reference on it */ + if (ref == 0) ClassMoniker_Destroy(This); + + return ref; +} + +/****************************************************************************** + * ClassMoniker_GetClassID + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_GetClassID(IMoniker* iface,CLSID *pClassID) +{ + TRACE("(%p,%p),stub!\n",iface,pClassID); + + if (pClassID==NULL) + return E_POINTER; + + *pClassID = CLSID_ClassMoniker; + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_IsDirty + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_IsDirty(IMoniker* iface) +{ + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty + method in the OLE-provided moniker interfaces always return S_FALSE because + their internal state never changes. */ + + TRACE("(%p)\n",iface); + + return S_FALSE; +} + +/****************************************************************************** + * ClassMoniker_Load + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Load(IMoniker* iface,IStream* pStm) +{ + ClassMoniker *This = (ClassMoniker *)iface; + HRESULT hr; + DWORD zero; + + TRACE("(%p)\n", pStm); + + hr = IStream_Read(pStm, &This->clsid, sizeof(This->clsid), NULL); + if (hr != S_OK) return STG_E_READFAULT; + + hr = IStream_Read(pStm, &zero, sizeof(zero), NULL); + if ((hr != S_OK) || (zero != 0)) return STG_E_READFAULT; + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_Save + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Save(IMoniker* iface, + IStream* pStm,/* pointer to the stream where the object is to be saved */ + BOOL fClearDirty)/* Specifies whether to clear the dirty flag */ +{ + ClassMoniker *This = (ClassMoniker *)iface; + HRESULT hr; + DWORD zero = 0; + + TRACE("(%p, %s)\n", pStm, fClearDirty ? "TRUE" : "FALSE"); + + hr = IStream_Write(pStm, &This->clsid, sizeof(This->clsid), NULL); + if (FAILED(hr)) return hr; + + hr = IStream_Write(pStm, &zero, sizeof(zero), NULL); + + return hr; +} + +/****************************************************************************** + * ClassMoniker_GetSizeMax + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_GetSizeMax(IMoniker* iface, + ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ +{ + TRACE("(%p)\n", pcbSize); + + pcbSize->QuadPart = sizeof(CLSID) + sizeof(DWORD); + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_BindToObject + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + REFIID riid, + VOID** ppvResult) +{ + FIXME("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); + return E_NOTIMPL; +} + +/****************************************************************************** + * ClassMoniker_BindToStorage + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + REFIID riid, + VOID** ppvResult) +{ + FIXME("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); + return E_NOTIMPL; +} + +/****************************************************************************** + * ClassMoniker_Reduce + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface, + IBindCtx* pbc, + DWORD dwReduceHowFar, + IMoniker** ppmkToLeft, + IMoniker** ppmkReduced) +{ + TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + + if (!ppmkReduced) + return E_POINTER; + + ClassMoniker_AddRef(iface); + + *ppmkReduced = iface; + + return MK_S_REDUCED_TO_SELF; +} +/****************************************************************************** + * ClassMoniker_ComposeWith + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_ComposeWith(IMoniker* iface, + IMoniker* pmkRight, + BOOL fOnlyIfNotGeneric, + IMoniker** ppmkComposite) +{ + HRESULT res=S_OK; + DWORD mkSys,mkSys2; + IEnumMoniker* penumMk=0; + IMoniker *pmostLeftMk=0; + IMoniker* tempMkComposite=0; + + TRACE("(%p,%d,%p)\n", pmkRight, fOnlyIfNotGeneric, ppmkComposite); + + if ((ppmkComposite==NULL)||(pmkRight==NULL)) + return E_POINTER; + + *ppmkComposite=0; + + IMoniker_IsSystemMoniker(pmkRight,&mkSys); + + /* If pmkRight is an anti-moniker, the returned moniker is NULL */ + if(mkSys==MKSYS_ANTIMONIKER) + return res; + + else + /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ + /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ + + if(mkSys==MKSYS_GENERICCOMPOSITE){ + + res=IMoniker_Enum(pmkRight,TRUE,&penumMk); + + if (FAILED(res)) + return res; + + res=IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL); + + IMoniker_IsSystemMoniker(pmostLeftMk,&mkSys2); + + if(mkSys2==MKSYS_ANTIMONIKER){ + + IMoniker_Release(pmostLeftMk); + + tempMkComposite=iface; + IMoniker_AddRef(iface); + + while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){ + + res=CreateGenericComposite(tempMkComposite,pmostLeftMk,ppmkComposite); + + IMoniker_Release(tempMkComposite); + IMoniker_Release(pmostLeftMk); + + tempMkComposite=*ppmkComposite; + IMoniker_AddRef(tempMkComposite); + } + return res; + } + else + return CreateGenericComposite(iface,pmkRight,ppmkComposite); + } + /* If pmkRight is not an anti-moniker, the method combines the two monikers into a generic + composite if fOnlyIfNotGeneric is FALSE; if fOnlyIfNotGeneric is TRUE, the method returns + a NULL moniker and a return value of MK_E_NEEDGENERIC */ + else + if (!fOnlyIfNotGeneric) + return CreateGenericComposite(iface,pmkRight,ppmkComposite); + + else + return MK_E_NEEDGENERIC; +} + +/****************************************************************************** + * ClassMoniker_Enum + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +{ + TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); + + if (ppenumMoniker == NULL) + return E_POINTER; + + *ppenumMoniker = NULL; + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_IsEqual + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +{ + + CLSID clsid; + LPOLESTR dispName1,dispName2; + IBindCtx* bind; + HRESULT res = S_FALSE; + + TRACE("(%p,%p)\n",iface,pmkOtherMoniker); + + if (!pmkOtherMoniker) return S_FALSE; + + + /* check if both are ClassMoniker */ + if(FAILED (IMoniker_GetClassID(pmkOtherMoniker,&clsid))) return S_FALSE; + if(!IsEqualCLSID(&clsid,&CLSID_ClassMoniker)) return S_FALSE; + + /* check if both displaynames are the same */ + if(SUCCEEDED ((res = CreateBindCtx(0,&bind)))) { + if(SUCCEEDED (IMoniker_GetDisplayName(iface,bind,NULL,&dispName1))) { + if(SUCCEEDED (IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2))) { + if(lstrcmpW(dispName1,dispName2)==0) res = S_OK; + CoTaskMemFree(dispName2); + } + CoTaskMemFree(dispName1); + } + } + return res; +} + +/****************************************************************************** + * ClassMoniker_Hash + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Hash(IMoniker* iface,DWORD* pdwHash) +{ + ClassMoniker *This = (ClassMoniker *)iface; + + TRACE("(%p)\n", pdwHash); + + *pdwHash = This->clsid.Data1; + + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_IsRunning + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_IsRunning(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + IMoniker* pmkNewlyRunning) +{ + FIXME("(%p, %p, %p)\n", pbc, pmkToLeft, pmkNewlyRunning); + + return E_NOTIMPL; +} + +/****************************************************************************** + * ClassMoniker_GetTimeOfLastChange + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_GetTimeOfLastChange(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + FILETIME* pItemTime) +{ + FIXME("(%p, %p, %p)\n", pbc, pmkToLeft, pItemTime); + return E_NOTIMPL; +} + +/****************************************************************************** + * ClassMoniker_Inverse + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_Inverse(IMoniker* iface,IMoniker** ppmk) +{ + TRACE("(%p)\n",ppmk); + + if (!ppmk) + return E_POINTER; + + return CreateAntiMoniker(ppmk); +} + +/****************************************************************************** + * ClassMoniker_CommonPrefixWith + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +{ + DWORD mkSys; + + TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + + IMoniker_IsSystemMoniker(pmkOther, &mkSys); + + /* If the other moniker is an class moniker that is equal to this moniker, this method sets *ppmkPrefix */ + /* to this moniker and returns MK_S_US */ + + if((mkSys == MKSYS_CLASSMONIKER) && (IMoniker_IsEqual(iface, pmkOther) == S_OK) ){ + + *ppmkPrefix = iface; + + IMoniker_AddRef(iface); + + return MK_S_US; + } + else + /* otherwise, the method calls the MonikerCommonPrefixWith function. This function correctly handles */ + /* the case where the other moniker is a generic composite. */ + return MonikerCommonPrefixWith(iface, pmkOther, ppmkPrefix); +} + +/****************************************************************************** + * ClassMoniker_RelativePathTo + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) +{ + TRACE("(%p, %p)\n",pmOther,ppmkRelPath); + + if (!ppmkRelPath) + return E_POINTER; + + *ppmkRelPath = NULL; + + return MK_E_NOTBINDABLE; +} + +/****************************************************************************** + * ClassMoniker_GetDisplayName + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + LPOLESTR *ppszDisplayName) +{ + ClassMoniker *This = (ClassMoniker *)iface; + static const WCHAR wszClsidPrefix[] = {'c','l','s','i','d',':',0}; + + TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName); + + if (!ppszDisplayName) + return E_POINTER; + + if (pmkToLeft) + return E_INVALIDARG; + + *ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); + + StringFromGUID2(&This->clsid, *ppszDisplayName+sizeof(wszClsidPrefix)/sizeof(WCHAR)-2, CHARS_IN_GUID); + + /* note: this overwrites the opening curly bracket of the CLSID string generated above */ + memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR)); + + /* note: this overwrites the closing curly bracket of the CLSID string generated above */ + (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-2] = ':'; + (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-1] = '\0'; + + TRACE("string is %s\n", debugstr_w(*ppszDisplayName)); + return S_OK; +} + +/****************************************************************************** + * ClassMoniker_ParseDisplayName + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_ParseDisplayName(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + LPOLESTR pszDisplayName, + ULONG* pchEaten, + IMoniker** ppmkOut) +{ + FIXME("(%p, %p, %s, %p, %p)\n", pbc, pmkToLeft, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + return E_NOTIMPL; +} + +/****************************************************************************** + * ClassMoniker_IsSystemMoniker + ******************************************************************************/ +static HRESULT WINAPI ClassMoniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) +{ + TRACE("(%p,%p)\n",iface,pwdMksys); + + if (!pwdMksys) + return E_POINTER; + + *pwdMksys = MKSYS_CLASSMONIKER; + + return S_OK; +} + +/******************************************************************************* + * ClassMonikerIROTData_QueryInterface + *******************************************************************************/ +static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) +{ + + IMoniker *This = impl_from_IROTData(iface); + + TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + + return ClassMoniker_QueryInterface(This, riid, ppvObject); +} + +/*********************************************************************** + * ClassMonikerIROTData_AddRef + */ +static ULONG WINAPI ClassMonikerROTData_AddRef(IROTData *iface) +{ + IMoniker *This = impl_from_IROTData(iface); + + TRACE("(%p)\n",iface); + + return ClassMoniker_AddRef(This); +} + +/*********************************************************************** + * ClassMonikerIROTData_Release + */ +static ULONG WINAPI ClassMonikerROTData_Release(IROTData* iface) +{ + IMoniker *This = impl_from_IROTData(iface); + + TRACE("(%p)\n",iface); + + return ClassMoniker_Release(This); +} + +/****************************************************************************** + * ClassMonikerIROTData_GetComparaisonData + ******************************************************************************/ +static HRESULT WINAPI ClassMonikerROTData_GetComparaisonData(IROTData* iface, + BYTE* pbData, + ULONG cbMax, + ULONG* pcbData) +{ + ClassMoniker *This = (ClassMoniker *)impl_from_IROTData(iface); + + TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData); + + *pcbData = 2*sizeof(CLSID); + if (cbMax < *pcbData) + return E_OUTOFMEMORY; + + /* write CLSID of the moniker */ + memcpy(pbData, &CLSID_ClassMoniker, sizeof(CLSID)); + /* write CLSID the moniker represents */ + memcpy(pbData+sizeof(CLSID), &This->clsid, sizeof(CLSID)); + + return S_OK; +} + +/********************************************************************************/ +/* Virtual function table for the ClassMoniker class which include IPersist,*/ +/* IPersistStream and IMoniker functions. */ +static const IMonikerVtbl ClassMonikerVtbl = +{ + ClassMoniker_QueryInterface, + ClassMoniker_AddRef, + ClassMoniker_Release, + ClassMoniker_GetClassID, + ClassMoniker_IsDirty, + ClassMoniker_Load, + ClassMoniker_Save, + ClassMoniker_GetSizeMax, + ClassMoniker_BindToObject, + ClassMoniker_BindToStorage, + ClassMoniker_Reduce, + ClassMoniker_ComposeWith, + ClassMoniker_Enum, + ClassMoniker_IsEqual, + ClassMoniker_Hash, + ClassMoniker_IsRunning, + ClassMoniker_GetTimeOfLastChange, + ClassMoniker_Inverse, + ClassMoniker_CommonPrefixWith, + ClassMoniker_RelativePathTo, + ClassMoniker_GetDisplayName, + ClassMoniker_ParseDisplayName, + ClassMoniker_IsSystemMoniker +}; + +/********************************************************************************/ +/* Virtual function table for the IROTData class. */ +static const IROTDataVtbl ROTDataVtbl = +{ + ClassMonikerROTData_QueryInterface, + ClassMonikerROTData_AddRef, + ClassMonikerROTData_Release, + ClassMonikerROTData_GetComparaisonData +}; + +/****************************************************************************** + * ClassMoniker_Construct (local function) + *******************************************************************************/ +HRESULT WINAPI ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) +{ + TRACE("(%p,%s)\n",This,debugstr_guid(rclsid)); + + /* Initialize the virtual function table. */ + This->lpVtbl = &ClassMonikerVtbl; + This->lpVtblRotData = &ROTDataVtbl; + This->ref = 0; + This->clsid = *rclsid; + This->pMarshal = NULL; + + return S_OK; +} + +/****************************************************************************** + * CreateClassMoniker [OLE32.@] + ******************************************************************************/ +HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker **ppmk) +{ + ClassMoniker* newClassMoniker; + HRESULT hr; + + TRACE("(%s,%p)\n", debugstr_guid(rclsid), ppmk); + + newClassMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassMoniker)); + + if (!newClassMoniker) + return STG_E_INSUFFICIENTMEMORY; + + hr = ClassMoniker_Construct(newClassMoniker, rclsid); + + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, newClassMoniker); + return hr; + } + + return ClassMoniker_QueryInterface((IMoniker *)newClassMoniker, &IID_IMoniker, (void**)ppmk); +} + +static HRESULT WINAPI ClassMonikerCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassMonikerCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI ClassMonikerCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI ClassMonikerCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + IMoniker *pmk; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CreateClassMoniker(&CLSID_NULL, &pmk); + if (FAILED(hr)) return hr; + + hr = IMoniker_QueryInterface(pmk, riid, ppv); + IMoniker_Release(pmk); + + return hr; +} + +static HRESULT WINAPI ClassMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl ClassMonikerCFVtbl = +{ + ClassMonikerCF_QueryInterface, + ClassMonikerCF_AddRef, + ClassMonikerCF_Release, + ClassMonikerCF_CreateInstance, + ClassMonikerCF_LockServer +}; +static const IClassFactoryVtbl *ClassMonikerCF = &ClassMonikerCFVtbl; + +HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&ClassMonikerCF, riid, ppv); +} diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index a7425f13002..a2837d7fd99 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -694,17 +694,6 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName, return MK_E_SYNTAX; } -/****************************************************************************** - * CreateClassMoniker [OLE32.@] - */ -HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker ** ppmk) -{ - FIXME("%s\n", debugstr_guid( rclsid )); - if( ppmk ) - *ppmk = NULL; - return E_NOTIMPL; -} - /* Virtual function table for the IRunningObjectTable class. */ static const IRunningObjectTableVtbl VT_RunningObjectTableImpl = { diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index d35f87b85d5..e0515413261 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -5,11 +5,13 @@ extern const CLSID CLSID_FileMoniker; extern const CLSID CLSID_ItemMoniker; extern const CLSID CLSID_AntiMoniker; extern const CLSID CLSID_CompositeMoniker; +extern const CLSID CLSID_ClassMoniker; HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv); +HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer); diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 8dc4ffb4842..98df7d818d1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -1018,6 +1018,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return AntiMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker)) return CompositeMonikerCF_Create(iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) + return ClassMonikerCF_Create(iid, ppv); FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index bb22b74147e..14dcda39777 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -488,7 +488,7 @@ static void test_class_moniker(void) FILETIME filetime; hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); - todo_wine ok_ole_success(hr, CreateClassMoniker); + ok_ole_success(hr, CreateClassMoniker); if (!moniker) return; test_moniker("class moniker", moniker, @@ -523,13 +523,16 @@ static void test_class_moniker(void) ok(hr == E_NOTIMPL, "IMoniker_IsRunning should return E_NOTIMPL, not 0x%08lx\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + todo_wine ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08lx\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown);