diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index 9153530276c..303667e4617 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -158,13 +158,15 @@ NtUserCallNextHookEx(
 DWORD
 STDCALL
 NtUserCallNoParam(
-  DWORD Unknown0);
+  DWORD Routine);
 
+#define ONEPARAM_ROUTINE_GETMENU            0x01
+#define ONEPARAM_ROUTINE_ISWINDOWUNICODE    0x02
 DWORD
 STDCALL
 NtUserCallOneParam(
-  DWORD Unknown0,
-  DWORD Unknown1);
+  DWORD Param,
+  DWORD Routine);
 
 #define TWOPARAM_ROUTINE_ENABLEWINDOW       0x53
 #define TWOPARAM_ROUTINE_UNKNOWN            0x54
diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c
index 43fbbb16595..c4cdb7534c4 100644
--- a/reactos/lib/user32/windows/defwnd.c
+++ b/reactos/lib/user32/windows/defwnd.c
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.59 2003/08/05 15:41:03 weiden Exp $
+/* $Id: defwnd.c,v 1.60 2003/08/06 11:32:17 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -209,7 +209,7 @@ DefWndRedrawIconTitle(HWND hWnd)
 BOOL
 UserHasMenu(HWND hWnd, ULONG Style)
 {
-  return(!(Style & WS_CHILD) && GetWindowLong(hWnd, GWL_ID) != 0);
+  return(!(Style & WS_CHILD) && GetMenu(hWnd) != 0);
 }
 
 
@@ -490,7 +490,7 @@ DefWndDoPaintNC(HWND hWnd, HRGN clip)
     {
       RECT r = rect;
       r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);
-
+DbgPrint("Calling MenuDrawMenuBar()\n");
       rect.top += MenuDrawMenuBar(hDC, &r, hWnd, FALSE);
     }
 
@@ -1389,6 +1389,7 @@ DefWndNCCalcSize(HWND hWnd, RECT* Rect)
       Rect->bottom -= TmpRect.bottom;
       if (UserHasMenu(hWnd, GetWindowLong(hWnd, GWL_EXSTYLE)))
 	{
+	  DbgPrint("Calling MenuGetMenuBarHeight()\n");
 	  Rect->top += MenuGetMenuBarHeight(hWnd, 
 					    Rect->right - Rect->left,
 					    -TmpRect.left,
diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c
index cb197e4f61c..ee1cb738eaf 100644
--- a/reactos/lib/user32/windows/menu.c
+++ b/reactos/lib/user32/windows/menu.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.17 2003/08/05 19:50:57 weiden Exp $
+/* $Id: menu.c,v 1.18 2003/08/06 11:32:17 weiden Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/menu.c
@@ -37,42 +37,6 @@
 
 /* TYPES *********************************************************************/
 
-typedef struct _MENUITEM
-{
-  UINT Type;
-  UINT State;
-  UINT Id;
-  HMENU SubMenu;
-  HBITMAP CheckBit;
-  HBITMAP UnCheckBit;
-  LPWSTR Text;
-  ULONG ItemData;
-  ULONG TypeData;
-  HBITMAP BmpItem;
-  RECT Rect;
-  UINT XTab;
-} MENUITEM, *PMENUITEM;
-
-typedef struct _POPUP_MENU
-{
-  ULONG Magic;
-  MENUITEM* Items;
-  ULONG NrItems;
-  ULONG Width;
-  ULONG Height;
-  ULONG FocusedItem;
-  ULONG Flags;
-  HWND hWnd;
-  HWND hWndOwner;
-  HBRUSH hbrBack;
-  ULONG HelpId;
-  ULONG cyMax;
-  ULONG MenuData;
-  ULONG Style;
-} POPUP_MENU, *PPOPUP_MENU;
-
-static HFONT hMenuFont = 0;
-
 #define MENU_TYPE_MASK ((MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR))
 
 #define MENU_ITEM_TYPE(flags) \
@@ -82,19 +46,8 @@ static HFONT hMenuFont = 0;
 #define SEPARATOR_HEIGHT (5)
 #define MENU_TAB_SPACE (8)
 
-static ULONG ArrowBitmapWidth, ArrowBitmapHeight;
-
-static HANDLE hStdMnArrow;
-
-static HANDLE hMenuFontBold;
-
 #define MENU_MAGIC (0x554D)
 
-BOOL EndMenuCalled = FALSE;
-HWND hTopPopupWnd = 0;
-
-HANDLE hMenuDefSysPopup = 0;
-
 #define NO_SELECTED_ITEM (0xffff)
 
 #ifndef MF_END
@@ -226,6 +179,7 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu)
   return res;
 }
 
+
 /**********************************************************************
  *         MENU_ParseResource
  *
@@ -236,59 +190,59 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu)
  */
 static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu, BOOL unicode )
 {
-    WORD flags, id = 0;
-    LPCSTR str;
-    BOOL end = FALSE;
+  WORD flags, id = 0;
+  LPCSTR str;
+  BOOL end = FALSE;
 
-    do
+  do
+  {
+    flags = GET_WORD(res);
+
+    /* remove MF_END flag before passing it to AppendMenu()! */
+    end = (flags & MF_END);
+    if(end) flags ^= MF_END;
+
+    res += sizeof(WORD);
+    if(!(flags & MF_POPUP))
     {
-        flags = GET_WORD(res);
-        
-        /* remove MF_END flag before passing it to AppendMenu()! */
-        end = (flags & MF_END);
-        if(end) flags ^= MF_END;
-        
-        res += sizeof(WORD);
-        if (!(flags & MF_POPUP))
-        {
-            id = GET_WORD(res);
-            res += sizeof(WORD);
-        }
-        str = res;
-        if (!unicode) res += strlen(str) + 1;
-        else res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR);
-        if (flags & MF_POPUP)
-        {
-            HMENU hSubMenu = CreatePopupMenu();
-            if (!hSubMenu) return NULL;
-            if (!(res = MENU_ParseResource( res, hSubMenu, unicode )))
-                return NULL;
-            if (!unicode) AppendMenuA( hMenu, flags, (UINT)hSubMenu, str );
-            else AppendMenuW( hMenu, flags, (UINT)hSubMenu, (LPCWSTR)str );
-        }
-        else  /* Not a popup */
-        {
-            if (!unicode) AppendMenuA( hMenu, flags, id, *str ? str : NULL );
-            else AppendMenuW( hMenu, flags, id,
-                                *(LPCWSTR)str ? (LPCWSTR)str : NULL );
-        }
-    } while (!end);
-    return res;
+      id = GET_WORD(res);
+      res += sizeof(WORD);
+    }
+    str = res;
+    if(!unicode)
+      res += strlen(str) + 1;
+    else
+      res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR);
+    if (flags & MF_POPUP)
+    {
+      HMENU hSubMenu = CreatePopupMenu();
+      if(!hSubMenu) return NULL;
+      if(!(res = MENU_ParseResource(res, hSubMenu, unicode)))
+        return NULL;
+      if(!unicode)
+        AppendMenuA(hMenu, flags, (UINT)hSubMenu, str);
+      else
+        AppendMenuW(hMenu, flags, (UINT)hSubMenu, (LPCWSTR)str);
+    }
+    else  /* Not a popup */
+    {
+      if(!unicode)
+        AppendMenuA(hMenu, flags, id, *str ? str : NULL);
+      else
+        AppendMenuW(hMenu, flags, id,
+                    *(LPCWSTR)str ? (LPCWSTR)str : NULL);
+    }
+  } while(!end);
+
+  return res;
 }
 
 
