From dd6e2b361d0be5b10c0373f896a67b9ac712dc2c Mon Sep 17 00:00:00 2001 From: Oleg Krylov Date: Tue, 3 Oct 2006 13:07:50 +0300 Subject: [PATCH] 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 e056366762..3b15b99604 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -2308,7 +2308,7 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, * 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 type, INT desiredx, } } 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 14d36e5077..d5a8e9baa1 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); -- 2.32.0.93.g670b81a890