Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:23:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Win32k/User32:

Browse source 
- Moved NtUserGetCursorIconInfo to NtUserGetIconInfo, update header.
- GetIconInfo is correctly called now.

svn path=/trunk/; revision=29348
This commit is contained in:
James Tabor 2007-10-01 23:15:02 +00:00
parent e05e9dee74
commit fb4bacbb5f
6 changed files with 10 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/user32/windows/cursor.c
View file

@ -72,7 +72,7 @@ CopyCursor(HCURSOR pcur)
{ {
ICONINFO IconInfo; ICONINFO IconInfo;
if(NtUserGetCursorIconInfo((HANDLE)pcur, &IconInfo)) if(GetIconInfo((HANDLE)pcur, &IconInfo))
{ {
return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE);
} }

5
reactos/dll/win32/user32/windows/icon.c
View file

@ -152,7 +152,7 @@ CopyIcon(
{ {
ICONINFO IconInfo; ICONINFO IconInfo;
if(NtUserGetCursorIconInfo((HANDLE)hIcon, &IconInfo)) if(GetIconInfo((HANDLE)hIcon, &IconInfo))
{ {
return NtUserCreateCursorIconHandle(&IconInfo, FALSE); return NtUserCreateCursorIconHandle(&IconInfo, FALSE);
} }
@ -400,8 +400,7 @@ GetIconInfo(
HICON hIcon, HICON hIcon,
PICONINFO IconInfo) PICONINFO IconInfo)
{ {
/* FIXME - copy bitmaps */ return NtUserGetIconInfo((HANDLE)hIcon, IconInfo, 0, 0, 0, 0);
return (BOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo);
} }

12
reactos/include/reactos/win32k/ntuser.h
View file

@ -1064,12 +1064,6 @@ NtUserGetGUIThreadInfo(
DWORD idThread, DWORD idThread,
LPGUITHREADINFO lpgui); LPGUITHREADINFO lpgui);
BOOL
NTAPI
NtUserGetCursorIconInfo(
HANDLE Handle,
PICONINFO IconInfo);
BOOL BOOL
NTAPI NTAPI
NtUserGetCursorIconSize( NtUserGetCursorIconSize(
@ -1077,11 +1071,11 @@ NtUserGetCursorIconSize(
BOOL *fIcon, BOOL *fIcon,
SIZE *Size); SIZE *Size);
DWORD BOOL
NTAPI NTAPI
NtUserGetIconInfo( NtUserGetIconInfo(
DWORD dwUnknown1, HANDLE Handle,
DWORD dwUnknown2, PICONINFO IconInfo,
DWORD dwUnknown3, DWORD dwUnknown3,
DWORD dwUnknown4, DWORD dwUnknown4,
DWORD dwUnknown5, DWORD dwUnknown5,

8
reactos/subsystems/win32/win32k/ntuser/cursoricon.c
View file

@ -621,9 +621,9 @@ CLEANUP:
*/ */
BOOL BOOL
STDCALL STDCALL
NtUserGetCursorIconInfo( NtUserGetIconInfo(
HANDLE hCurIcon, HANDLE hCurIcon,
PICONINFO IconInfo) PICONINFO IconInfo, DWORD UnkOne, DWORD UnkTwo, DWORD UnkThree, DWORD UnkFour )
{ {
ICONINFO ii; ICONINFO ii;
PCURICON_OBJECT CurIcon; PCURICON_OBJECT CurIcon;
@ -632,7 +632,7 @@ NtUserGetCursorIconInfo(
BOOL Ret = FALSE; BOOL Ret = FALSE;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
DPRINT("Enter NtUserGetCursorIconInfo\n"); DPRINT("Enter NtUserGetIconInfo\n");
UserEnterExclusive(); UserEnterExclusive();
if(!IconInfo) if(!IconInfo)
@ -670,7 +670,7 @@ NtUserGetCursorIconInfo(
RETURN( Ret); RETURN( Ret);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserGetCursorIconInfo, ret=%i\n",_ret_); DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

14
reactos/subsystems/win32/win32k/ntuser/ntstubs.c
View file

@ -774,20 +774,6 @@ NtUserGetAtomName(
return 0; return 0;
} }
DWORD
NTAPI
NtUserGetIconInfo(
DWORD dwUnknown1,
DWORD dwUnknown2,
DWORD dwUnknown3,
DWORD dwUnknown4,
DWORD dwUnknown5,
DWORD dwUnknown6)
{
UNIMPLEMENTED;
return 0;
}
/* for hints how the prototype might be, see /* for hints how the prototype might be, see
http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1
http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634ccb2c30630da7e3666d3d07/b47155634ccb2c30630da7e3666d3d07.trace.html#NtUserGetIconSize */ http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634ccb2c30630da7e3666d3d07/b47155634ccb2c30630da7e3666d3d07.trace.html#NtUserGetIconSize */

1
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -711,7 +711,6 @@ NtUserGetClassLong 3
NtUserGetClientOrigin 2 NtUserGetClientOrigin 2
NtUserGetClientRect 2 NtUserGetClientRect 2
NtUserGetMenuDefaultItem 3 NtUserGetMenuDefaultItem 3
NtUserGetCursorIconInfo 2
NtUserGetCursorIconSize 3 NtUserGetCursorIconSize 3
NtUserGetLastInputInfo 1 NtUserGetLastInputInfo 1
NtUserGetMinMaxInfo 3 NtUserGetMinMaxInfo 3