Oleg Krylov : user: Fix CopyImage function declaration.

[Alexandre Julliard]

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

Author: Oleg Krylov 
Date:   Tue Oct  3 13:07:50 2006 +0300

user: Fix CopyImage function declaration.

---

dlls/user/cursoricon.c |    4 ++--
 include/winuser.h      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c
index e056366..3b15b99 100644
--- a/dlls/user/cursoricon.c
+++ b/dlls/user/cursoricon.c
@@ -2308,7 +2308,7 @@ HANDLE WINAPI LoadImageW( HINSTANCE hins
  *    if the source is a DIB section.
  *    The LR_MONOCHROME flag is ignored if LR_CREATEDIBSECTION is present.
  */
-HICON WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
+HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
                              INT desiredy, UINT flags )
 {
     TRACE("hnd=%p, type=%u, desiredx=%d, desiredy=%d, flags=%x\n",
@@ -2492,7 +2492,7 @@ HICON WINAPI CopyImage( HANDLE hnd, UINT
                 }
             }
             HeapFree(GetProcessHeap(), 0, bi);
-            return (HICON)res;
+            return res;
         }
         case IMAGE_ICON:
                 return CURSORICON_ExtCopy(hnd,type, desiredx, desiredy, flags);
diff --git a/include/winuser.h b/include/winuser.h
index 14d36e5..d5a8e9b 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4215,7 +4215,7 @@ BOOL      WINAPI CloseWindow(HWND);
 BOOL      WINAPI CloseWindowStation(HWINSTA);
 #define     CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur)))
 HICON     WINAPI CopyIcon(HICON);
-HICON     WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT);
+HANDLE    WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT);
 BOOL      WINAPI CopyRect(RECT*,const RECT*);
 INT       WINAPI CountClipboardFormats(void);
 BOOL      WINAPI CreateCaret(HWND,HBITMAP,INT,INT);