user32: fix copyImage implementation when changing cursor to icon

[Daniel Jelinski]

-------------- next part --------------
From 85dd1a635407b52675f2461cb3e3cfffcb3ee674 Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1 at gmail.com>
Date: Fri, 8 Feb 2013 20:19:47 +0100
Subject: [PATCH] user32: fix copyImage implementation when changing cursor to
 icon

noticed while testing for bug 9932 with native comctl32:
ImageList_ReplaceIcon calls CopyImage trying to copy cursor.
This currently fails, and we get black square instead of drag cursor.
This patch allows both functions to succeed, and with it correct cursor
image is shown.
---
 dlls/user32/cursoricon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 25059e0..5b21101 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -2873,7 +2873,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
 
             if (icon->rsrc && (flags & LR_COPYFROMRESOURCE))
                 res = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth,
-                                       type == IMAGE_CURSOR, flags );
+                                       !icon->is_icon, flags );
             else
                 res = CopyIcon( hnd ); /* FIXME: change size if necessary */
             release_icon_ptr( hnd, icon );
-- 
1.7.5.4