Fix some types and function prototypes according to Platform SDK

controls/menu.c

@@ -61,7 +61,7 @@ typedef struct {
     /* ----------- 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 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset )
  * 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 @@ BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags,
  *         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 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags,
  *         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 @@ BOOL16 WINAPI AppendMenu16(HMENU16 hMenu, UINT16 flags, UINT16 id, SEGPTR data)
  *         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 @@ BOOL WINAPI AppendMenuA( HMENU hMenu, UINT flags,
  *         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 @@ BOOL16 WINAPI ModifyMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags,
  *         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 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags,
  *         ModifyMenuA    (USER32.@)
  */
 BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags,
-                             UINT id, LPCSTR str )
+                         UINT_PTR id, LPCSTR str )
 {
     BOOL ret = FALSE;
 

dlls/avifil32/api.c

@@ -1272,7 +1272,7 @@ static void AVISaveOptionsUpdate(HWND hWnd)
 
 }
 
-BOOL CALLBACK AVISaveOptionsDlgProc(HWND hWnd, UINT uMsg,
+INT_PTR CALLBACK AVISaveOptionsDlgProc(HWND hWnd, UINT uMsg,
 				    WPARAM wParam, LPARAM lParam)
 {
   DWORD dwInterleave;

dlls/comctl32/propsheet.c

@@ -170,7 +170,7 @@ static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheet
 static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg);
 static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID);
 
-BOOL WINAPI
+INT_PTR CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 WINE_DEFAULT_DEBUG_CHANNEL(propsheet);
@@ -592,13 +592,13 @@ BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
       ret = DialogBoxIndirectParamW(psInfo->ppshheader.hInstance,
                                     (LPDLGTEMPLATEW) temp,
                                     psInfo->ppshheader.hwndParent,
-                                    (DLGPROC) PROPSHEET_DialogProc,
+                                    PROPSHEET_DialogProc,
                                     (LPARAM)psInfo);
   else
       ret = CreateDialogIndirectParamW(psInfo->ppshheader.hInstance,
                                        (LPDLGTEMPLATEW) temp,
                                        psInfo->ppshheader.hwndParent,
-                                       (DLGPROC) PROPSHEET_DialogProc,
+                                       PROPSHEET_DialogProc,
                                        (LPARAM)psInfo) ? TRUE : FALSE;
 
   COMCTL32_Free(temp);
@@ -2662,7 +2662,7 @@ static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID)
 /******************************************************************************
  *            PROPSHEET_DialogProc
  */
-BOOL WINAPI
+INT_PTR CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",

dlls/comctl32/toolbar.c

@@ -1629,7 +1629,7 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
  * TOOLBAR_CustomizeDialogProc
  * This function implements the toolbar customization dialog.
  */
-static BOOL WINAPI
+static INT_PTR CALLBACK
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     PCUSTDLG_INFO custInfo = (PCUSTDLG_INFO)GetWindowLongA (hwnd, DWL_USER);
@@ -2769,7 +2769,7 @@ TOOLBAR_Customize (HWND hwnd)
     ret = DialogBoxIndirectParamA ((HINSTANCE)GetWindowLongA(hwnd, GWL_HINSTANCE),
                                    (LPDLGTEMPLATEA)template,
                                    hwnd,
-                                   (DLGPROC)TOOLBAR_CustomizeDialogProc,
+                                   TOOLBAR_CustomizeDialogProc,
                                    (LPARAM)&custInfo);
 
     /* send TBN_ENDADJUST notification */

dlls/commdlg/colordlg.c

@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 
-static LRESULT WINAPI ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
+static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
 
 #define CONV_LPARAMTOPOINT(lp,p) do { (p)->x = SLOWORD(lp); (p)->y = SHIWORD(lp); } while(0)
 
@@ -1239,7 +1239,7 @@ static LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam )
  *           ColorDlgProc32 [internal]
  *
  */
