From 36629a61f8f7ed63cdb53be456a04a6fee3d97bb Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 1 Aug 2003 11:57:08 +0000
Subject: [PATCH] Changed a few definitions

svn path=/trunk/; revision=5363
---
 reactos/include/win32k/ntuser.h      | 24 ++++++++--------
 reactos/subsys/win32k/include/menu.h | 24 ++++++++--------
 reactos/subsys/win32k/ntuser/menu.c  | 41 +++++++++-------------------
 3 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index 887805ece5e..0dafbf0be66 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -425,10 +425,10 @@ NtUserDrawIconEx(
 DWORD
 STDCALL
 NtUserDrawMenuBarTemp(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
+  HWND hWnd,
+  HDC hDC,
+  PRECT hRect,
+  HMENU hMenu,
   DWORD Unknown4);
 
 DWORD
@@ -1598,18 +1598,18 @@ NtUserSystemParametersInfo(
 DWORD
 STDCALL
 NtUserThunkedMenuInfo(
-  DWORD Unknown0,
-  DWORD Unknown1);
+  HMENU hMenu,
+  LPCMENUINFO lpcmi);
 
 DWORD
 STDCALL
 NtUserThunkedMenuItemInfo(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
-  DWORD Unknown4,
-  DWORD Unknown5);
+  HMENU hMenu,
+  UINT uItem,
+  BOOL fByPosition,
+  BOOL bInsert,
+  LPMENUITEMINFO lpmii,
+  PUNICODE_STRING lpszCaption);
 
 DWORD
 STDCALL
diff --git a/reactos/subsys/win32k/include/menu.h b/reactos/subsys/win32k/include/menu.h
index 187b9380a29..e573fc007d7 100644
--- a/reactos/subsys/win32k/include/menu.h
+++ b/reactos/subsys/win32k/include/menu.h
@@ -60,10 +60,10 @@ NtUserDestroyMenu(
 DWORD
 STDCALL
 NtUserDrawMenuBarTemp(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
+  HWND hWnd,
+  HDC hDC,
+  PRECT hRect,
+  HMENU hMenu,
   DWORD Unknown4);
   
 BOOL
@@ -167,18 +167,18 @@ NtUserSetMenuFlagRtoL(
 DWORD
 STDCALL
 NtUserThunkedMenuInfo(
-  DWORD Unknown0,
-  DWORD Unknown1);
+  HMENU hMenu,
+  LPCMENUINFO lpcmi);
   
 DWORD
 STDCALL
 NtUserThunkedMenuItemInfo(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
-  DWORD Unknown4,
-  DWORD Unknown5);
+  HMENU hMenu,
+  UINT uItem,
+  BOOL fByPosition,
+  BOOL bInsert,
+  LPMENUITEMINFO lpmii,
+  PUNICODE_STRING lpszCaption);
   
 BOOL
 STDCALL
diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index ca5ecee5acf..a327d9b892f 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.2 2003/08/01 10:56:28 weiden Exp $
+/* $Id: menu.c,v 1.3 2003/08/01 11:56:19 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -244,23 +244,6 @@ NtUserDestroyMenu(
 }
 
 
-/*
- * @unimplemented
- */
-DWORD STDCALL
-NtUserDrawMenuBarTemp(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
-  DWORD Unknown4)
-{
-  UNIMPLEMENTED
-
-  return 0;
-}
-
-
 /*
  * @unimplemented
  */
@@ -490,11 +473,11 @@ NtUserSetMenuFlagRtoL(
  */
 DWORD STDCALL
 NtUserThunkedMenuInfo(
-  DWORD Unknown0,
-  DWORD Unknown1)
+  HMENU hMenu,
+  LPCMENUINFO lpcmi)
 {
   UNIMPLEMENTED
-
+  /* This function seems just to call SetMenuInfo() */
   return 0;
 }
 
@@ -504,15 +487,17 @@ NtUserThunkedMenuInfo(
  */
 DWORD STDCALL
 NtUserThunkedMenuItemInfo(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
-  DWORD Unknown4,
-  DWORD Unknown5)
+  HMENU hMenu,
+  UINT uItem,
+  BOOL fByPosition,
+  BOOL bInsert,
+  LPMENUITEMINFO lpmii,
+  PUNICODE_STRING lpszCaption)
 {
   UNIMPLEMENTED
-
+  /* lpszCaption may be NULL, check for it and call RtlInitUnicodeString()
+     if bInsert == TRUE call NtUserInsertMenuItem() else NtUserSetMenuItemInfo()
+  */
   return 0;
 }