implemented NtUserGetIconSize()

svn path=/trunk/; revision=5805
This commit is contained in:
Thomas Bluemel 2003-08-23 20:59:08 +00:00
parent a301bcf7df
commit 7ef4a451c3
2 changed files with 139 additions and 67 deletions

View file

@ -212,10 +212,10 @@ NtUserChildWindowFromPointEx(HWND Parent,
LONG y, LONG y,
UINT Flags); UINT Flags);
DWORD BOOL
STDCALL STDCALL
NtUserClipCursor( NtUserClipCursor(
DWORD Unknown0); RECT *lpRect);
DWORD DWORD
STDCALL STDCALL
@ -360,11 +360,11 @@ STDCALL
NtUserDestroyAcceleratorTable( NtUserDestroyAcceleratorTable(
HACCEL Table); HACCEL Table);
DWORD BOOL
STDCALL STDCALL
NtUserDestroyCursor( NtUserDestroyCursor(
DWORD Unknown0, HCURSOR hCursor,
DWORD Unknown1); DWORD Unknown);
BOOL BOOL
STDCALL STDCALL
@ -615,10 +615,10 @@ DWORD
STDCALL STDCALL
NtUserGetClipboardViewer(VOID); NtUserGetClipboardViewer(VOID);
DWORD BOOL
STDCALL STDCALL
NtUserGetClipCursor( NtUserGetClipCursor(
DWORD Unknown0); RECT *lpRect);
DWORD DWORD
STDCALL STDCALL
@ -656,10 +656,10 @@ NtUserGetCursorFrameInfo(
DWORD Unknown2, DWORD Unknown2,
DWORD Unknown3); DWORD Unknown3);
DWORD BOOL
STDCALL STDCALL
NtUserGetCursorInfo( NtUserGetCursorInfo(
DWORD Unknown0); PCURSORINFO pci);
UINT STDCALL UINT STDCALL
NtUserGetMenuDefaultItem( NtUserGetMenuDefaultItem(
@ -702,13 +702,13 @@ NtUserGetIconInfo(
HBITMAP *hbmMask, HBITMAP *hbmMask,
HBITMAP *hbmColor); HBITMAP *hbmColor);
DWORD BOOL
STDCALL STDCALL
NtUserGetIconSize( NtUserGetIconSize(
DWORD Unknown0, HICON hIcon,
DWORD Unknown1, BOOL *fIcon,
DWORD Unknown2, LONG *Width,
DWORD Unknown3); LONG *Height);
DWORD DWORD
STDCALL STDCALL
@ -1311,24 +1311,24 @@ NtUserSetConsoleReserveKeys(
DWORD Unknown0, DWORD Unknown0,
DWORD Unknown1); DWORD Unknown1);
DWORD HCURSOR
STDCALL STDCALL
NtUserSetCursor( NtUserSetCursor(
DWORD Unknown0); HCURSOR hCursor);
DWORD BOOL
STDCALL STDCALL
NtUserSetCursorContents( NtUserSetCursorContents(
DWORD Unknown0, HCURSOR hCursor,
DWORD Unknown1); DWORD Unknown);
DWORD BOOL
STDCALL STDCALL
NtUserSetCursorIconData( NtUserSetCursorIconData(
DWORD Unknown0, HICON hIcon,
DWORD Unknown1, PBOOL fIcon,
DWORD Unknown2, PDWORD xHotspot,
DWORD Unknown3); PDWORD yHotspot);
DWORD DWORD
STDCALL STDCALL
@ -1461,11 +1461,11 @@ NtUserSetSysColors(
DWORD Unknown2, DWORD Unknown2,
DWORD Unknown3); DWORD Unknown3);
DWORD BOOL
STDCALL STDCALL
NtUserSetSystemCursor( NtUserSetSystemCursor(
DWORD Unknown0, HCURSOR hcur,
DWORD Unknown1); DWORD id);
BOOL BOOL
STDCALL STDCALL

View file

@ -17,15 +17,21 @@ BOOL FASTCALL IconCursor_InternalDelete( PICONCURSOROBJ pIconCursor )
return TRUE; return TRUE;
} }
HICON STDCALL NtGdiCreateIcon(BOOL fIcon,
INT Width, /*
INT Height, * @implemented
UINT Planes, */
UINT BitsPerPel, HICON
DWORD xHotspot, STDCALL
DWORD yHotspot, NtGdiCreateIcon(BOOL fIcon,
CONST VOID *ANDBits, INT Width,
CONST VOID *XORBits) INT Height,
UINT Planes,
UINT BitsPerPel,
DWORD xHotspot,
DWORD yHotspot,
CONST VOID *ANDBits,
CONST VOID *XORBits)
{ {
PICONCURSOROBJ icon; PICONCURSOROBJ icon;
HICON hIcon; HICON hIcon;
@ -48,7 +54,7 @@ HICON STDCALL NtGdiCreateIcon(BOOL fIcon,
hIcon = ICONCURSOROBJ_AllocIconCursor (); hIcon = ICONCURSOROBJ_AllocIconCursor ();
if (!hIcon) if (!hIcon)
{ {
DPRINT("NtGdiCreateIcon: ICONCURSOROBJ_AllocIconCursor() returned 0\n"); DPRINT("NtGdiCreateIcon: ICONCURSOROBJ_AllocIconCursor(hIcon == 0x%x) returned 0\n", hIcon);
return 0; return 0;
} }
@ -97,6 +103,10 @@ HICON STDCALL NtGdiCreateIcon(BOOL fIcon,
return hIcon; return hIcon;
} }
/*
* @implemented
*/
DWORD DWORD
STDCALL STDCALL
NtUserGetIconInfo( NtUserGetIconInfo(
@ -113,7 +123,7 @@ NtUserGetIconInfo(
if (!icon) if (!icon)
{ {
DPRINT1("NtUserGetIconInfo: ICONCURSOROBJ_LockIconCursor() returned 0\n"); DPRINT1("NtUserGetIconInfo: ICONCURSOROBJ_LockIconCursor(hIcon == 0x%x) returned 0\n", hIcon);
return FALSE; return FALSE;
} }
@ -141,19 +151,44 @@ NtUserGetIconInfo(
return TRUE; return TRUE;
} }
DWORD
/*
* @implemented
*/
BOOL
STDCALL STDCALL
NtUserGetIconSize( NtUserGetIconSize(
DWORD Unknown0, HICON hIcon,
DWORD Unknown1, BOOL *fIcon,
DWORD Unknown2, LONG *Width,
DWORD Unknown3) LONG *Height)
{ {
UNIMPLEMENTED PICONCURSOROBJ icon;
return 0; if (!hIcon || !Width || !Width)
return FALSE;
icon = ICONCURSOROBJ_LockIconCursor(hIcon);
if (!icon)
{
DPRINT1("NtUserGetIconInfo: ICONCURSOROBJ_LockIconCursor() returned 0\n");
return FALSE;
}
if(fIcon) *fIcon = icon->fIcon;
*Width = icon->ANDBitmap.bmWidth;
*Width = icon->ANDBitmap.bmHeight;
ICONCURSOROBJ_UnlockIconCursor(hIcon);
return TRUE;
} }
/*
* @unimplemented
*/
DWORD DWORD
STDCALL STDCALL
NtUserGetCursorFrameInfo( NtUserGetCursorFrameInfo(
@ -167,37 +202,53 @@ NtUserGetCursorFrameInfo(
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserGetCursorInfo( NtUserGetCursorInfo(
DWORD Unknown0) PCURSORINFO pci)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserClipCursor( NtUserClipCursor(
DWORD Unknown0) RECT *lpRect)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserDestroyCursor( NtUserDestroyCursor(
DWORD Unknown0, HCURSOR hCursor,
DWORD Unknown1) DWORD Unknown)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
/*
* @unimplemented
*/
DWORD DWORD
STDCALL STDCALL
NtUserFindExistingCursorIcon( NtUserFindExistingCursorIcon(
@ -210,54 +261,75 @@ NtUserFindExistingCursorIcon(
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserGetClipCursor( NtUserGetClipCursor(
DWORD Unknown0) RECT *lpRect)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
HCURSOR
STDCALL STDCALL
NtUserSetCursor( NtUserSetCursor(
DWORD Unknown0) HCURSOR hCursor)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserSetCursorContents( NtUserSetCursorContents(
DWORD Unknown0, HCURSOR hCursor,
DWORD Unknown1) DWORD Unknown)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserSetCursorIconData( NtUserSetCursorIconData(
DWORD Unknown0, HICON hIcon,
DWORD Unknown1, PBOOL fIcon,
DWORD Unknown2, PDWORD xHotspot,
DWORD Unknown3) PDWORD yHotspot)
{ {
UNIMPLEMENTED UNIMPLEMENTED
return 0; return 0;
} }
DWORD
/*
* @unimplemented
*/
BOOL
STDCALL STDCALL
NtUserSetSystemCursor( NtUserSetSystemCursor(
DWORD Unknown0, HCURSOR hcur,
DWORD Unknown1) DWORD id)
{ {
UNIMPLEMENTED UNIMPLEMENTED