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

comctl32: Implement Copy, Merge and Clone methods in IImageList.

This commit is contained in:
Owen Rudge 2009-11-13 11:14:38 -06:00 committed by Alexandre Julliard
parent b37009ee80
commit 76c7f28050
1 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
dlls/comctl32/imagelist.c
View File

@ -3102,23 +3102,70 @@ static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList *iface, int i,
static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst,
IUnknown *punkSrc, int iSrc, UINT uFlags) IUnknown *punkSrc, int iSrc, UINT uFlags)
{ {
FIXME("STUB: %p %d %p %d %x\n", iface, iDst, punkSrc, iSrc, uFlags); HIMAGELIST This = (HIMAGELIST) iface;
return E_NOTIMPL; IImageList *src = NULL;
HRESULT ret;
if (!punkSrc)
return E_FAIL;
/* TODO: Add test for IID_ImageList2 too */
if (!SUCCEEDED(IImageList_QueryInterface(punkSrc, &IID_IImageList,
(void **) &src)))
return E_FAIL;
if (ImageList_Copy(This, iDst, (HIMAGELIST) src, iSrc, uFlags))
ret = S_OK;
else
ret = E_FAIL;
IImageList_Release(src);
return ret;
} }
static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1,
IUnknown *punk2, int i2, int dx, int dy, REFIID riid, PVOID *ppv) IUnknown *punk2, int i2, int dx, int dy, REFIID riid, PVOID *ppv)
{ {
FIXME("STUB: %p %d %p %d %d %d %s %p\n", iface, i1, punk2, i2, dx, dy, HIMAGELIST This = (HIMAGELIST) iface;
debugstr_guid(riid), ppv); IImageList *iml2 = NULL;
return E_NOTIMPL; HIMAGELIST hNew;
HRESULT ret = E_FAIL;
if (!punk2 || !ppv)
return E_FAIL;
/* TODO: Add test for IID_ImageList2 too */
if (!SUCCEEDED(IImageList_QueryInterface(punk2, &IID_IImageList,
(void **) &iml2)))
return E_FAIL;
hNew = ImageList_Merge(This, i1, (HIMAGELIST) iml2, i2, dx, dy);
/* Get the interface for the new image list */
if (hNew)
ret = HIMAGELIST_QueryInterface(hNew, riid, ppv);
IImageList_Release(iml2);
return ret;
} }
static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid,
PVOID *ppv) PVOID *ppv)
{ {
FIXME("STUB: %p %s %p\n", iface, debugstr_guid(riid), ppv); HIMAGELIST This = (HIMAGELIST) iface;
return E_NOTIMPL; HIMAGELIST hNew;
HRESULT ret = E_FAIL;
if (!ppv)
return E_FAIL;
hNew = ImageList_Duplicate(This);
/* Get the interface for the new image list */
if (hNew)
ret = HIMAGELIST_QueryInterface(hNew, riid, ppv);
return ret;
} }
static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i, static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i,