Jacek Caban : user32: Use GetIconInfo in CopyIcon.

Alexandre Julliard julliard at winehq.org
Wed Feb 23 16:00:06 CST 2022


Module: wine
Branch: master
Commit: c24326b8b67d01dba4c7bb116b92b30b6daa9ae2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c24326b8b67d01dba4c7bb116b92b30b6daa9ae2

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Feb 23 13:41:03 2022 +0100

user32: Use GetIconInfo in CopyIcon.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/cursoricon.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index d8a35ee7b6e..fdf79e5fdf5 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1632,11 +1632,10 @@ HICON WINAPI CreateIcon( HINSTANCE instance, int width, int height, BYTE planes,
  */
 HICON WINAPI CopyIcon( HICON icon )
 {
-    ICONINFOEXW info;
+    ICONINFO info;
     HICON res;
 
-    info.cbSize = sizeof(info);
-    if (!GetIconInfoExW( icon, &info ))
+    if (!GetIconInfo( icon, &info ))
         return NULL;
 
     res = CopyImage( icon, info.fIcon ? IMAGE_ICON : IMAGE_CURSOR, 0, 0, 0 );




More information about the wine-cvs mailing list