[ros-diffs] [jimtabor] 30824: Correct the offset in NtUserGetMenuItemRect. It was unfinished.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Tue Nov 27 23:56:18 2007
New Revision: 30824

URL: http://svn.reactos.org/svn/reactos?rev=30824&view=rev
Log:
Correct the offset in NtUserGetMenuItemRect. It was unfinished.

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/menu.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/menu.c?rev=30824&r1=30823&r2=30824&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Nov 27 23:56:18 2007
@@ -1947,7 +1947,8 @@
    LPRECT lprcItem)
 {
    ROSMENUINFO mi;
-   HWND referenceHwnd;
+   PWINDOW_OBJECT ReferenceWnd;
+   LONG XMove, YMove;
    RECT Rect;
    NTSTATUS Status;
    PMENU_OBJECT Menu;
@@ -1967,20 +1968,34 @@
    else
       RETURN(FALSE);
 
-   referenceHwnd = hWnd;
-
    if(!hWnd)
    {
       if(!UserMenuInfo(Menu, &mi, FALSE))
          RETURN( FALSE);
       if(mi.Wnd == 0)
          RETURN( FALSE);
-      referenceHwnd = mi.Wnd; /* Okay we found it, so now what do we do? */
-   }
-
-   if (lprcItem == NULL)
-      RETURN( FALSE);
-
+   }
+
+   if (lprcItem == NULL) 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));
    if (! NT_SUCCESS(Status))
    {