Commit 87847aa1 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

comctl32/imagelist: Remove parameter check from IImageList_Clone().

parent eb2aae66
...@@ -3389,15 +3389,13 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, ...@@ -3389,15 +3389,13 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1,
return ret; return ret;
} }
static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, void **ppv)
PVOID *ppv)
{ {
HIMAGELIST This = (HIMAGELIST) iface; HIMAGELIST This = (HIMAGELIST) iface;
HIMAGELIST hNew; HIMAGELIST hNew;
HRESULT ret = E_FAIL; HRESULT ret = E_FAIL;
if (!ppv) TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
return E_FAIL;
hNew = ImageList_Duplicate(This); hNew = ImageList_Duplicate(This);
......
...@@ -1778,6 +1778,28 @@ static void test_create(void) ...@@ -1778,6 +1778,28 @@ static void test_create(void)
ok(himl == NULL, "got %p\n", himl); ok(himl == NULL, "got %p\n", himl);
} }
static void test_IImageList_Clone(void)
{
IImageList *imgl, *imgl2;
HIMAGELIST himl;
HRESULT hr;
himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3);
imgl = (IImageList*)himl;
if (0)
{
/* crashes on native */
hr = IImageList_Clone(imgl, &IID_IImageList, NULL);
}
hr = IImageList_Clone(imgl, &IID_IImageList, (void**)&imgl2);
ok(hr == S_OK, "got 0x%08x\n", hr);
IImageList_Release(imgl2);
IImageList_Release(imgl);
}
START_TEST(imagelist) START_TEST(imagelist)
{ {
ULONG_PTR ctx_cookie; ULONG_PTR ctx_cookie;
...@@ -1830,6 +1852,7 @@ START_TEST(imagelist) ...@@ -1830,6 +1852,7 @@ START_TEST(imagelist)
test_IImageList_Get_SetImageCount(); test_IImageList_Get_SetImageCount();
test_IImageList_Draw(); test_IImageList_Draw();
test_IImageList_Merge(); test_IImageList_Merge();
test_IImageList_Clone();
CoUninitialize(); CoUninitialize();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment