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

ole32: Add support for pasting CF_BITMAP.

This commit is contained in:
Vincent Povirk 2014-11-13 15:50:42 -06:00 committed by Alexandre Julliard
parent fa455f594b
commit bab4c36d47
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/ole32/clipboard.c
View File

@ -1133,6 +1133,8 @@ static DWORD get_tymed_from_nonole_cf(UINT cf)
return TYMED_ENHMF; return TYMED_ENHMF;
case CF_METAFILEPICT: case CF_METAFILEPICT:
return TYMED_MFPICT; return TYMED_MFPICT;
case CF_BITMAP:
return TYMED_GDI;
default: default:
FIXME("returning TYMED_NULL for cf %04x\n", cf); FIXME("returning TYMED_NULL for cf %04x\n", cf);
return TYMED_NULL; return TYMED_NULL;
@ -1310,6 +1312,27 @@ static HRESULT get_stgmed_for_emf(HENHMETAFILE hemf, STGMEDIUM *med)
return S_OK; return S_OK;
} }
/************************************************************************
* get_stgmed_for_bitmap
*
* Returns a stg medium with a bitmap based on the handle
*/
static HRESULT get_stgmed_for_bitmap(HBITMAP hbmp, STGMEDIUM *med)
{
HRESULT hr;
med->pUnkForRelease = NULL;
med->tymed = TYMED_NULL;
hr = dup_bitmap(hbmp, &med->u.hBitmap);
if (FAILED(hr))
return hr;
med->tymed = TYMED_GDI;
return S_OK;
}
static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2) static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2)
{ {
const WCHAR *str1, *str2; const WCHAR *str1, *str2;
@ -1401,6 +1424,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt,
hr = get_stgmed_for_stream(h, med); hr = get_stgmed_for_stream(h, med);
else if(mask & TYMED_ENHMF) else if(mask & TYMED_ENHMF)
hr = get_stgmed_for_emf((HENHMETAFILE)h, med); hr = get_stgmed_for_emf((HENHMETAFILE)h, med);
else if(mask & TYMED_GDI)
hr = get_stgmed_for_bitmap((HBITMAP)h, med);
else else
{ {
FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed); FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed);