Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-30 16:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct the offset in NtUserGetMenuItemRect. It was unfinished.

Browse source 
svn path=/trunk/; revision=30824
This commit is contained in:
James Tabor 2007-11-27 20:56:18 +00:00
parent d747ce2059
commit 940927a689
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/subsystems/win32/win32k/ntuser/menu.c
View file

@ -1947,7 +1947,8 @@ NtUserGetMenuItemRect(
LPRECT lprcItem) LPRECT lprcItem)
{ {
ROSMENUINFO mi; ROSMENUINFO mi;
HWND referenceHwnd; PWINDOW_OBJECT ReferenceWnd;
LONG XMove, YMove;
RECT Rect; RECT Rect;
NTSTATUS Status; NTSTATUS Status;
PMENU_OBJECT Menu; PMENU_OBJECT Menu;
@ -1967,19 +1968,33 @@ NtUserGetMenuItemRect(
else else
RETURN(FALSE); RETURN(FALSE);
referenceHwnd = hWnd;
if(!hWnd) if(!hWnd)
{ {
if(!UserMenuInfo(Menu, &mi, FALSE)) if(!UserMenuInfo(Menu, &mi, FALSE))
RETURN( FALSE); RETURN( FALSE);
if(mi.Wnd == 0) if(mi.Wnd == 0)
RETURN( FALSE); RETURN( FALSE);
referenceHwnd = mi.Wnd; /* Okay we found it, so now what do we do? */
} }
if (lprcItem == NULL) if (lprcItem == NULL) RETURN( FALSE);
RETURN( FALSE);
if (!(ReferenceWnd = UserGetWindowObject(mi.Wnd))) RETURN( FALSE);
if(MenuItem->fType & MF_POPUP)
{
XMove = ReferenceWnd->Wnd->ClientRect.left;
YMove = ReferenceWnd->Wnd->ClientRect.top;
}
else
{
XMove = ReferenceWnd->Wnd->WindowRect.left;
YMove = ReferenceWnd->Wnd->WindowRect.top;
}
Rect.left += XMove;
Rect.Top += YMove;
Rect.right += XMove;
Rect.bottom += YMove;
Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT)); Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT));
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))