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

comctl32/imagelist: Fix return value for IImageList_GetIconSize().

Browse Source
This commit is contained in:
Nikolay Sivov 2010-08-21 19:31:29 +04:00 committed by Alexandre Julliard
parent 9b77425f6a
commit acbd632039
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/comctl32/imagelist.c
View File

@ -3431,7 +3431,7 @@ static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx,
{ {
HIMAGELIST This = (HIMAGELIST) iface; HIMAGELIST This = (HIMAGELIST) iface;
return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_FAIL; return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_INVALIDARG;
} }
static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx,
@ -3442,9 +3442,6 @@ static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx,
static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi)
{ {
if (!pi)
return E_FAIL;
*pi = ImageList_GetImageCount((HIMAGELIST) iface); *pi = ImageList_GetImageCount((HIMAGELIST) iface);
return S_OK; return S_OK;
} }

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

@ -1863,6 +1863,52 @@ if (0)
IImageList_Release(imgl); IImageList_Release(imgl);
} }
static void test_IImageList_GetImageCount(void)
{
IImageList *imgl;
HIMAGELIST himl;
int count;
HRESULT hr;
himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3);
imgl = (IImageList*)himl;
if (0)
{
/* crashes on native */
hr = IImageList_GetImageCount(imgl, NULL);
}
count = -1;
hr = IImageList_GetImageCount(imgl, &count);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(count == 0, "got %d\n", count);
IImageList_Release(imgl);
}
static void test_IImageList_GetIconSize(void)
{
IImageList *imgl;
HIMAGELIST himl;
int cx, cy;
HRESULT hr;
himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3);
imgl = (IImageList*)himl;
hr = IImageList_GetIconSize(imgl, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IImageList_GetIconSize(imgl, &cx, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IImageList_GetIconSize(imgl, NULL, &cy);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
IImageList_Release(imgl);
}
START_TEST(imagelist) START_TEST(imagelist)
{ {
ULONG_PTR ctx_cookie; ULONG_PTR ctx_cookie;
@ -1918,6 +1964,8 @@ START_TEST(imagelist)
test_IImageList_Clone(); test_IImageList_Clone();
test_IImageList_GetBkColor(); test_IImageList_GetBkColor();
test_IImageList_SetBkColor(); test_IImageList_SetBkColor();
test_IImageList_GetImageCount();
test_IImageList_GetIconSize();
CoUninitialize(); CoUninitialize();