commit 9e57091ffa073649191d33fdcc59d52aebced09c
author Frank Richter <frank.richter@gmail.com> Tue Aug 30 10:07:17 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 30 10:07:17 2005 +0000
tree 20bff929d50dcfa9b4b40e2ab4ffcb395a35c672
parent ea61fd376fd664363362566e753e78b7dd116429

Fix warnings in 64bit.

include/commctrl.h

diff --git a/include/commctrl.h b/include/commctrl.h
index 2fbdd22..0513823 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-BOOL WINAPI ShowHideMenuCtl (HWND, UINT, LPINT);
+BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT);
 VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, LPINT);
 VOID WINAPI InitCommonControls (VOID);
 
@@ -155,8 +155,8 @@
 typedef struct tagNMMOUSE
 {
     NMHDR   hdr;
-    DWORD   dwItemSpec;
-    DWORD   dwItemData;
+    DWORD_PTR   dwItemSpec;
+    DWORD_PTR   dwItemData;
     POINT   pt;
     DWORD   dwHitInfo;   /* info where on item or control the mouse is */
 } NMMOUSE, *LPNMMOUSE;
@@ -261,7 +261,7 @@
 	DWORD	dwDrawStage;
 	HDC	hdc;
 	RECT	rc;
-	DWORD	dwItemSpec;
+	DWORD_PTR dwItemSpec;
 	UINT	uItemState;
 	LPARAM	lItemlParam;
 } NMCUSTOMDRAW, *LPNMCUSTOMDRAW;
@@ -1293,8 +1293,8 @@
     BYTE  fsState;
     BYTE  fsStyle;
     BYTE  bReserved[2];
-    DWORD dwData;
-    INT iString;
+    DWORD_PTR dwData;
+    INT_PTR iString;
 } TBBUTTON, *PTBBUTTON, *LPTBBUTTON;
 typedef const TBBUTTON *LPCTBBUTTON;
 
@@ -1307,7 +1307,7 @@
 
 typedef struct tagTBADDBITMAP {
     HINSTANCE hInst;
-    UINT      nID;
+    UINT_PTR  nID;
 } TBADDBITMAP, *LPTBADDBITMAP;
 
 #define HINST_COMMCTRL         ((HINSTANCE)-1)
@@ -1378,7 +1378,7 @@
     BYTE   fsState;
     BYTE   fsStyle;
     WORD   cx;
-    DWORD  lParam;
+    DWORD_PTR lParam;
     LPSTR  pszText;
     INT  cchText;
 } TBBUTTONINFOA, *LPTBBUTTONINFOA;
@@ -1392,7 +1392,7 @@
     BYTE   fsState;
     BYTE   fsStyle;
     WORD   cx;
-    DWORD  lParam;
+    DWORD_PTR lParam;
     LPWSTR pszText;
     INT  cchText;
 } TBBUTTONINFOW, *LPTBBUTTONINFOW;
@@ -1434,7 +1434,7 @@
     NMHDR hdr;
     DWORD dwMask;
     int idCommand;
-    DWORD lParam;
+    DWORD_PTR lParam;
     int iImage;
     LPSTR pszText;
     int cchText;
@@ -1445,7 +1445,7 @@
     NMHDR hdr;
     DWORD dwMask;
     int idCommand;
-    DWORD lParam;
+    DWORD_PTR lParam;
     int iImage;
     LPWSTR pszText;
     int cchText;
@@ -1488,9 +1488,9 @@
 typedef struct
 {
 	HINSTANCE hInstOld;
-	UINT      nIDOld;
+	UINT_PTR  nIDOld;
 	HINSTANCE hInstNew;
-	UINT      nIDNew;
+	UINT_PTR  nIDNew;
 	INT       nButtons;
 } TBREPLACEBITMAP, *LPTBREPLACEBITMAP;
 
@@ -1562,7 +1562,7 @@
                 INT, INT, INT, INT, INT, UINT);
 
 HBITMAP WINAPI
-CreateMappedBitmap (HINSTANCE, INT, UINT, LPCOLORMAP, INT);
+CreateMappedBitmap (HINSTANCE, INT_PTR, UINT, LPCOLORMAP, INT);
 
 
 /* Tool tips */
@@ -1684,7 +1684,7 @@
     UINT cbSize;
     UINT uFlags;
     HWND hwnd;
-    UINT uId;
+    UINT_PTR uId;
     RECT rect;
     HINSTANCE hinst;
     LPSTR lpszText;
@@ -1696,7 +1696,7 @@
     UINT cbSize;
     UINT uFlags;
     HWND hwnd;
-    UINT uId;
+    UINT_PTR uId;
     RECT rect;
     HINSTANCE hinst;
     LPWSTR lpszText;