From e4cff1c66a8c13299f50c8ad287b3e44cfa7c1cd Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Sat, 25 Oct 2014 11:45:47 +0000
Subject: [PATCH] [Win32k] - Fix a copy paste error, see CORE-8667. - Set top
 margin to 2.

svn path=/trunk/; revision=64976
---
 reactos/win32ss/user/ntuser/menu.c         | 2 +-
 reactos/win32ss/user/user32/windows/menu.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/win32ss/user/ntuser/menu.c b/reactos/win32ss/user/ntuser/menu.c
index 9cd09171564..c16acbcc3cf 100644
--- a/reactos/win32ss/user/ntuser/menu.c
+++ b/reactos/win32ss/user/ntuser/menu.c
@@ -649,7 +649,7 @@ IntGetMenuInfo(PMENU Menu, PROSMENUINFO lpmi)
      lpmi->cyMenu = Menu->cyMenu;
      lpmi->spwndNotify = Menu->spwndNotify;
      lpmi->cxTextAlign = Menu->cxTextAlign;
-     lpmi->iTop = Menu->iMaxTop;
+     lpmi->iTop = Menu->iTop;
      lpmi->iMaxTop = Menu->iMaxTop;
      lpmi->dwArrowsOn = Menu->dwArrowsOn;
 
diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index 8241379a974..392b42136c1 100644
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu);
 #define MENU_COL_SPACE 4
 
 /*  top and bottom margins for popup menus */
-#define MENU_TOP_MARGIN 3
+#define MENU_TOP_MARGIN 2 //3
 #define MENU_BOTTOM_MARGIN 2
 
 #define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR)
@@ -395,7 +395,7 @@ MenuGetRosMenuInfo(PROSMENUINFO MenuInfo, HMENU Menu)
   MenuInfo->cyMenu = pMenu->cyMenu;
   MenuInfo->spwndNotify = pMenu->spwndNotify;
   MenuInfo->cxTextAlign = pMenu->cxTextAlign;
-  MenuInfo->iTop = pMenu->iMaxTop;
+  MenuInfo->iTop = pMenu->iTop;
   MenuInfo->iMaxTop = pMenu->iMaxTop;
   MenuInfo->dwArrowsOn = pMenu->dwArrowsOn;
 
@@ -1301,7 +1301,7 @@ static void FASTCALL MenuPopupMenuCalcSize(PROSMENUINFO MenuInfo, HWND WndOwner)
       orgX = maxX;
       //if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK))
       //    orgX += MENU_COL_SPACE;
-      orgY = 2;//MENU_TOP_MARGIN;
+      orgY = MENU_TOP_MARGIN;
 
       maxTab = maxTabWidth = 0;
       /* Parse items until column break or end of menu */