Nikolay Sivov : comctl32: Call interface methods properly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 21897a96892c49e45271dd88dd4c5ca9ccc0fd5f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=21897a96892c49e45271dd88dd...

Author: Nikolay Sivov 
Date:   Sun Aug 19 19:19:41 2012 +0400

comctl32: Call interface methods properly.

---

dlls/comctl32/imagelist.c       |    6 +++---
 dlls/comctl32/tests/imagelist.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 4d18597..6142ba7 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -3366,7 +3366,7 @@ static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst,
         return E_FAIL;

/* TODO: Add test for IID_ImageList2 too */
-    if (FAILED(IImageList_QueryInterface(punkSrc, &IID_IImageList,
+    if (FAILED(IUnknown_QueryInterface(punkSrc, &IID_IImageList,
             (void **) &src)))
         return E_FAIL;

@@ -3390,7 +3390,7 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1,
     TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv);

/* TODO: Add test for IID_ImageList2 too */
-    if (FAILED(IImageList_QueryInterface(punk2, &IID_IImageList,
+    if (FAILED(IUnknown_QueryInterface(punk2, &IID_IImageList,
             (void **) &iml2)))
         return E_FAIL;

@@ -3523,7 +3523,7 @@ static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface,
         return E_FAIL;

/* TODO: Add test for IID_ImageList2 too */
-    if (FAILED(IImageList_QueryInterface(punk, &IID_IImageList,
+    if (FAILED(IUnknown_QueryInterface(punk, &IID_IImageList,
             (void **) &iml2)))
         return E_FAIL;

diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index 2e316f7..98b84a6 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -1423,7 +1423,7 @@ static void test_iimagelist(void)

/* test reference counting on destruction */
     imgl = (IImageList*)createImageList(32, 32);
-    ret = IUnknown_AddRef(imgl);
+    ret = IImageList_AddRef(imgl);
     ok(ret == 2, "Expected 2, got %d\n", ret);
     ret = ImageList_Destroy((HIMAGELIST)imgl);
     ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
@@ -1433,7 +1433,7 @@ static void test_iimagelist(void)
     ok(ret == FALSE, "Expected FALSE, got %d\n", ret);

imgl = (IImageList*)createImageList(32, 32);
-    ret = IUnknown_AddRef(imgl);
+    ret = IImageList_AddRef(imgl);
     ok(ret == 2, "Expected 2, got %d\n", ret);
     ret = ImageList_Destroy((HIMAGELIST)imgl);
     ok(ret == TRUE, "Expected TRUE, got %d\n", ret);