Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-13 08:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed GetIconInfo()

Browse source 
svn path=/trunk/; revision=5771
This commit is contained in:
Thomas Bluemel 2003-08-22 20:50:44 +00:00
parent 764b078068
commit 7e8228e0c7
1 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
reactos/lib/user32/windows/icon.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: icon.c,v 1.9 2003/08/20 14:08:19 weiden Exp $ /* $Id: icon.c,v 1.10 2003/08/22 20:50:44 weiden Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/icon.c * FILE: lib/user32/windows/icon.c
@ -112,7 +112,11 @@ CopyIcon(
HICON hIcon) HICON hIcon)
{ {
ICONINFO IconInfo; ICONINFO IconInfo;
GetIconInfo(hIcon, &IconInfo); NtUserGetIconInfo(hIcon, &IconInfo.fIcon,
&IconInfo.xHotspot,
&IconInfo.yHotspot,
&IconInfo.hbmMask,
&IconInfo.hbmColor);
return CreateIconIndirect(&IconInfo); return CreateIconIndirect(&IconInfo);
} }
@ -310,7 +314,11 @@ DrawIconEx(
BOOL result = FALSE, DoOffscreen; BOOL result = FALSE, DoOffscreen;
HBITMAP hB_off = 0, hOld = 0; HBITMAP hB_off = 0, hOld = 0;
if (!GetIconInfo(hIcon, &IconInfo)) if (!NtUserGetIconInfo(hIcon, &IconInfo.fIcon,
&IconInfo.xHotspot,
&IconInfo.yHotspot,
&IconInfo.hbmMask,
&IconInfo.hbmColor))
return FALSE; return FALSE;
NtGdiGetObject(IconInfo.hbmColor, sizeof(BITMAP), &XORBitmap); NtGdiGetObject(IconInfo.hbmColor, sizeof(BITMAP), &XORBitmap);
@ -442,12 +450,24 @@ GetIconInfo(
HICON hIcon, HICON hIcon,
PICONINFO piconinfo) PICONINFO piconinfo)
{ {
return NtUserGetIconInfo(hIcon, ICONINFO IconInfo;
&piconinfo->fIcon, WINBOOL res;
&piconinfo->xHotspot,
&piconinfo->yHotspot, if(!piconinfo)
&piconinfo->hbmMask, {
&piconinfo->hbmColor); SetLastError(ERROR_NOACCESS);
return FALSE;
}
RtlCopyMemory(&IconInfo, piconinfo, sizeof(ICONINFO));
res = NtUserGetIconInfo(hIcon,
&piconinfo->fIcon,
&piconinfo->xHotspot,
&piconinfo->yHotspot,
&piconinfo->hbmMask,
&piconinfo->hbmColor);
RtlCopyMemory(piconinfo, &IconInfo, sizeof(ICONINFO));
return res;
} }