-static LRESULT WINAPI ColorDlgProc( HWND hDlg, UINT message,
+static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message,
                                    WPARAM wParam, LPARAM lParam )
 {
 
@@ -1302,10 +1302,10 @@ static LRESULT WINAPI ColorDlgProc( HWND hDlg, UINT message,
 /***********************************************************************
  *           ColorDlgProc   (COMMDLG.8)
  */
-LRESULT WINAPI ColorDlgProc16( HWND16 hDlg16, UINT16 message,
+BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message,
                             WPARAM16 wParam, LONG lParam )
 {
- int res;
+ BOOL16 res;
  HWND hDlg = HWND_32(hDlg16);
 
  LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
@@ -1506,7 +1506,7 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol )
     }
 
     bRet = DialogBoxIndirectParamW(COMMDLG_hInstance32, template, lpChCol->hwndOwner,
-                     (DLGPROC)ColorDlgProc, (DWORD)lpChCol);
+                     ColorDlgProc, (DWORD)lpChCol);
     return bRet;
 }
 

dlls/commdlg/filedlg.c

@@ -89,12 +89,12 @@ static char defaultsave[]="Save as";
  *
  */
 
-LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 				 LPARAM lParam);
-LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 				 LPARAM lParam);
 
-static LRESULT WINAPI FileOpenDlgProc(HWND hDlg, UINT msg,
+static INT_PTR CALLBACK FileOpenDlgProc(HWND hDlg, UINT msg,
                                       WPARAM wParam, LPARAM lParam);
 
 /***********************************************************************
@@ -1301,7 +1301,7 @@ BOOL WINAPI GetFileName31A(
     {
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
         bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
-             (DLGPROC) FileOpenDlgProc, (DWORD) lfs);
+                                        FileOpenDlgProc, (LPARAM)lfs);
         FILEDLG_DestroyPrivate(lfs);
     }
 
@@ -1331,7 +1331,7 @@ BOOL WINAPI GetFileName31W(
     {
         hInst = GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
         bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
-             (DLGPROC) FileOpenDlgProc, (DWORD) lfs);
+                                        FileOpenDlgProc, (LPARAM)lfs);
         FILEDLG_DestroyPrivate(lfs);
     }
 
@@ -1345,7 +1345,7 @@ BOOL WINAPI GetFileName31W(
 /***********************************************************************
  *           FileOpenDlgProc   (COMMDLG.6)
  */
-LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
 {
     HWND hWnd = HWND_32(hWnd16);
@@ -1394,7 +1394,7 @@ LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
 /***********************************************************************
  *           FileSaveDlgProc   (COMMDLG.7)
  */
-LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
 {
  HWND hWnd = HWND_32(hWnd16);
@@ -1446,7 +1446,7 @@ LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
  *           FileOpenDlgProc                                    [internal]
  *      Used for open and save, in fact.
  */
-static LRESULT WINAPI FileOpenDlgProc(HWND hWnd, UINT wMsg,
+static INT_PTR CALLBACK FileOpenDlgProc(HWND hWnd, UINT wMsg,
                                       WPARAM wParam, LPARAM lParam)
 {
     LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP);
@@ -1454,8 +1454,8 @@ static LRESULT WINAPI FileOpenDlgProc(HWND hWnd, UINT wMsg,
     TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
     if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
         {
-            LRESULT lRet;
-            lRet  = (BOOL)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
+            INT_PTR lRet;
+            lRet  = (INT_PTR)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
             if (lRet)
                 return lRet;         /* else continue message processing */
         }
@@ -1522,7 +1522,7 @@ BOOL16 WINAPI GetOpenFileName16(
         hInst = GetWindowLongA( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
         bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
-             (DLGPROC16) ptr, (DWORD) lfs);
+                                         (DLGPROC16) ptr, (LPARAM) lfs);
         FILEDLG_DestroyPrivate(lfs);
     }
 
@@ -1560,7 +1560,7 @@ BOOL16 WINAPI GetSaveFileName16(
         hInst = GetWindowLongA( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
         bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
-             (DLGPROC16) ptr, (DWORD) lfs);
+                                         (DLGPROC16) ptr, (LPARAM) lfs);
         FILEDLG_DestroyPrivate(lfs);
     }
 

dlls/commdlg/filedlg95.c

@@ -213,7 +213,7 @@ static void *MemAlloc(UINT size);
 static void MemFree(void *mem);
 
 BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos);
-HRESULT WINAPI FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
 HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed);
@@ -284,7 +284,7 @@ BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
                                   fodInfos->ofnInfos->hwndOwner,
-                                  (DLGPROC) FileOpenDlgProc95,
+                                  FileOpenDlgProc95,
                                   (LPARAM) fodInfos);
 
     /* Unable to create the dialog */
