ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Don't hold a reference on the parent IDataObject.

This commit is contained in:
Huw Davies 2009-03-26 16:25:37 +00:00 committed by Alexandre Julliard
parent 1213964330
commit 1cc023c53a
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/ole32/clipboard.c
View File

@ -159,13 +159,6 @@ typedef struct enum_fmtetc
UINT pos; /* current enumerator position */ UINT pos; /* current enumerator position */
UINT countFmt; /* number of EnumFORMATETC's in array */ UINT countFmt; /* number of EnumFORMATETC's in array */
LPFORMATETC pFmt; /* array of EnumFORMATETC's */ LPFORMATETC pFmt; /* array of EnumFORMATETC's */
/*
* IUnknown implementation of the parent data object.
*/
IUnknown* pUnkDataObj;
} enum_fmtetc; } enum_fmtetc;
static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface)
@ -207,20 +200,12 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface
/************************************************************************ /************************************************************************
* OLEClipbrd_IEnumFORMATETC_AddRef (IUnknown) * OLEClipbrd_IEnumFORMATETC_AddRef (IUnknown)
* *
* Since enumerating formats only makes sense when our data object is around,
* we insure that it stays as long as we stay by calling our parents IUnknown
* for AddRef and Release. But since we are not controlled by the lifetime of
* the outer object, we still keep our own reference count in order to
* free ourselves.
*/ */
static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface)
{ {
enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); enum_fmtetc *This = impl_from_IEnumFORMATETC(iface);
TRACE("(%p)->(count=%u)\n",This, This->ref); TRACE("(%p)->(count=%u)\n",This, This->ref);
if (This->pUnkDataObj)
IUnknown_AddRef(This->pUnkDataObj);
return InterlockedIncrement(&This->ref); return InterlockedIncrement(&This->ref);
} }
@ -236,9 +221,6 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface)
TRACE("(%p)->(count=%u)\n",This, This->ref); TRACE("(%p)->(count=%u)\n",This, This->ref);
if (This->pUnkDataObj)
IUnknown_Release(This->pUnkDataObj); /* Release parent data object */
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
if (!ref) if (!ref)
{ {
@ -321,8 +303,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface)
return S_OK; return S_OK;
} }
static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]);
LPUNKNOWN pUnkDataObj);
/************************************************************************ /************************************************************************
* OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC) * OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC)
@ -341,8 +322,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone
return E_INVALIDARG; return E_INVALIDARG;
*ppenum = OLEClipbrd_IEnumFORMATETC_Construct(This->countFmt, *ppenum = OLEClipbrd_IEnumFORMATETC_Construct(This->countFmt,
This->pFmt, This->pFmt);
This->pUnkDataObj);
/* FIXME: This is wrong! */ /* FIXME: This is wrong! */
if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum)))
@ -363,15 +343,14 @@ static const IEnumFORMATETCVtbl efvt =
}; };
/************************************************************************ /************************************************************************
* OLEClipbrd_IEnumFORMATETC_Construct (UINT, const FORMATETC, LPUNKNOWN) * OLEClipbrd_IEnumFORMATETC_Construct
* *
* Creates an IEnumFORMATETC enumerator from an array of FORMATETC * Creates an IEnumFORMATETC enumerator from an array of FORMATETC
* Structures. pUnkOuter is the outer unknown for reference counting only. * Structures.
* NOTE: this does not AddRef the interface. * NOTE: this does not AddRef the interface.
*/ */
static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[])
LPUNKNOWN pUnkDataObj)
{ {
enum_fmtetc* ef; enum_fmtetc* ef;
DWORD size=cfmt * sizeof(FORMATETC); DWORD size=cfmt * sizeof(FORMATETC);
@ -382,7 +361,6 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM
ef->ref = 0; ef->ref = 0;
ef->lpVtbl = &efvt; ef->lpVtbl = &efvt;
ef->pUnkDataObj = pUnkDataObj;
ef->pos = 0; ef->pos = 0;
ef->countFmt = cfmt; ef->countFmt = cfmt;
@ -1068,7 +1046,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc(
* Create an EnumFORMATETC enumerator and return an * Create an EnumFORMATETC enumerator and return an
* EnumFORMATETC after bumping up its ref count * EnumFORMATETC after bumping up its ref count
*/ */
*ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt, (LPUNKNOWN)iface); *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt );
if (!(*ppenumFormatEtc)) if (!(*ppenumFormatEtc))
HANDLE_ERROR( E_OUTOFMEMORY ); HANDLE_ERROR( E_OUTOFMEMORY );