[User32]

- Fixed get menu info, check parameters first than the handle. See CORE-8064.

svn path=/trunk/; revision=62747

diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index c051f69..d3eeae8 100644 (file)
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -4269,15 +4269,15 @@ GetMenuInfo(HMENU hmenu,
   BOOL res = FALSE;
   PVOID pMenu;
 
   BOOL res = FALSE;
   PVOID pMenu;
 

-  if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU)))
-     return FALSE;
-

   if (!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO)))
   {
      SetLastError(ERROR_INVALID_PARAMETER);
      return FALSE;
   }
 
   if (!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO)))
   {
      SetLastError(ERROR_INVALID_PARAMETER);
      return FALSE;
   }
 

+  if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU)))
+     return FALSE;
+

   RtlZeroMemory(&mi, sizeof(MENUINFO));
   mi.cbSize = sizeof(MENUINFO);
   mi.fMask = lpcmi->fMask;
   RtlZeroMemory(&mi, sizeof(MENUINFO));
   mi.cbSize = sizeof(MENUINFO);
   mi.fMask = lpcmi->fMask;