Alexandre Julliard : user.exe: Reimplement CopyImage16 for cursors and icons.

Alexandre Julliard julliard at winehq.org
Tue Dec 29 09:06:39 CST 2009


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Dec 28 20:26:37 2009 +0100

user.exe: Reimplement CopyImage16 for cursors and icons.

---

 dlls/user.exe16/user.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c
index b4a3b24..6b0f09a 100644
--- a/dlls/user.exe16/user.c
+++ b/dlls/user.exe16/user.c
@@ -2076,8 +2076,18 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
 HICON16 WINAPI CopyImage16(HANDLE16 hnd, UINT16 type, INT16 desiredx,
 			   INT16 desiredy, UINT16 flags)
 {
-  return HICON_16(CopyImage(HANDLE_32(hnd), (UINT)type, (INT)desiredx,
-			    (INT)desiredy, (UINT)flags));
+    if (flags & LR_COPYFROMRESOURCE) FIXME( "LR_COPYFROMRESOURCE not supported\n" );
+
+    switch (type)
+    {
+    case IMAGE_BITMAP:
+        return HBITMAP_16( CopyImage( HBITMAP_32(hnd), type, desiredx, desiredy, flags ));
+    case IMAGE_ICON:
+    case IMAGE_CURSOR:
+        return CopyIcon16( FarGetOwner16(hnd), hnd );
+    default:
+        return 0;
+    }
 }
 
 /**********************************************************************




More information about the wine-cvs mailing list