user32: Use GetIconInfo in CopyIcon.

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

user32: Use GetIconInfo in CopyIcon.
c24326b8 · Jacek Caban · Alexandre Julliard · 76f02eeb · c24326b8
Commit c24326b8 authored Feb 23, 2022 by Jacek Caban Committed by Alexandre Julliard Feb 23, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

cursoricon.c dlls/user32/cursoricon.c +2 -3

No files found.
--- 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 (!GetIconInfo( icon, &info ))
-    if (!GetIconInfoExW( icon, &info ))
        return NULL;
    res = CopyImage( icon, info.fIcon ? IMAGE_ICON : IMAGE_CURSOR, 0, 0, 0 );