-/* FUNCTIONS *****************************************************************/
-
-static BOOL
-MenuIsStringItem(ULONG TypeData)
-{
-  return((TypeData & MENU_TYPE_MASK) == MF_STRING);
-}
-
 BOOL
 MenuInit(VOID)
 {
-  NONCLIENTMETRICSW ncm;
+  return TRUE;
+/*  NONCLIENTMETRICSW ncm;
   BITMAP bm;
 
   hStdMnArrow = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_MNARROW));
@@ -319,67 +273,110 @@ MenuInit(VOID)
       return(FALSE);
     }
 
-  return(TRUE);
+  return(TRUE);*/
 }
 
-/*static BOOL
-MenuIsMenu(PPOPUP_MENU Menu)
-{
-  return(Menu->Magic == MENU_MAGIC);
-}*/
 
-static PPOPUP_MENU
-MenuGetMenu(HMENU hMenu)
+ULONG
+MenuGetMenuBarHeight(HWND hWnd, ULONG MenuBarWidth, LONG OrgX, LONG OrgY)
 {
+  /*ULONG MenuId;
   PPOPUP_MENU Menu;
-  Menu = (PPOPUP_MENU)hMenu;
-  return(Menu);
+  RECT Rect;
+  HDC hDC;
+
+  MenuId = GetWindowLong(hWnd, GWL_ID);
+  Menu = MenuGetMenu((HMENU)MenuId);
+  if (Menu == NULL)
+    {
+      return(0);
+    }
+  hDC = GetDCEx(hWnd, 0, DCX_CACHE | DCX_WINDOW);
+  SelectObject(hDC, hMenuFont);
+  SetRect(&Rect, OrgX, OrgY, OrgX + MenuBarWidth, 
+	  OrgY + GetSystemMetrics(SM_CYMENU));
+  MenuMenuBarCalcSize(hDC, &Rect, Menu, hWnd);
+  ReleaseDC(hWnd, hDC);*/
+  return(GetSystemMetrics(SM_CYMENU));
 }
 
-static MENUITEM*
-MenuFindItem(HMENU* hMenu, UINT* nPos, UINT wFlags)
+
+UINT
+MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw)
 {
-  POPUP_MENU* Menu;
+  return(GetSystemMetrics(SM_CYMENU));
+  /*
+  ULONG MenuID;
+  PPOPUP_MENU Menu;
+  HFONT hFontOld;
   ULONG i;
 
-  if ((ULONG)(*hMenu) == 0xFFFF || (Menu = MenuGetMenu(*hMenu)) == NULL)
+  MenuID = GetWindowLong(hWnd, GWL_ID);
+  Menu = MenuGetMenu((HMENU)MenuID);
+
+  if (Menu == NULL || Rect == NULL)
     {
-      return(NULL);
+      return(GetSystemMetrics(SM_CYMENU));
     }
-  if (wFlags & MF_BYPOSITION)
+
+  hFontOld = SelectObject(hDC, hMenuFont);
+
+  if (Menu->Height == 0)
     {
-      if ((*nPos) >= Menu->NrItems)
-	{
-	  return(NULL);
-	}
-      return(&Menu->Items[*nPos]);
+      MenuMenuBarCalcSize(hDC, Rect, Menu, hWnd);
     }
-  else
+
+  Rect->bottom = Rect->top + Menu->Height;
+
+  if (!Draw)
     {
-      MENUITEM* Item = Menu->Items;
-      for (i = 0; i < Menu->NrItems; i++)
-	{
-	  if (Item->Id == (*nPos))
-	    {
-	      *nPos = i;
-	      return(Item);
-	    }
-	  else if (Item->Type & MF_POPUP)
-	    {
-	      HMENU SubMenu = Item->SubMenu;
-	      MENUITEM* SubItem = MenuFindItem(&SubMenu, nPos, wFlags);
-	      if (SubItem)
-		{
-		  *hMenu = SubMenu;
-		  return(SubItem);
-		}
-	    }
-	}
+      SelectObject(hDC, hFontOld);
+      return(Menu->Height);
     }
-  return(NULL);
+
+  FillRect(hDC, Rect, GetSysColorBrush(COLOR_MENU));
+
+  SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
+  MoveToEx(hDC, Rect->left, Rect->bottom, NULL);
+  LineTo(hDC, Rect->right, Rect->bottom);
+
+  if (Menu->NrItems == 0)
+    {
+      SelectObject(hDC, hFontOld);
+      return(GetSystemMetrics(SM_CYMENU));
+    }
+
+  for (i = 0; i < Menu->NrItems; i++)
+    {
+      MenuDrawMenuItem(hWnd, (HMENU)MenuID, hWnd, hDC,
+		       Menu->Items + i, Menu->Height, TRUE, ODA_DRAWENTIRE);
+    }
+
+  SelectObject(hDC, hFontOld);
+  return(Menu->Height);*/
 }
 
 
+VOID
+MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt)
+{
+}
+
+
+VOID
+MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key)
+{
+}
+
+/* FUNCTIONS *****************************************************************/
+
+/*static BOOL
+MenuIsStringItem(ULONG TypeData)
+{
+  return((TypeData & MENU_TYPE_MASK) == MF_STRING);
+}*/
+
+
 /*
  * @implemented
  */
@@ -389,8 +386,6 @@ AppendMenuA(HMENU hMenu,
 	    UINT_PTR uIDNewItem,
 	    LPCSTR lpNewItem)
 {
-  DPRINT("AppendMenuA(hMenu 0x%X, uFlags 0x%X, uIDNewItem %d, "
-         "lpNewItem %s\n", hMenu, uFlags, uIDNewItem, lpNewItem);
   return(InsertMenuA(hMenu, -1, uFlags | MF_BYPOSITION, uIDNewItem, 
 		     lpNewItem));
 }
