commit 601a3abec125bce86e87e1cadcccbe22c7ea6a40
author Dmitry Timoshkov <dmitry@baikal.ru> Thu Oct 31 01:04:39 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 31 01:04:39 2002 +0000
tree 6dd549783fef6dc55265166c1d388023f1ca2be7
parent ac5de27d1ca85e86ea6ccd388771cdcd193455e6

Fix some types and function prototypes according to Platform SDK
definitions.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index 2bb7f2d..7889b9d 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -61,7 +61,7 @@
     /* ----------- MENUITEMINFO Stuff ----------- */
     UINT fType;			/* Item type. */
     UINT fState;		/* Item state.  */
-    UINT wID;			/* Item id.  */
+    UINT_PTR wID;		/* Item id.  */
     HMENU hSubMenu;		/* Pop-up menu.  */
     HBITMAP hCheckBit;		/* Bitmap when checked.  */
     HBITMAP hUnCheckBit;	/* Bitmap when unchecked.  */
@@ -1757,7 +1757,7 @@
  * Set an item's flags, id and text ptr. Called by InsertMenu() and
  * ModifyMenu().
  */
-static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT id,
+static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT_PTR id,
                                 LPCWSTR str )
 {
     LPWSTR prevText = IS_STRING_ITEM(item->fType) ? item->text : NULL;
@@ -3531,7 +3531,7 @@
  *         InsertMenuW    (USER32.@)
  */
 BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags,
-                             UINT id, LPCWSTR str )
+                         UINT_PTR id, LPCWSTR str )
 {
     MENUITEM *item;
 
@@ -3563,7 +3563,7 @@
  *         InsertMenuA    (USER32.@)
  */
 BOOL WINAPI InsertMenuA( HMENU hMenu, UINT pos, UINT flags,
-                             UINT id, LPCSTR str )
+                         UINT_PTR id, LPCSTR str )
 {
     BOOL ret = FALSE;
 
@@ -3596,7 +3596,7 @@
  *         AppendMenuA    (USER32.@)
  */
 BOOL WINAPI AppendMenuA( HMENU hMenu, UINT flags,
-                             UINT id, LPCSTR data )
+                         UINT_PTR id, LPCSTR data )
 {
     return InsertMenuA( hMenu, -1, flags | MF_BYPOSITION, id, data );
 }
@@ -3606,7 +3606,7 @@
  *         AppendMenuW    (USER32.@)
  */
 BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags,
-                             UINT id, LPCWSTR data )
+                         UINT_PTR id, LPCWSTR data )
 {
     return InsertMenuW( hMenu, -1, flags | MF_BYPOSITION, id, data );
 }
@@ -3696,7 +3696,7 @@
  *         ModifyMenuW    (USER32.@)
  */
 BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags,
-                             UINT id, LPCWSTR str )
+                         UINT_PTR id, LPCWSTR str )
 {
     MENUITEM *item;
 
@@ -3721,7 +3721,7 @@
  *         ModifyMenuA    (USER32.@)
  */
 BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags,
-                             UINT id, LPCSTR str )
+                         UINT_PTR id, LPCSTR str )
 {
     BOOL ret = FALSE;