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.

dlls/comctl32/commctrl.c

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 20af987..13e483d 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -119,7 +119,7 @@
             COMCTL32_hModule = (HMODULE)hinstDLL;
 
             /* add global subclassing atom (used by 'tooltip' and 'updown') */
-            COMCTL32_wSubclass = (LPWSTR)(DWORD)GlobalAddAtomW (strCC32SubclassInfo);
+            COMCTL32_wSubclass = (LPWSTR)(DWORD_PTR)GlobalAddAtomW (strCC32SubclassInfo);
             TRACE("Subclassing atom added: %p\n", COMCTL32_wSubclass);
 
             /* create local pattern brush */
@@ -308,7 +308,7 @@
  */
 
 BOOL WINAPI
-ShowHideMenuCtl (HWND hwnd, UINT uFlags, LPINT lpInfo)
+ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo)
 {
     LPINT lpMenuId;
 
@@ -325,9 +325,9 @@
     while (*lpMenuId != uFlags)
 	lpMenuId += 2;
 
-    if (GetMenuState ((HMENU)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
+    if (GetMenuState ((HMENU)(DWORD_PTR)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
 	/* uncheck menu item */
-	CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
+	CheckMenuItem ((HMENU)(DWORD_PTR)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
 
 	/* hide control */
 	lpMenuId++;
@@ -336,7 +336,7 @@
     }
     else {
 	/* check menu item */
-	CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
+	CheckMenuItem ((HMENU)(DWORD_PTR)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
 
 	/* show control */
 	lpMenuId++;
@@ -376,8 +376,8 @@
     INT  *lpRun;
     HWND hwndCtrl;
 
-    TRACE("(0x%08lx 0x%08lx 0x%08lx)\n",
-	   (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
+    TRACE("(%p %p %p)\n",
+	   hwnd, lpRect, lpInfo);
 
     GetClientRect (hwnd, lpRect);
     lpRun = lpInfo;
@@ -506,7 +506,7 @@
     return CreateWindowA(STATUSCLASSNAMEA, text, style,
 			   CW_USEDEFAULT, CW_USEDEFAULT,
 			   CW_USEDEFAULT, CW_USEDEFAULT,
-			   parent, (HMENU)wid, 0, 0);
+			   parent, (HMENU)(DWORD_PTR)wid, 0, 0);
 }
 
 
@@ -532,7 +532,7 @@
     return CreateWindowW(STATUSCLASSNAMEW, text, style,
 			   CW_USEDEFAULT, CW_USEDEFAULT,
 			   CW_USEDEFAULT, CW_USEDEFAULT,
-			   parent, (HMENU)wid, 0, 0);
+			   parent, (HMENU)(DWORD_PTR)wid, 0, 0);
 }
 
 
@@ -567,7 +567,7 @@
 {
     HWND hUD =
 	CreateWindowW (UPDOWN_CLASSW, 0, style, x, y, cx, cy,
-			 parent, (HMENU)id, inst, 0);
+			 parent, (HMENU)(DWORD_PTR)id, inst, 0);
     if (hUD) {
 	SendMessageW (hUD, UDM_SETBUDDY, (WPARAM)buddy, 0);
 	SendMessageW (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal));
@@ -728,7 +728,7 @@
 
     hwndTB =
         CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style|WS_CHILD, 0,0,100,30,
-                        hwnd, (HMENU)wID, COMCTL32_hModule, NULL);
+                        hwnd, (HMENU)(DWORD_PTR)wID, COMCTL32_hModule, NULL);
     if(hwndTB) {
 	TBADDBITMAP tbab;
 
@@ -787,7 +787,7 @@
  */
 
 HBITMAP WINAPI
-CreateMappedBitmap (HINSTANCE hInstance, INT idBitmap, UINT wFlags,
+CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags,
 		    LPCOLORMAP lpColorMap, INT iNumMaps)
 {
     HGLOBAL hglb;