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

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

This commit is contained in:
Nikolay Sivov 2010-08-21 19:20:11 +04:00 committed by Alexandre Julliard
parent 6db1d3c5b9
commit 1c82b3491a
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/comctl32/imagelist.c
View File

@ -3467,9 +3467,6 @@ static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk
static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr)
{
if (!pclr)
return E_FAIL;
*pclr = ImageList_GetBkColor((HIMAGELIST) iface);
return S_OK;
}
@ -3649,11 +3646,9 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii
if (pUnkOuter) return CLASS_E_NOAGGREGATION;
This = HeapAlloc(GetProcessHeap(), 0, sizeof(struct _IMAGELIST));
This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST));
if (!This) return E_OUTOFMEMORY;
ZeroMemory(This, sizeof(struct _IMAGELIST));
This->lpVtbl = &ImageListImpl_Vtbl;
This->ref = 1;

23
dlls/comctl32/tests/imagelist.c
View File

@ -1811,6 +1811,28 @@ if (0)
IImageList_Release(imgl);
}
static void test_IImageList_GetBkColor(void)
{
IImageList *imgl;
HIMAGELIST himl;
COLORREF color;
HRESULT hr;
himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3);
imgl = (IImageList*)himl;
if (0)
{
/* crashes on native */
hr = IImageList_GetBkColor(imgl, NULL);
}
hr = IImageList_GetBkColor(imgl, &color);
ok(hr == S_OK, "got 0x%08x\n", hr);
IImageList_Release(imgl);
}
START_TEST(imagelist)
{
ULONG_PTR ctx_cookie;
@ -1864,6 +1886,7 @@ START_TEST(imagelist)
test_IImageList_Draw();
test_IImageList_Merge();
test_IImageList_Clone();
test_IImageList_GetBkColor();
CoUninitialize();