Module: wine Branch: master Commit: 76f02eeb12734a27309680b9b25f8f7b52c0e5ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f02eeb12734a27309680b9b... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:40:41 2022 +0100 user32: Directly use NtUserGetIconInfo in GetIconInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6e735dcd065..d8a35ee7b6e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1815,18 +1815,9 @@ HCURSOR WINAPI GetCursorFrameInfo( HCURSOR handle, DWORD reserved, DWORD istep, /********************************************************************** * GetIconInfo (USER32.@) */ -BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) +BOOL WINAPI GetIconInfo( HICON icon, ICONINFO *info ) { - ICONINFOEXW infoW; - - infoW.cbSize = sizeof(infoW); - if (!GetIconInfoExW( hIcon, &infoW )) return FALSE; - iconinfo->fIcon = infoW.fIcon; - iconinfo->xHotspot = infoW.xHotspot; - iconinfo->yHotspot = infoW.yHotspot; - iconinfo->hbmColor = infoW.hbmColor; - iconinfo->hbmMask = infoW.hbmMask; - return TRUE; + return NtUserGetIconInfo( icon, info, NULL, NULL, NULL, 0 ); } /**********************************************************************