@@ -405,8 +400,6 @@ AppendMenuW(HMENU hMenu,
 	    UINT_PTR uIDNewItem,
 	    LPCWSTR lpNewItem)
 {
-  DPRINT("AppendMenuW(hMenu 0x%X, uFlags 0x%X, uIDNewItem %d, "
-         "lpNewItem %S\n", hMenu, uFlags, uIDNewItem, lpNewItem);
   return(InsertMenuW(hMenu, -1, uFlags | MF_BYPOSITION, uIDNewItem, 
 		     lpNewItem));
 }
@@ -434,39 +427,8 @@ CheckMenuRadioItem(HMENU hmenu,
 		   UINT idCheck,
 		   UINT uFlags)
 {
-  PMENUITEM First, Last, Check;
-  HMENU FirstMenu = hmenu;
-  HMENU LastMenu = hmenu;
-  HMENU CheckMenu = hmenu;
-
-  DPRINT("CheckMenuRadioItem(hmenu %X, idFirst %d, idLast %d, idCheck %d "
-	 "uFlags %d", hmenu, idFirst, idLast, idCheck, uFlags);
-  
-  First = MenuFindItem(&FirstMenu, &idFirst, uFlags);
-  Last = MenuFindItem(&LastMenu, &idLast, uFlags);
-  Check = MenuFindItem(&CheckMenu, &idCheck, uFlags);
-
-  if (First == NULL || Last == NULL || Check == NULL ||
-      First > Last || FirstMenu != LastMenu || FirstMenu != CheckMenu ||
-      Check > Last || Check < Last)
-    {
-      return(FALSE);
-    }
-  while (First < Last)
-    {
-      if (First == Check)
-	{
-	  First->TypeData |= MFT_RADIOCHECK;
-	  First->State |= MFS_CHECKED;
-	}
-      else
-	{
-	  First->TypeData &= ~MFT_RADIOCHECK;
-	  First->State &= ~MFS_CHECKED;
-	}
-      First++;
-    }
-  return(TRUE);
+  UNIMPLEMENTED;
+  return FALSE;
 }
 
 
@@ -486,7 +448,7 @@ CreateMenu(VOID)
 HMENU STDCALL
 CreatePopupMenu(VOID)
 {
-  /* FIXME - add MF_POPUP style */
+  /* FIXME - add MF_POPUP style? */
   return NtUserCreateMenu();
 }
 
@@ -502,14 +464,6 @@ DeleteMenu(HMENU hMenu,
   return NtUserDeleteMenu(hMenu, uPosition, uFlags);
 }
 
-VOID
-MenuFreeItemData(PMENUITEM Item)
-{
-  if (MenuIsStringItem(Item->TypeData) && Item->Text != NULL)
-    {
-      HeapFree(GetProcessHeap(), 0, Item->Text);
-    }
-}
 
 /*
  * @implemented
@@ -522,29 +476,13 @@ DestroyMenu(HMENU hMenu)
 
 
 /*
- * @implemented
+ * @unimplemented
  */
 WINBOOL STDCALL
 DrawMenuBar(HWND hWnd)
 {
-  ULONG Style;
-  ULONG MenuId;
-  PPOPUP_MENU Menu;
-
-  Style = GetWindowLong(hWnd, GWL_STYLE);
-  MenuId = GetWindowLong(hWnd, GWL_ID);
-  
-  if (!(Style & WS_CHILD) && MenuId != 0)
-    {
-      Menu = MenuGetMenu((HMENU)MenuId);
-
-      Menu->Height = 0;
-      Menu->hWndOwner = hWnd;
-      SetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
-		   SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED);
-      return(TRUE);
-    }
-  return(FALSE);
+  UNIMPLEMENTED
+  return FALSE;
 }
 
 
@@ -559,25 +497,14 @@ EnableMenuItem(HMENU hMenu,
   return NtUserEnableMenuItem(hMenu, uIDEnableItem, uEnable);
 }
 
-BOOL STATIC
-MenuIsMenuActive(VOID)
-{
-  return(hTopPopupWnd != NULL && IsWindowVisible(hTopPopupWnd));
-}
-
 /*
- * @implemented
+ * @unimplemented
  */
 WINBOOL STDCALL
 EndMenu(VOID)
 {
-  if (!EndMenuCalled && MenuIsMenuActive())
-    {
-      EndMenuCalled = TRUE;
-
-      PostMessageA(hTopPopupWnd, WM_CANCELMODE, 0, 0);
-    }
-  return(TRUE);
+  UNIMPLEMENTED;
+  return FALSE;
 }
 
 
@@ -587,8 +514,7 @@ EndMenu(VOID)
 HMENU STDCALL
 GetMenu(HWND hWnd)
 {
-  UNIMPLEMENTED;
-  return (HWND)0;
+  return (HMENU)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_GETMENU);
 }
 
 
@@ -618,50 +544,15 @@ GetMenuCheckMarkDimensions(VOID)
 
 
 /*
- * @implemented
+ * @unimplemented
  */
 UINT STDCALL
 GetMenuDefaultItem(HMENU hMenu,
 		   UINT fByPos,
 		   UINT gmdiFlags)
 {
-  PPOPUP_MENU Menu;
-  PMENUITEM Item;
-  ULONG i;
-
-  Menu = MenuGetMenu(hMenu);
-  
-  if (Menu->Items == NULL)
-    {
-      return(-1);
-    }
-
-  Item = Menu->Items;
-  while (!(Item->State & MFS_DEFAULT))
-    {
-      i++;
-      Item++;
-      if (i >= Menu->NrItems)
-	{
-	  return(-1);
-	}
-    }
-
-  if (!(gmdiFlags & GMDI_USEDISABLED) && (Item->State & MFS_DISABLED))
-    {
-      return(-1);
-    }
-
-  if ((Item->TypeData & MF_POPUP) && (gmdiFlags & GMDI_GOINTOPOPUPS))
-    {
-      UINT Ret;
-      Ret = GetMenuDefaultItem(Item->SubMenu, fByPos, gmdiFlags);
-      if (Ret != -1)
-	{
-	  return(Ret);
-	}
-    }
-  return(fByPos ? i : Item->Id);
+  UNIMPLEMENTED;
+  return -1;
 }
 
 
