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

ole32: In the data cache, fmtetc->cfFormat and fmtetc->tymed can be 0 which means to match any clipformat/tymed. 

Therefore, keep the clipformat of the data in the data_cf field.
Return an error from SetData if a non-zero clipformat hasn't been specified.
Write out stgmedium.tymed instead of fmtetc.tymed, which is guaranteed 
to be non-zero if data has been set.
This commit is contained in:
Rob Shearman 2006-12-02 18:16:53 +00:00 committed by Alexandre Julliard
parent d37b669503
commit ca81b825be
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/ole32/datacache.c
View File

@ -89,6 +89,8 @@ typedef struct DataCacheEntry
struct list entry; struct list entry;
/* format of this entry */ /* format of this entry */
FORMATETC fmtetc; FORMATETC fmtetc;
/* the clipboard format of the data */
CLIPFORMAT data_cf;
/* cached data */ /* cached data */
STGMEDIUM stgmedium; STGMEDIUM stgmedium;
/* /*
@ -538,6 +540,7 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *This)
GlobalUnlock(hmfpict); GlobalUnlock(hmfpict);
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
This->data_cf = This->fmtetc.cfFormat;
This->stgmedium.tymed = TYMED_MFPICT; This->stgmedium.tymed = TYMED_MFPICT;
This->stgmedium.u.hMetaFilePict = hmfpict; This->stgmedium.u.hMetaFilePict = hmfpict;
} }
@ -584,23 +587,23 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *This, IStorage *storage,
return hr; return hr;
/* custom clipformat */ /* custom clipformat */
if (This->fmtetc.cfFormat > 0xc000) if (This->data_cf >= 0xc000)
FIXME("custom clipboard format not serialized properly\n"); FIXME("custom clipboard format not serialized properly\n");
header.unknown1 = -1; header.unknown1 = -1;
header.clipformat = This->fmtetc.cfFormat; header.clipformat = This->data_cf;
if (This->fmtetc.ptd) if (This->fmtetc.ptd)
FIXME("ptd not serialized\n"); FIXME("ptd not serialized\n");
header.unknown3 = 4; header.unknown3 = 4;
header.dvAspect = This->fmtetc.dwAspect; header.dvAspect = This->fmtetc.dwAspect;
header.lindex = This->fmtetc.lindex; header.lindex = This->fmtetc.lindex;
header.tymed = This->fmtetc.tymed; header.tymed = This->stgmedium.tymed;
header.unknown7 = 0; header.unknown7 = 0;
header.dwObjectExtentX = 0; header.dwObjectExtentX = 0;
header.dwObjectExtentY = 0; header.dwObjectExtentY = 0;
header.dwSize = 0; header.dwSize = 0;
/* size the data */ /* size the data */
switch (This->fmtetc.cfFormat) switch (This->data_cf)
{ {
case CF_METAFILEPICT: case CF_METAFILEPICT:
{ {
@ -635,7 +638,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *This, IStorage *storage,
} }
/* get the data */ /* get the data */
switch (This->fmtetc.cfFormat) switch (This->data_cf)
{ {
case CF_METAFILEPICT: case CF_METAFILEPICT:
{ {
@ -704,17 +707,28 @@ static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm,
} }
static HRESULT DataCacheEntry_SetData(DataCacheEntry *This, static HRESULT DataCacheEntry_SetData(DataCacheEntry *This,
STGMEDIUM *stgmedium, BOOL fRelease) const FORMATETC *formatetc,
const STGMEDIUM *stgmedium,
BOOL fRelease)
{ {
if ((!This->fmtetc.cfFormat && !formatetc->cfFormat) ||
(This->fmtetc.tymed == TYMED_NULL && formatetc->tymed == TYMED_NULL) ||
stgmedium->tymed == TYMED_NULL)
{
WARN("invalid formatetc\n");
return DV_E_FORMATETC;
}
This->dirty = TRUE; This->dirty = TRUE;
ReleaseStgMedium(&This->stgmedium); ReleaseStgMedium(&This->stgmedium);
This->data_cf = This->fmtetc.cfFormat ? This->fmtetc.cfFormat : formatetc->cfFormat;
if (fRelease) if (fRelease)
{ {
This->stgmedium = *stgmedium; This->stgmedium = *stgmedium;
return S_OK; return S_OK;
} }
else else
return copy_stg_medium(This->fmtetc.cfFormat, return copy_stg_medium(This->data_cf,
&This->stgmedium, stgmedium); &This->stgmedium, stgmedium);
} }
@ -1568,7 +1582,7 @@ static HRESULT WINAPI DataCache_Draw(
if (cache_entry->stgmedium.tymed == TYMED_NULL) if (cache_entry->stgmedium.tymed == TYMED_NULL)
continue; continue;
switch (cache_entry->fmtetc.cfFormat) switch (cache_entry->data_cf)
{ {
case CF_METAFILEPICT: case CF_METAFILEPICT:
{ {
@ -1822,7 +1836,7 @@ static HRESULT WINAPI DataCache_GetExtent(
continue; continue;
switch (cache_entry->fmtetc.cfFormat) switch (cache_entry->data_cf)
{ {
case CF_METAFILEPICT: case CF_METAFILEPICT:
{ {
@ -1971,11 +1985,12 @@ static HRESULT WINAPI DataCache_IOleCache2_SetData(
HRESULT hr; HRESULT hr;
TRACE("(%p, %p, %s)\n", pformatetc, pmedium, fRelease ? "TRUE" : "FALSE"); TRACE("(%p, %p, %s)\n", pformatetc, pmedium, fRelease ? "TRUE" : "FALSE");
TRACE("formatetc = "); dump_FORMATETC(pformatetc); TRACE("\n");
cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc); cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc);
if (cache_entry) if (cache_entry)
{ {
hr = DataCacheEntry_SetData(cache_entry, pmedium, fRelease); hr = DataCacheEntry_SetData(cache_entry, pformatetc, pmedium, fRelease);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
DataCache_FireOnViewChange(This, cache_entry->fmtetc.dwAspect, DataCache_FireOnViewChange(This, cache_entry->fmtetc.dwAspect,
@ -1983,6 +1998,7 @@ static HRESULT WINAPI DataCache_IOleCache2_SetData(
return hr; return hr;
} }
WARN("cache entry not found\n");
return OLE_E_BLANK; return OLE_E_BLANK;
} }