@@ -642,7 +642,7 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
 }
 
 
-HRESULT WINAPI FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(GetParent(hwnd),FileOpenDlgInfosStr);
 
@@ -729,7 +729,7 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
       }
 
       hChildDlg= CreateDialogIndirectParamA(hinst, template,
-           hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+           hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
       if(hChildDlg)
       {
         ShowWindow(hChildDlg,SW_SHOW);
@@ -752,8 +752,8 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
       temp.tmplate.cx = rectHwnd.right-rectHwnd.left;
       temp.tmplate.cy = rectHwnd.bottom-rectHwnd.top;
       temp.menu = temp.class = temp.title = 0;
-      hChildDlg = CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&temp,
-                  hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+      hChildDlg = CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&temp.tmplate,
+                  hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
       return hChildDlg;
     }
     return (HWND)NULL;
@@ -858,7 +858,7 @@ HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam
  *
  * File open dialog procedure
  */
-HRESULT WINAPI FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 #if 0
   TRACE("0x%04x 0x%04x\n", hwnd, uMsg);

dlls/commdlg/finddlg.c

@@ -45,9 +45,9 @@ struct FRPRIVATE
 
 #define LFRPRIVATE struct FRPRIVATE *
 
-LRESULT WINAPI FindTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK FindTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                  LPARAM lParam);
-LRESULT WINAPI ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 				    LPARAM lParam);
 
 /***********************************************************************
@@ -312,7 +312,7 @@ static LRESULT FINDDLG_WMCommand(HWND hWnd, WPARAM wParam,
 /***********************************************************************
  *           FindTextDlgProc   (COMMDLG.13)
  */
-LRESULT WINAPI FindTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK FindTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
                                  LPARAM lParam)
 {
     HWND hWnd = HWND_32(hWnd16);
@@ -469,7 +469,7 @@ static LRESULT REPLACEDLG_WMCommand(HWND hWnd, WPARAM16 wParam,
 /***********************************************************************
  *           ReplaceTextDlgProc   (COMMDLG.14)
  */
-LRESULT WINAPI ReplaceTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK ReplaceTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
                                     LPARAM lParam)
 {
     HWND hWnd = HWND_32(hWnd16);

dlls/commdlg/finddlg32.c

@@ -172,10 +172,10 @@ Replace:
  *	COMDLG32_FindReplaceDlgProc		[internal]
  * [Find/Replace]Text32[A/W] window procedure.
  */
-static BOOL CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
 	COMDLG32_FR_Data *pdata = (COMDLG32_FR_Data *)GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
-	BOOL retval = TRUE;
+	INT_PTR retval = TRUE;
 
 	if(iMsg == WM_INITDIALOG)
         {
@@ -425,7 +425,7 @@ static HWND COMDLG32_FR_DoFindReplace(
         hdlgwnd = CreateDialogIndirectParamA(COMDLG32_hInstance,
         				     rcs,
                                              pdata->fr.hwndOwner,
-                                             (DLGPROC)COMDLG32_FindReplaceDlgProc,
+                                             COMDLG32_FindReplaceDlgProc,
                                              (LPARAM)pdata);
 	if(!hdlgwnd)
         {
@@ -554,5 +554,3 @@ HWND WINAPI ReplaceTextW(
                              pdata->fr.lpstrReplaceWith, len2, NULL, NULL );
         return COMDLG32_FR_DoFindReplace(pdata);
 }
-
-

dlls/commdlg/fontdlg.c

@@ -42,11 +42,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 static HBITMAP16 hBitmapTT = 0;
 
 
-LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
+INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
 				  LPARAM lParam);
-LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
+INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
 				  LPARAM lParam);
-LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
+BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
                                    LPARAM lParam);
 
 static void FONT_LogFont16To32A( const LPLOGFONT16 font16, LPLOGFONTA font32 )
@@ -281,7 +281,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont)
   if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS | CF_ENABLETEMPLATE |
     CF_ENABLETEMPLATEHANDLE)) FIXME(": unimplemented flag (ignored)\n");
   return DialogBoxIndirectParamA(COMMDLG_hInstance32, template,
-            lpChFont->hwndOwner, (DLGPROC)FormatCharDlgProcA, (LPARAM)lpChFont );
+            lpChFont->hwndOwner, FormatCharDlgProcA, (LPARAM)lpChFont );
 }
 
 /***********************************************************************
@@ -433,7 +433,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont)
   cf32a.lpszStyle=HEAP_strdupWtoA(GetProcessHeap(), 0, lpChFont->lpszStyle);
   lpChFont->lpTemplateName=(LPWSTR)&cf32a;
   bRet = DialogBoxIndirectParamW(COMMDLG_hInstance32, template,
-            lpChFont->hwndOwner, (DLGPROC)FormatCharDlgProcW, (LPARAM)lpChFont );
+            lpChFont->hwndOwner, FormatCharDlgProcW, (LPARAM)lpChFont );
   HeapFree(GetProcessHeap(), 0, cf32a.lpszStyle);
   lpChFont->lpTemplateName=(LPWSTR)cf32a.lpTemplateName;
   memcpy(lpChFont->lpLogFont, &lf32a, sizeof(CHOOSEFONTA));
@@ -1120,13 +1120,13 @@ static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam)
                     2. some CF_.. flags are not supported
                     3. some TType extensions
  */
-LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg16, UINT16 message,
+BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg16, UINT16 message,
 				   WPARAM16 wParam, LPARAM lParam)
 {
   HWND hDlg = HWND_32(hDlg16);
   LPCHOOSEFONT16 lpcf;
   LPCHOOSEFONTA lpcf32a;
-  LRESULT res=0;
+  BOOL16 res=0;
   if (message!=WM_INITDIALOG)
   {
    lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
@@ -1204,11 +1204,11 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg16, UINT16 message,
 /***********************************************************************
  *           FormatCharDlgProcA   [internal]
  */
-LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
+INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
                                     LPARAM lParam)
 {
   LPCHOOSEFONTA lpcf;
-  LRESULT res=FALSE;
+  INT_PTR res = FALSE;
   if (uMsg!=WM_INITDIALOG)
   {
    lpcf=(LPCHOOSEFONTA)GetWindowLongA(hDlg, DWL_USER);
@@ -1254,12 +1254,12 @@ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
 /***********************************************************************
  *           FormatCharDlgProcW   [internal]
  */
-LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
+INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
                                     LPARAM lParam)
 {
   LPCHOOSEFONTW lpcf32w;
   LPCHOOSEFONTA lpcf32a;
-  LRESULT res=FALSE;
+  INT_PTR res = FALSE;
   if (uMsg!=WM_INITDIALOG)
   {
    lpcf32w=(LPCHOOSEFONTW)GetWindowLongA(hDlg, DWL_USER);

dlls/commdlg/printdlg.c

@@ -2002,11 +2002,11 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
 /***********************************************************************
  *           PrintDlgProcA			[internal]
  */
-BOOL WINAPI PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
+INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
 			  LPARAM lParam)
 {
     PRINT_PTRA* PrintStructures;
-    LRESULT res=FALSE;
+    INT_PTR res = FALSE;
 
     if (uMsg!=WM_INITDIALOG) {
         PrintStructures = (PRINT_PTRA*)GetPropA(hDlg,"__WINE_PRINTDLGDATA");
@@ -2046,11 +2046,11 @@ BOOL WINAPI PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
     return res;
 }
 
-BOOL WINAPI PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
+INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
 			  LPARAM lParam)
 {
     PRINT_PTRW* PrintStructures;
-    LRESULT res=FALSE;
+    INT_PTR res = FALSE;
 
     if (uMsg!=WM_INITDIALOG) {
         PrintStructures = (PRINT_PTRW*) GetWindowLongA(hDlg, DWL_USER);
@@ -3163,11 +3163,11 @@ PRINTDLG_PS_WMCommandW(
 }
 
 
-static BOOL WINAPI
+static INT_PTR CALLBACK
 PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     PageSetupDataA	*pda;
-    BOOL		res = FALSE;
+    INT_PTR		res = FALSE;
 
     if (uMsg==WM_INITDIALOG) {
 	res = TRUE;
@@ -3245,7 +3245,7 @@ PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     return FALSE;
 }
 
-static BOOL WINAPI
+static INT_PTR CALLBACK
 PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     PageSetupDataW	*pda;
@@ -3469,12 +3469,12 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
 /***********************************************************************
  *           PrintDlgProc   (COMMDLG.21)
  */
-LRESULT WINAPI PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam,
+BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam,
                             LPARAM lParam)
 {
     HWND hDlg = HWND_32(hDlg16);
     PRINT_PTRA* PrintStructures;
-    LRESULT res=FALSE;
+    BOOL16 res = FALSE;
 
     if (uMsg!=WM_INITDIALOG) {
         PrintStructures = (PRINT_PTRA*)GetPropA(hDlg,"__WINE_PRINTDLGDATA");
@@ -3528,7 +3528,7 @@ LRESULT WINAPI PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam,
 /***********************************************************************
  *           PrintSetupDlgProc   (COMMDLG.22)
  */
-LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
+BOOL16 CALLBACK PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
 				   LPARAM lParam)
 {
   HWND hWnd = HWND_32(hWnd16);

dlls/msacm/format.c

@@ -193,7 +193,7 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc)
     return affd.ret;
 }
 
-static BOOL WINAPI FormatChooseDlgProc(HWND hWnd, UINT msg,
+static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
 				       WPARAM wParam, LPARAM lParam)
 {
 

dlls/serialui/confdlg.c

@@ -338,7 +338,7 @@ static void SERIALUI_DialogInfoToDCB(HWND hDlg, SERIALUI_DialogInfo *info)
  *
  * Shows a dialog for configuring a COMM port
  */
-BOOL WINAPI SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     CHAR szTitle[30];
     SERIALUI_DialogInfo *info;
@@ -423,7 +423,7 @@ BOOL WINAPI SERIALUI_CommConfigDialog(
     return DialogBoxParamA(SERIALUI_hModule,
                            MAKEINTRESOURCEA(IDD_SERIALUICONFIG),
                            hWndParent,
-                           (DLGPROC) SERIALUI_ConfigDialogProc,
+                           SERIALUI_ConfigDialogProc,
                            (LPARAM)&info);
 }
 

dlls/setupapi/virtcopy.c

@@ -579,9 +579,9 @@ static HWND hDlgCopy = 0;
 static HKEY hKeyFiles = 0, hKeyRename = 0, hKeyConflict = 0;
 static char BackupDir[12];
 
-static BOOL CALLBACK VCP_UI_FileCopyDlgProc(HWND hWndDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK VCP_UI_FileCopyDlgProc(HWND hWndDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-    BOOL retval = FALSE;
+    INT_PTR retval = FALSE;
 
     if (iMsg == WM_INITDIALOG)
     {

dlls/shell32/brsfolder.c

@@ -254,7 +254,7 @@ static LRESULT MsgNotify(HWND hWnd,  UINT CtlID, LPNMHDR lpnmh)
 /*************************************************************************
  *             BrsFolderDlgProc32  (not an exported API function)
  */
-static BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
+static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
 				     LPARAM lParam )
 {
        TRACE("hwnd=%08x msg=%04x 0x%08x 0x%08lx\n", hWnd,  msg, wParam, lParam );

dlls/shell32/dialogs.c

@@ -46,7 +46,7 @@ typedef struct
 typedef BOOL (*LPFNOFN) (OPENFILENAMEA *) ;
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
-BOOL CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ;
+INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ;
 void FillList (HWND, char *) ;
 
 
@@ -109,7 +109,7 @@ void WINAPI RunFileDlg(
 }
 
 /* Dialog procedure for RunFileDlg */
-BOOL CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     {
     int ic ;
     char *psz, szMsg[256] ;

dlls/shell32/shell32_main.c

@@ -677,7 +677,7 @@ DWORD WINAPI SHLoadInProc (REFCLSID rclsid)
 /*************************************************************************
  * AboutDlgProc			(internal)
  */
-BOOL WINAPI AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
+INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )
 {   HWND hWndCtl;
     char Template[512], AppTitle[512];

dlls/shell32/shell32_main.h

@@ -63,7 +63,7 @@ BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
 BOOL HCR_GetClassName (REFIID riid, LPSTR szDest, DWORD len);
 BOOL HCR_GetFolderAttributes (REFIID riid, LPDWORD szDest);
 
-BOOL  WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
+INT_PTR CALLBACK AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
 DWORD WINAPI ParseFieldA(LPCSTR src,DWORD field,LPSTR dst,DWORD len);
 
 /****************************************************************************

dlls/user/message.c

@@ -1705,7 +1705,7 @@ static LRESULT send_inter_thread_message( DWORD dest_tid, const struct send_mess
  *		SendMessageTimeoutW  (USER32.@)
  */
 LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
-                                    UINT flags, UINT timeout, LPDWORD res_ptr )
+                                    UINT flags, UINT timeout, PDWORD_PTR res_ptr )
 {
     struct send_message_info info;
     DWORD dest_tid, dest_pid;
@@ -1753,7 +1753,7 @@ LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
  *		SendMessageTimeoutA  (USER32.@)
  */
 LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
-                                    UINT flags, UINT timeout, LPDWORD res_ptr )
+                                    UINT flags, UINT timeout, PDWORD_PTR res_ptr )
 {
     struct send_message_info info;
     DWORD dest_tid, dest_pid;

dlls/wineps/driver.c

@@ -188,7 +188,7 @@ WORD WINAPI PSDRV_AdvancedSetupDialog16(HWND16 hwnd, HANDLE16 hDriver,
  *
  * Dialog proc for 'Paper' propsheet
  */
-BOOL WINAPI PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
+INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			       lParam)
 {
   PSDRV_DLGINFO *di;

windows/dialog.c

@@ -686,7 +686,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result )
  *       (it's more compatible to do it here, as under Windows the owner
  *       is never disabled if the dialog fails because of an invalid template)
  */
-static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
+static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
                                    HWND owner, DLGPROC dlgProc, LPARAM param,
                                    WINDOWPROCTYPE procType, BOOL modal )
 {
@@ -982,7 +982,7 @@ HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
  *		CreateDialogIndirectParamA (USER32.@)
  */
 HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst,
-                                            LPCVOID dlgTemplate,
+                                            LPCDLGTEMPLATEA dlgTemplate,
                                             HWND owner, DLGPROC dlgProc,
                                             LPARAM param )
 {
@@ -1004,7 +1004,7 @@ HWND WINAPI CreateDialogIndirectParamAorW( HINSTANCE hInst,
  *		CreateDialogIndirectParamW (USER32.@)
  */
 HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst,
-                                            LPCVOID dlgTemplate,
+                                            LPCDLGTEMPLATEW dlgTemplate,
                                             HWND owner, DLGPROC dlgProc,
                                             LPARAM param )
 {
@@ -1096,7 +1096,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template,
 /***********************************************************************
  *		DialogBoxParamA (USER32.@)
  */
-INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
+INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
                                 HWND owner, DLGPROC dlgProc, LPARAM param )
 {
     HWND hwnd;
@@ -1112,7 +1112,7 @@ INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
 /***********************************************************************
  *		DialogBoxParamW (USER32.@)
  */
-INT WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
+INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
                                 HWND owner, DLGPROC dlgProc, LPARAM param )
 {
     HWND hwnd;
@@ -1157,7 +1157,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
 /***********************************************************************
  *		DialogBoxIndirectParamA (USER32.@)
  */
-INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template,
+INT_PTR WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCDLGTEMPLATEA template,
                                        HWND owner, DLGPROC dlgProc,
                                        LPARAM param )
 {
@@ -1171,7 +1171,7 @@ INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template,
 /***********************************************************************
  *		DialogBoxIndirectParamW (USER32.@)
  */
-INT WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCVOID template,
+INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCDLGTEMPLATEW template,
                                        HWND owner, DLGPROC dlgProc,
                                        LPARAM param )
 {
@@ -1184,7 +1184,7 @@ INT WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCVOID template,
 /***********************************************************************
  *		DialogBoxIndirectParamAorW (USER32.@)
  */
-INT WINAPI DialogBoxIndirectParamAorW(HINSTANCE hInstance, LPCVOID template,
+INT_PTR WINAPI DialogBoxIndirectParamAorW(HINSTANCE hInstance, LPCVOID template,
                                        HWND owner, DLGPROC dlgProc,
                                        LPARAM param, DWORD x )
 {
@@ -1199,7 +1199,7 @@ INT WINAPI DialogBoxIndirectParamAorW(HINSTANCE hInstance, LPCVOID template,
 /***********************************************************************
  *		EndDialog (USER32.@)
  */
-BOOL WINAPI EndDialog( HWND hwnd, INT retval )
+BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval )
 {
     BOOL wasEnabled = TRUE;
     DIALOGINFO * dlgInfo;

windows/input.c

@@ -347,7 +347,7 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size )
  *		keybd_event (USER32.@)
  */
 void WINAPI keybd_event( BYTE bVk, BYTE bScan,
-                         DWORD dwFlags, DWORD dwExtraInfo )
+                         DWORD dwFlags, ULONG_PTR dwExtraInfo )
 {
     INPUT input;
 
@@ -380,7 +380,7 @@ void WINAPI keybd_event16( CONTEXT86 *context )
  *		mouse_event (USER32.@)
  */
 void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
-                         DWORD dwData, DWORD dwExtraInfo )
+                         DWORD dwData, ULONG_PTR dwExtraInfo )
 {
     INPUT input;
 

windows/mdi.c

@@ -2114,7 +2114,7 @@ TileWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
  *
  */
 
-static BOOL WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (iMsg)
     {

windows/msgbox.c

@@ -263,7 +263,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
  *
  * Dialog procedure for message boxes.
  */
-static BOOL CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
+static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
                                         WPARAM wParam, LPARAM lParam )
 {
   HFONT hFont;

windows/timer.c

@@ -111,7 +111,7 @@ void TIMER_RemoveThreadTimers(void)
 /***********************************************************************
  *           TIMER_SetTimer
  */
-static UINT TIMER_SetTimer( HWND hwnd, UINT id, UINT timeout,
+static UINT_PTR TIMER_SetTimer( HWND hwnd, UINT_PTR id, UINT timeout,
                               WNDPROC16 proc, WINDOWPROCTYPE type, BOOL sys )
 {
     int i;
@@ -195,7 +195,7 @@ static UINT TIMER_SetTimer( HWND hwnd, UINT id, UINT timeout,
 /***********************************************************************
  *           TIMER_KillTimer
  */
-static BOOL TIMER_KillTimer( HWND hwnd, UINT id, BOOL sys )
+static BOOL TIMER_KillTimer( HWND hwnd, UINT_PTR id, BOOL sys )
 {
     int i;
     TIMER * pTimer;
@@ -252,7 +252,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 /***********************************************************************
  *		SetTimer (USER32.@)
  */
-UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
+UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout,
                           TIMERPROC proc )
 {
     TRACE("%04x %d %d %08lx\n",
@@ -264,7 +264,7 @@ UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
 /***********************************************************************
  *           TIMER_IsTimerValid
  */
-BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, HWINDOWPROC hProc )
+BOOL TIMER_IsTimerValid( HWND hwnd, UINT_PTR id, HWINDOWPROC hProc )
 {
     int i;
     TIMER *pTimer;
@@ -302,7 +302,7 @@ UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 /***********************************************************************
  *		SetSystemTimer (USER32.@)
  */
-UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
+UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout,
                                 TIMERPROC proc )
 {
     TRACE("%04x %d %d %08lx\n",
@@ -314,7 +314,7 @@ UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
 /***********************************************************************
  *		KillTimer (USER32.@)
  */
-BOOL WINAPI KillTimer( HWND hwnd, UINT id )
+BOOL WINAPI KillTimer( HWND hwnd, UINT_PTR id )
 {
     TRACE("%04x %d\n", hwnd, id );
     return TIMER_KillTimer( hwnd, id, FALSE );
@@ -324,7 +324,7 @@ BOOL WINAPI KillTimer( HWND hwnd, UINT id )
 /***********************************************************************
  *		KillSystemTimer (USER32.@)
  */
-BOOL WINAPI KillSystemTimer( HWND hwnd, UINT id )
+BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id )
 {
     TRACE("%04x %d\n", hwnd, id );
     return TIMER_KillTimer( hwnd, id, TRUE );

windows/winhelp.c

@@ -78,8 +78,7 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
 /**********************************************************************
  *		WinHelpA (USER32.@)
  */
-BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
-                          DWORD dwData )
+BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwData )
 {
 	static WORD WM_WINHELP = 0;
 	HWND hDest;
@@ -164,7 +163,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
 /**********************************************************************
  *		WinHelpW (USER32.@)
  */
-BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command, DWORD dwData )
+BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command, ULONG_PTR dwData )
 {
     INT len;
     LPSTR file;