@@ -782,6 +673,7 @@ GetMenuState(
   mii.cbSize = sizeof(MENUITEMINFOW);
   mii.fMask = MIIM_STATE | MIIM_TYPE | MIIM_SUBMENU;
   
+  SetLastError(0);
   if(NtUserMenuItemInfo(hMenu, uId, uFlags, &mii, FALSE))
   {
     UINT nSubItems = 0;
@@ -790,7 +682,7 @@ GetMenuState(
       nSubItems = (UINT)NtUserBuildMenuItemList(mii.hSubMenu, NULL, 0, 0);
       
       /* FIXME - ported from wine, does that work (0xff)? */
-      if(GetLastError() != ERROR_INVALID_HANDLE)
+      if(GetLastError() != ERROR_INVALID_MENU_HANDLE)
         return (nSubItems << 8) | ((mii.fState | mii.fType) & 0xff);
 
       return (UINT)-1; /* Invalid submenu */
@@ -948,7 +840,6 @@ InsertMenuItemW(
   WINBOOL res = FALSE;
   BOOL CleanHeap = FALSE;
   ULONG len = 0;
-  NTSTATUS Status;
   HANDLE hHeap = RtlGetProcessHeap();
 
   if((lpmii->cbSize == sizeof(MENUITEMINFO)) || 
@@ -965,7 +856,7 @@ InsertMenuItemW(
       mi.dwTypeData = RtlAllocateHeap(hHeap, 0, (len + 1) * sizeof(WCHAR));
       if(!mi.dwTypeData)
       {
-        SetLastError (RtlNtStatusToDosError(Status));
+        SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY));
         return FALSE;
       }
       memcpy(&mi.dwTypeData, &lpmii->dwTypeData, len);
@@ -1006,8 +897,9 @@ STDCALL
 IsMenu(
   HMENU hMenu)
 {
+  SetLastError(ERROR_SUCCESS);
   DWORD ret = NtUserBuildMenuItemList(hMenu, NULL, 0, 0);
-  return ((ret != -1) && (GetLastError() != ERROR_INVALID_HANDLE));
+  return ((ret == -1) || (GetLastError() == ERROR_INVALID_MENU_HANDLE));
 }
 
 
@@ -1043,39 +935,39 @@ LoadMenuIndirectA(CONST MENUTEMPLATE *lpMenuTemplate)
 HMENU STDCALL
 LoadMenuIndirectW(CONST MENUTEMPLATE *lpMenuTemplate)
 {
-    HMENU hMenu;
-    WORD version, offset;
-    LPCSTR p = (LPCSTR)lpMenuTemplate;
+  HMENU hMenu;
+  WORD version, offset;
+  LPCSTR p = (LPCSTR)lpMenuTemplate;
 
-    version = GET_WORD(p);
-    p += sizeof(WORD);
+  version = GET_WORD(p);
+  p += sizeof(WORD);
 
-    switch (version)
-    {
-      case 0: /* standard format is version of 0 */
-	offset = GET_WORD(p);
-	p += sizeof(WORD) + offset;
-	if (!(hMenu = CreateMenu())) return 0;
-	if (!MENU_ParseResource( p, hMenu, TRUE ))
-	  {
-	    DestroyMenu( hMenu );
-	    return 0;
-	  }
-	return hMenu;
-      case 1: /* extended format is version of 1 */
-	offset = GET_WORD(p);
-	p += sizeof(WORD) + offset;
-	if (!(hMenu = CreateMenu())) return 0;
-	if (!MENUEX_ParseResource( p, hMenu))
-	  {
-	    DestroyMenu( hMenu );
-	    return 0;
-	  }
-	return hMenu;
-      default:
-        DbgPrint("LoadMenuIndirectW(): version %d not supported.\n", version);
+  switch (version)
+  {
+    case 0: /* standard format is version of 0 */
+      offset = GET_WORD(p);
+      p += sizeof(WORD) + offset;
+      if (!(hMenu = CreateMenu())) return 0;
+      if (!MENU_ParseResource(p, hMenu, TRUE))
+      {
+        DestroyMenu(hMenu);
         return 0;
-    }
+      }
+      return hMenu;
+    case 1: /* extended format is version of 1 */
+      offset = GET_WORD(p);
+      p += sizeof(WORD) + offset;
+      if (!(hMenu = CreateMenu())) return 0;
+      if (!MENUEX_ParseResource(p, hMenu))
+      {
+        DestroyMenu( hMenu );
+        return 0;
+      }
+      return hMenu;
+    default:
+      DbgPrint("LoadMenuIndirectW(): version %d not supported.\n", version);
+      return 0;
+  }
 }
 
 
@@ -1145,7 +1037,7 @@ ModifyMenuW(
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 WINBOOL
 STDCALL
@@ -1154,46 +1046,26 @@ RemoveMenu(
   UINT uPosition,
   UINT uFlags)
 {
-  UNIMPLEMENTED;
-  return FALSE;
+  return NtUserRemoveMenu(hMenu, uPosition, uFlags);
 }
 
 
 /*
- * @implemented
+ * @unimplemented
  */
 WINBOOL STDCALL
 SetMenu(HWND hWnd,
 	HMENU hMenu)
 {
-  ULONG Style = GetWindowLong(hWnd, GWL_STYLE);
-
-  if (Style & WS_CHILD)
-    {
-      return(FALSE);
-    }
-  if (GetCapture() == hWnd)
-    {
-      ReleaseCapture();
-    }
-  
-  SetWindowLong(hWnd, GWL_ID, (LONG)hMenu);
-      
-  if (hMenu != 0)
-    {
-      PPOPUP_MENU Menu;
-      
-      Menu = MenuGetMenu(hMenu);
-      
-      Menu->hWnd = hWnd;
-      Menu->Height = 0;
-    }
+  UNIMPLEMENTED;
+  /* from wine
   if (IsWindowVisible(hWnd))
     {
       SetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
 		   SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED);
     }
-  return(TRUE);
+  */
+  return FALSE;
 }
 
 
@@ -1346,591 +1218,3 @@ GetMenuContextHelpId(HMENU hmenu)
   return 0;
 }
 
-
-static BOOL
-MenuIsBitmapItem(ULONG TypeData)
-{
-  return((TypeData & MENU_TYPE_MASK) == MF_BITMAP);
-}
-
-static BOOL
-MenuIsMagicItem(LPWSTR Text)
-{
-  return(LOWORD((ULONG)Text) < 12);
-}
-
-static HBITMAP
-MenuLoadMagicItem(ULONG Id, ULONG Hilite, ULONG ItemData)
-{
-  UNIMPLEMENTED;
-  return(NULL);
-}
-
-static VOID
-MenuCalcItemSize(HDC hDC, PMENUITEM Item, HWND hWndOwner, LONG orgX, 
-		 LONG orgY, BOOL MenuBar)
-{
-  ULONG CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK);
-
-  SetRect(&Item->Rect, orgX, orgY, orgX, orgY);
-
-  if (Item->TypeData & MF_OWNERDRAW)
-    {
-      MEASUREITEMSTRUCT mis;
-
-      mis.CtlType = ODT_MENU;
-      mis.CtlID = 0;
-      mis.itemID = Item->Id;
-      mis.itemData = Item->ItemData;
-      mis.itemHeight = 0;
-      mis.itemWidth = 0;
-      SendMessageA(hWndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis);
-      Item->Rect.right += mis.itemWidth;
-
-      if (MenuBar)
-	{
-	  Item->Rect.right += MENU_BAR_ITEMS_SPACE;
-
-	  Item->Rect.bottom += GetSystemMetrics(SM_CYMENU);
-	}
-      else
-	{
-	  Item->Rect.bottom += mis.itemHeight;
-	}
-    }
-
-  if (Item->ItemData & MF_SEPARATOR)
-    {
-      Item->Rect.bottom += SEPARATOR_HEIGHT;
-      return;
-    }
-
-  if (!MenuBar)
-    {
-      Item->Rect.right += 2 * CheckBitmapWidth;
-      if (Item->TypeData & MF_POPUP)
-	{
-	  Item->Rect.right += ArrowBitmapWidth;
-	}
-    }
-
-  if (Item->TypeData & MF_OWNERDRAW)
-    {
-      return;
-    }
-
-  if (MenuIsBitmapItem(Item->TypeData))
-    {
-      HBITMAP Bmp;
-      BITMAP Bm;
-
-      if (MenuIsMagicItem(Item->Text))
-	{
-	  Bmp = MenuLoadMagicItem((LONG)Item->Text, 
-				  Item->TypeData & MF_HILITE,
-				  Item->ItemData);
-	}
-      else
-	{
-	  Bmp = (HBITMAP)Item->Text;
-	}
-
-      if (GetObjectA(Bmp, sizeof(Bm), &Bm))
-	{
-	  Item->Rect.right += Bm.bmWidth;
-	  Item->Rect.bottom += Bm.bmHeight;
-	}
-    }
-
-  if (MenuIsStringItem(Item->TypeData))
-    {
-      SIZE size;
-      LPWSTR p;
-
-      GetTextExtentPoint32W(hDC, Item->Text, wcslen(Item->Text), &size);
-
-      Item->Rect.right += size.cx;
-      Item->Rect.bottom += max(size.cy, GetSystemMetrics(SM_CYMENU));
-      Item->XTab = 0;
-
-      if (MenuBar)
-	{
-	  Item->Rect.right += MENU_BAR_ITEMS_SPACE;
-	}
-      else if ((p = wcschr(Item->Text, '\t')) != NULL)
-	{
-	  GetTextExtentPoint32W(hDC, Item->Text, (LONG)(p - Item->Text),
-				&size);
-	  Item->XTab = CheckBitmapWidth + MENU_TAB_SPACE + size.cx;
-	  Item->Rect.right += MENU_TAB_SPACE;
-	}
-      else 
-	{
-	  if (wcschr(Item->Text, '\b') != NULL)
-	    {
-	      Item->Rect.right += MENU_TAB_SPACE;
-	    }
-	  Item->XTab = Item->Rect.right - CheckBitmapWidth - ArrowBitmapWidth;
-	}
-    }
-}
-
-static VOID
-MenuMenuBarCalcSize(HDC hDC, LPRECT Rect, PPOPUP_MENU Menu, HWND hWndOwner)
-{
-  LONG maxY, start, helpPos, orgX, orgY, i;
-  PMENUITEM Item;
-
-  if (Rect == NULL || Menu == NULL)
-    {
-      return;
-    }
-  if (Menu->NrItems == 0)
-    {
-      return;
-    }
-  Menu->Width = Rect->right - Rect->left;
-  Menu->Height = 0;
-  maxY = Rect->top + 1;
-  start = 0;
-  helpPos = -1;
-  while (start < Menu->NrItems)
-    {
-      Item = Menu->Items + start;
-
-      orgX = Rect->left;
-      orgY = maxY;
-
-      for (i = start; i < Menu->NrItems; i++, Item++)
-	{
-	  if (helpPos == -1 && Item->TypeData & MF_RIGHTJUSTIFY)
-	    {
-	      helpPos = i;
-	    }
-	  if (i != start && Item->TypeData & (MF_MENUBREAK | MF_MENUBARBREAK))
-	    {
-	      break;
-	    }
-	  MenuCalcItemSize(hDC, Item, hWndOwner, orgX, orgY, TRUE);
-	  if (Item->Rect.right > Rect->right)
-	    {
-	      if (i != start)
-		{
-		  break;
-		}
-	      else
-		{
-		  Item->Rect.right = Rect->right;
-		}
-	    }
-	  maxY = max(maxY, Item->Rect.bottom);
-	  orgX = Item->Rect.right;
-	}
-
-      for (;start < i; start++)
-	{
-	  Menu->Items[start].Rect.bottom = maxY;
-	}
-    }
-
-  Rect->bottom = maxY;
-  Menu->Height = Rect->bottom - Rect->top;
-
-  Item = Menu->Items + Menu->NrItems - 1;
-  orgY = Item->Rect.top;
-  orgX = Rect->right;
-  for (i = Menu->NrItems; i >= helpPos; i--, Item--)
-    {
-      if (helpPos == -1 || helpPos > i)
-	{
-	  break;
-	}
-      if (Item->Rect.top != orgY)
-	{
-	  break;
-	}
-      if (Item->Rect.right >= orgX)
-	{
-	  break;
-	}
-      Item->Rect.left += orgX - Item->Rect.right;
-      Item->Rect.right = orgX;
-      orgX = Item->Rect.left;
-    }
-}
-
-VOID STATIC
-MenuDrawMenuItem(HWND hWnd, HMENU hMenu, HWND hWndOwner, HDC hDC,
-		 PMENUITEM Item, ULONG Height, BOOL MenuBar, ULONG OdAction)
-{
-  RECT Rect;
-
-  if (Item->ItemData & MF_SYSMENU)
-    {
-      if (!IsIconic(hWnd))
-	{
-	  UserDrawSysMenuButton(hWnd, hDC, 
-				Item->State & (MF_HILITE | MF_MOUSESELECT));
-	}
-      return;
-    }
-
-  if (Item->ItemData & MF_OWNERDRAW)
-    {
-      DRAWITEMSTRUCT dis;
-
-      dis.CtlType = ODT_MENU;
-      dis.CtlID = 0;
-      dis.itemID = Item->Id;
-      dis.itemData = (ULONG)Item->ItemData;
-      dis.itemState = 0;
-      if (Item->State & MF_CHECKED)
-	{
-	  dis.itemState |= ODS_CHECKED;
-	}
-      if (Item->State & MF_GRAYED)
-	{
-	  dis.itemState |= ODS_GRAYED;
-	}
-      if (Item->State & MF_HILITE)
-	{
-	  dis.itemState |= ODS_SELECTED;
-	}
-      dis.itemAction = OdAction;
-      dis.hDC = hDC;
-      dis.rcItem = Item->Rect;
-      SendMessageA(hWndOwner, WM_DRAWITEM, 0, (LPARAM)&dis);
-    }
-
-  if (MenuBar && (Item->TypeData & MF_SEPARATOR))
-    {
-      return;
-    }
-
-  Rect = Item->Rect;
-
-  if (!(Item->TypeData & MF_OWNERDRAW))
-    {
-      if (Item->State & MF_HILITE)
-	{
-	  if (!MenuIsBitmapItem(Item->TypeData))
-	    {
-	      FillRect(hDC, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT));
-	    }
-	}
-      else
-	{
-	  FillRect(hDC, &Rect, GetSysColorBrush(COLOR_MENU));
-	}
-    }
-
-  SetBkMode(hDC, TRANSPARENT);
-
-  if (!(Item->TypeData & MF_OWNERDRAW))
-    {
-      if (!MenuBar && (Item->TypeData & MF_MENUBARBREAK))
-	{
-	  SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
-	  MoveToEx(hDC, Rect.left, 0, NULL);
-	  LineTo(hDC, Rect.left, Height);
-	}
-      if (Item->TypeData & MF_SEPARATOR)
-	{
-	  SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
-	  MoveToEx(hDC, Rect.left, Rect.right + (SEPARATOR_HEIGHT / 2), NULL);
-	  LineTo(hDC, Rect.right, Rect.top + (SEPARATOR_HEIGHT / 2));
-	  return;
-	}
-    }
-
-  if (Item->State & MF_HILITE)
-    {
-      SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-      if (!MenuIsBitmapItem(Item->Type))
-	{
-	  SetBkColor(hDC, GetSysColor(COLOR_HIGHLIGHT));
-	}
-    }
-  else
-    {
-      if (Item->State & MF_GRAYED)
-	{
-	  SetTextColor(hDC, GetSysColor(COLOR_GRAYTEXT));
-	}
-      else
-	{
-	  SetTextColor(hDC, GetSysColor(COLOR_MENUTEXT));
-	}
-      SetBkColor(hDC, GetSysColor(COLOR_MENU));
-    }
-
-  if (!MenuBar)
-    {
-      LONG y = Rect.top + Rect.bottom;
-      ULONG CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK);
-      ULONG CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK);
-      
-      if (!(Item->TypeData & MF_OWNERDRAW))
-	{
-	  HBITMAP bm;
-	  if (Item->TypeData & MF_CHECKED)
-	    {
-	      bm = Item->CheckBit;
-	    }
-	  else
-	    {
-	      bm = Item->UnCheckBit;
-	    }
-	  if (bm)
-	    {
-	      HDC hDCMem = CreateCompatibleDC(hDC);
-	      SelectObject(hDCMem, bm);
-	      BitBlt(hDC, 
-		     Rect.left, 
-		     (y - CheckBitmapHeight) / 2,
-		     CheckBitmapWidth,
-		     CheckBitmapHeight,
-		     hDCMem,
-		     0,
-		     0,
-		     SRCCOPY);
-	      DeleteDC(hDCMem);
-	    }
-	  else if (Item->TypeData & MF_CHECKED)
-	    {
-	      RECT r;
-	      ULONG Type;
-	      HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight,
-					1, 1, NULL);
-	      HDC hDCMem = CreateCompatibleDC(hDC);
-	      SelectObject(hDCMem, bm);
-	      SetRect(&r, 0, 0, CheckBitmapWidth, CheckBitmapHeight);
-	      if (Item->TypeData & MFT_RADIOCHECK)
-		{
-		  Type = DFCS_MENUBULLET;
-		}
-	      else
-		{
-		  Type = DFCS_MENUCHECK;
-		}
-	      DrawFrameControl(hDCMem, &r, DFC_MENU, Type);
-	      BitBlt(hDC, Rect.left, (y - r.bottom) / 2, r.right, r.bottom,
-		     hDCMem, 0, 0, SRCCOPY);
-	      DeleteDC(hDCMem);
-	      DeleteObject(bm);
-	    }
-	}
-
-      if (Item->TypeData & MF_POPUP)
-	{
-	  HDC hDCMem = CreateCompatibleDC(hDC);
-
-	  SelectObject(hDCMem, hStdMnArrow);
-	  BitBlt(hDC, 
-		 Rect.right - ArrowBitmapWidth - 1,
-		 (y - ArrowBitmapHeight) / 2,
-		 ArrowBitmapWidth,
-		 ArrowBitmapHeight,
-		 hDCMem,
-		 0,
-		 0,
-		 SRCCOPY);
-	  DeleteDC(hDCMem);
-	}
-
-      Rect.left += CheckBitmapWidth;
-      Rect.right -= ArrowBitmapWidth;
-    }
-
-  if (Item->TypeData & MF_OWNERDRAW)
-    {
-      return;
-    }
-
-  if (MenuIsBitmapItem(Item->TypeData))
-    {
-      LONG left, top, w, h;
-      ULONG Rop;
-      HBITMAP ResBmp = 0;
-      HDC hDCMem = CreateCompatibleDC(hDC);
-
-      if (MenuIsMagicItem(Item->Text))
-	{
-	  ResBmp = MenuLoadMagicItem((LONG)Item->Text, Item->State & MF_HILITE,
-				     Item->ItemData);
-	}
-      else
-	{
-	  ResBmp = (HBITMAP)Item->Text;
-	}
-
-      if (ResBmp)
-	{
-	  BITMAP Bm;
-
-	  GetObjectA(ResBmp, sizeof(Bm), &Bm);
-	  SelectObject(hDCMem, ResBmp);
-	  h = Rect.bottom - Rect.top;
-	  if (h > Bm.bmHeight) 
-	    {
-	      top = Rect.top + (h - Bm.bmHeight) / 2;
-	    }
-	  else
-	    {
-	      top = Rect.top;
-	    }
-	  w = Rect.right - Rect.left;
-	  left = Rect.left;
-	  left++;
-	  w -= 2;
-	  if ((Item->State & MF_HILITE) && !MenuIsMagicItem(Item->Text) &&
-	      !MenuBar)
-	    {
-	      Rop = MERGEPAINT;
-	    }
-	  else
-	    {
-	      Rop = SRCCOPY;
-	    }
-	  BitBlt(hDC, left, top, w, h, hDCMem, 0, 0, Rop);
-	}
-      DeleteDC(hDCMem);
-      return;
-    }
-  else if (MenuIsStringItem(Item->Type))
-    {
-      LONG i;
-      HFONT hFontOld = 0;
-      UINT Format = (MenuBar) ? DT_CENTER | DT_VCENTER | DT_SINGLELINE :
-	DT_LEFT | DT_VCENTER | DT_SINGLELINE;
-
-      if (Item->State & MFS_DEFAULT)
-	{
-	  hFontOld = SelectObject(hDC, hMenuFontBold);
-	}
-
-      if (MenuBar)
-	{
-	  Rect.left += MENU_BAR_ITEMS_SPACE / 2;
-	  Rect.right += MENU_BAR_ITEMS_SPACE / 2;
-	  i = wcslen(Item->Text);
-	}
-      else
-	{
-	  for (i = 0; i < wcslen(Item->Text); i++)
-	    {
-	      if (Item->Text[i] == '\t' || Item->Text[i] == '\b')
-		{
-		  break;
-		}
-	    }
-	}
-
-      DrawTextW(hDC, Item->Text, i, &Rect, Format);
-
-      if (Item->Text[i] != '\0')
-	{
-	  if (Item->Text[i] == '\t')
-	    {
-	      Rect.left = Item->XTab;
-	      Format = DT_LEFT | DT_VCENTER | DT_SINGLELINE;
-	    }
-	  else
-	    {
-	      Format = DT_RIGHT | DT_VCENTER | DT_SINGLELINE;
-	    }
-	  DrawTextW(hDC, Item->Text + i + 1, -1, &Rect, Format);
-	}
-
-      if (hFontOld != 0)
-	{
-	  SelectObject(hDC, hFontOld);
-	}
-    }
-}
-
-UINT
-MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw)
-{
-  ULONG MenuID;
-  PPOPUP_MENU Menu;
-  HFONT hFontOld;
-  ULONG i;
-
-  MenuID = GetWindowLong(hWnd, GWL_ID);
-  Menu = MenuGetMenu((HMENU)MenuID);
-
-  if (Menu == NULL || Rect == NULL)
-    {
-      return(GetSystemMetrics(SM_CYMENU));
-    }
-
-  hFontOld = SelectObject(hDC, hMenuFont);
-
-  if (Menu->Height == 0)
-    {
-      MenuMenuBarCalcSize(hDC, Rect, Menu, hWnd);
-    }
-
-  Rect->bottom = Rect->top + Menu->Height;
-
-  if (!Draw)
-    {
-      SelectObject(hDC, hFontOld);
-      return(Menu->Height);
-    }
-
-  FillRect(hDC, Rect, GetSysColorBrush(COLOR_MENU));
-
-  SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME));
-  MoveToEx(hDC, Rect->left, Rect->bottom, NULL);
-  LineTo(hDC, Rect->right, Rect->bottom);
-
-  if (Menu->NrItems == 0)
-    {
-      SelectObject(hDC, hFontOld);
-      return(GetSystemMetrics(SM_CYMENU));
-    }
-
-  for (i = 0; i < Menu->NrItems; i++)
-    {
-      MenuDrawMenuItem(hWnd, (HMENU)MenuID, hWnd, hDC,
-		       Menu->Items + i, Menu->Height, TRUE, ODA_DRAWENTIRE);
-    }
-
-  SelectObject(hDC, hFontOld);
-  return(Menu->Height);
-}
-
-ULONG
-MenuGetMenuBarHeight(HWND hWnd, ULONG MenuBarWidth, LONG OrgX, LONG OrgY)
-{
-  ULONG MenuId;
-  PPOPUP_MENU Menu;
-  RECT Rect;
-  HDC hDC;
-
-  MenuId = GetWindowLong(hWnd, GWL_ID);
-  Menu = MenuGetMenu((HMENU)MenuId);
-  if (Menu == NULL)
-    {
-      return(0);
-    }
-  hDC = GetDCEx(hWnd, 0, DCX_CACHE | DCX_WINDOW);
-  SelectObject(hDC, hMenuFont);
-  SetRect(&Rect, OrgX, OrgY, OrgX + MenuBarWidth, 
-	  OrgY + GetSystemMetrics(SM_CYMENU));
-  MenuMenuBarCalcSize(hDC, &Rect, Menu, hWnd);
-  ReleaseDC(hWnd, hDC);
-  return(Menu->Height);
-}
-
-VOID
-MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt)
-{
-}
-
-VOID
-MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key)
-{
-}
diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index fd1a5b43507..ec6a8dca36f 100644
--- a/reactos/subsys/win32k/ntuser/menu.c
+++ b/reactos/subsys/win32k/ntuser/menu.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.9 2003/08/05 19:50:57 weiden Exp $
+/* $Id: menu.c,v 1.10 2003/08/06 11:32:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -101,7 +101,7 @@ CleanupMenuImpl(VOID)
   return(STATUS_SUCCESS);
 }
 
-#if 0
+#if 1
 void FASTCALL
 DumpMenuItemList(PMENU_ITEM MenuItem)
 {
@@ -532,7 +532,7 @@ W32kInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, WINBOOL fByPosition,
   }
   
   pos = W32kInsertMenuItemToList(MenuObject, MenuItem, pos);
-  
+  DumpMenuItemList(MenuObject->MenuItemList);
   return pos >= 0;
 }
 
@@ -713,7 +713,7 @@ NtUserBuildMenuItemList(
   PMENU_OBJECT MenuObject = W32kGetMenuObject(hMenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return -1;
   }
   
@@ -730,7 +730,9 @@ NtUserBuildMenuItemList(
   {
     res = MenuObject->MenuItemCount;
   }
+  
   W32kReleaseMenuObject(MenuObject);
+
   return res;
 }
 
@@ -748,7 +750,7 @@ NtUserCheckMenuItem(
   PMENU_OBJECT MenuObject = W32kGetMenuObject(hmenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return (DWORD)-1;
   }
   ExAcquireFastMutexUnsafe(&MenuObject->MenuItemsLock);
@@ -815,7 +817,7 @@ NtUserDestroyMenu(
   PMENU_OBJECT MenuObject = W32kGetMenuObject(hMenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return FALSE;
   }
 
@@ -837,7 +839,7 @@ NtUserEnableMenuItem(
   MenuObject = W32kGetMenuObject(hMenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return res;
   }
   ExAcquireFastMutexUnsafe(&MenuObject->MenuItemsLock);
@@ -864,7 +866,7 @@ NtUserInsertMenuItem(
   MenuObject = W32kGetMenuObject(hMenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return 0;
   }
   ExAcquireFastMutexUnsafe(&MenuObject->MenuItemsLock);
@@ -955,7 +957,7 @@ NtUserHiliteMenuItem(
   if(!MenuObject)
   {
     W32kReleaseWindowObject(WindowObject);
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return res;
   }
   if(WindowObject->Menu == hmenu)
@@ -991,7 +993,7 @@ NtUserMenuInfo(
   MenuObject = W32kGetMenuObject(hmenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return FALSE;
   }  
   if(fsog)
@@ -1070,7 +1072,7 @@ NtUserSetMenuContextHelpId(
   PMENU_OBJECT MenuObject = W32kGetMenuObject(hmenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return FALSE;
   }
 
@@ -1094,7 +1096,7 @@ NtUserSetMenuDefaultItem(
   MenuObject = W32kGetMenuObject(hMenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return FALSE;
   }
   ExAcquireFastMutexUnsafe(&MenuObject->MenuItemsLock);
@@ -1117,7 +1119,7 @@ NtUserSetMenuFlagRtoL(
   PMENU_OBJECT MenuObject = W32kGetMenuObject(hMenu);
   if(!MenuObject)
   {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
+    SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
     return FALSE;
   }
 
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index ace4aedbe55..5defd35157a 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.1 2003/05/26 18:52:37 gvg Exp $
+/* $Id: misc.c,v 1.2 2003/08/06 11:32:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -18,6 +18,65 @@
 #include <debug.h>
 
 
+DWORD
+STDCALL
+NtUserCallNoParam(
+  DWORD Routine)
+{
+/*
+  switch(Routine)
+  {
+    case 1:
+      return 0;
+  }
+  DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam()\n", Routine);
+  SetLastWin32Error(ERROR_INVALID_PARAMETER);
+*/
+  UNIMPLEMENTED
+  return 0;
+}
+
+
+DWORD
+STDCALL
+NtUserCallOneParam(
+  DWORD Param,
+  DWORD Routine)
+{
+  DWORD Result = 0;
+  PWINDOW_OBJECT WindowObject;
+  switch(Routine)
+  {
+    case ONEPARAM_ROUTINE_GETMENU:
+      WindowObject = W32kGetWindowObject((HWND)Param);
+      if(!WindowObject)
+      {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return FALSE;
+      }
+      Result = WindowObject->Menu;
+      DbgPrint("ONEPARAM_ROUTINE_GETMENU = 0x%x\n", Result);
+      W32kReleaseWindowObject(WindowObject);
+      return Result;
+    case ONEPARAM_ROUTINE_ISWINDOWUNICODE:
+      WindowObject = W32kGetWindowObject((HWND)Param);
+      if(!WindowObject)
+      {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        return FALSE;
+      }
+      Result = WindowObject->Unicode;
+      W32kReleaseWindowObject(WindowObject);
+      return Result;
+
+  }
+  DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam()\n Param=0x%x\n", 
+          Routine, Param);
+  SetLastWin32Error(ERROR_INVALID_PARAMETER);
+  return 0;
+}
+
+
 DWORD
 STDCALL
 NtUserCallTwoParam(
@@ -25,36 +84,30 @@ NtUserCallTwoParam(
   DWORD Param2,
   DWORD Routine)
 {
-  DWORD Result;
-
   switch(Routine)
-    {
-      case TWOPARAM_ROUTINE_ENABLEWINDOW:
-	UNIMPLEMENTED
-	break;
+  {
+    case TWOPARAM_ROUTINE_ENABLEWINDOW:
+	  UNIMPLEMENTED
+      return 0;
 
-      case TWOPARAM_ROUTINE_UNKNOWN:
-	UNIMPLEMENTED
-	break;
+    case TWOPARAM_ROUTINE_UNKNOWN:
+	  UNIMPLEMENTED
+	  return 0;
 
-      case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS:
-	UNIMPLEMENTED
-	break;
+    case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS:
+	  UNIMPLEMENTED
+	  return 0;
 
-      case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW:
-	UNIMPLEMENTED
-	break;
+    case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW:
+	  UNIMPLEMENTED
+	  return 0;
 
-      case TWOPARAM_ROUTINE_VALIDATERGN:
-	Result = (DWORD) NtUserValidateRgn((HWND) Param1, (HRGN) Param2);
-	break;
+    case TWOPARAM_ROUTINE_VALIDATERGN:
+      return (DWORD)NtUserValidateRgn((HWND) Param1, (HRGN) Param2);
 
-      default:
-	DPRINT1("Calling invalid routine number 0x%x in NtUserCallTwoParam\n");
-	SetLastWin32Error(ERROR_INVALID_PARAMETER);
-	Result = 0;
-	break;
-    }
-
-  return Result;
+  }
+  DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam()\n Param1=0x%x Parm2=0x%x\n",
+          Routine, Param1, Param2);
+  SetLastWin32Error(ERROR_INVALID_PARAMETER);
+  return 0;
 }
diff --git a/reactos/subsys/win32k/ntuser/stubs.c b/reactos/subsys/win32k/ntuser/stubs.c
index 1fcc9f91ed9..60bf15a664d 100644
--- a/reactos/subsys/win32k/ntuser/stubs.c
+++ b/reactos/subsys/win32k/ntuser/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.22 2003/08/04 16:54:54 gdalsnes Exp $
+/* $Id: stubs.c,v 1.23 2003/08/06 11:32:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -148,27 +148,6 @@ NtUserCallMsgFilter(
   return 0;
 }
 
-DWORD
-STDCALL
-NtUserCallNoParam(
-  DWORD Unknown0)
-{
-  UNIMPLEMENTED
-
-  return 0;
-}
-
-DWORD
-STDCALL
-NtUserCallOneParam(
-  DWORD Unknown0,
-  DWORD Unknown1)
-{
-  UNIMPLEMENTED
-
-  return 0;
-}
-
 DWORD
 STDCALL
 NtUserChangeClipboardChain(