Alexandre Julliard : comctl32/imagelist: Fix a copy/ paste typo in ImageList_Merge.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed May 26 17:36:23 2010 +0200

comctl32/imagelist: Fix a copy/paste typo in ImageList_Merge.

---

dlls/comctl32/imagelist.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 7ca1fc9..d67672f 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -2037,7 +2037,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
     if (himlDst)
     {
         imagelist_point_from_index( himl1, i1, &pt1 );
-        imagelist_point_from_index( himl1, i2, &pt2 );
+        imagelist_point_from_index( himl2, i2, &pt2 );

/* copy image */
         BitBlt (himlDst->hdcImage, 0, 0, cxDst, cyDst, himl1->hdcImage, 0, 0, BLACKNESS);