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

comctl32/imagelist: Fix failure code for IImageList_Remove().

This commit is contained in:
Nikolay Sivov 2010-08-19 10:13:43 +04:00 committed by Alexandre Julliard
parent 5ee4441c15
commit 4023e0125f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/imagelist.c
View File

@ -3314,7 +3314,7 @@ static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface,
static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i)
{
return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_FAIL : S_OK;
return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_INVALIDARG : S_OK;
}
static HRESULT WINAPI ImageListImpl_GetIcon(IImageList *iface, int i, UINT flags,

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

@ -1493,7 +1493,7 @@ static void test_IImageList_Add_Remove(void)
/* remove when nothing exists */
hr = IImageList_Remove(imgl, 0);
todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
/* removing everything from an empty imagelist should succeed */
hr = IImageList_Remove(imgl, -1);
@ -1505,7 +1505,7 @@ static void test_IImageList_Add_Remove(void)
ok( IImageList_ReplaceIcon(imgl, -1, hicon3, &ret) == S_OK && (ret == 2),"failed to add icon3\n");
/* remove an index out of range */
todo_wine ok( IImageList_Remove(imgl, 4711) == E_INVALIDARG, "got 0x%08x\n", hr);
ok( IImageList_Remove(imgl, 4711) == E_INVALIDARG, "got 0x%08x\n", hr);
/* remove three */
ok( IImageList_Remove(imgl,0) == S_OK, "can't remove 0\n");
@ -1513,7 +1513,7 @@ static void test_IImageList_Add_Remove(void)
ok( IImageList_Remove(imgl,0) == S_OK, "can't remove 0\n");
/* remove one extra */
todo_wine ok( IImageList_Remove(imgl, 0) == E_INVALIDARG, "got 0x%08x\n", hr);
ok( IImageList_Remove(imgl, 0) == E_INVALIDARG, "got 0x%08x\n", hr);
IImageList_Release(imgl);
ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n");