Hello.
Changelog:
Fix some types and function prototypes according to
Platform SDK definitions.
diff -u cvs/hq/wine/controls/menu.c wine/controls/menu.c
--- cvs/hq/wine/controls/menu.c Sat Oct 19 18:08:40 2002
+++ wine/controls/menu.c Wed Oct 30 23:48:18 2002
@@ -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;
diff -u cvs/hq/wine/dlls/avifil32/api.c wine/dlls/avifil32/api.c
--- cvs/hq/wine/dlls/avifil32/api.c Wed Oct 30 21:55:43 2002
+++ wine/dlls/avifil32/api.c Wed Oct 30 23:28:14 2002
@@ -1272,7 +1272,7 @@
}
-BOOL CALLBACK AVISaveOptionsDlgProc(HWND hWnd, UINT uMsg,
+INT_PTR CALLBACK AVISaveOptionsDlgProc(HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam)
{
DWORD dwInterleave;
diff -u cvs/hq/wine/dlls/comctl32/propsheet.c wine/dlls/comctl32/propsheet.c
--- cvs/hq/wine/dlls/comctl32/propsheet.c Fri Oct 25 15:59:54 2002
+++ wine/dlls/comctl32/propsheet.c Wed Oct 30 23:26:12 2002
@@ -170,7 +170,7 @@
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 @@
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 @@
/******************************************************************************
* 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",
diff -u cvs/hq/wine/dlls/comctl32/toolbar.c wine/dlls/comctl32/toolbar.c
--- cvs/hq/wine/dlls/comctl32/toolbar.c Wed Oct 30 21:55:44 2002
+++ wine/dlls/comctl32/toolbar.c Wed Oct 30 23:26:47 2002
@@ -1629,7 +1629,7 @@
* 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 @@
ret = DialogBoxIndirectParamA ((HINSTANCE)GetWindowLongA(hwnd, GWL_HINSTANCE),
(LPDLGTEMPLATEA)template,
hwnd,
- (DLGPROC)TOOLBAR_CustomizeDialogProc,
+ TOOLBAR_CustomizeDialogProc,
(LPARAM)&custInfo);
/* send TBN_ENDADJUST notification */
diff -u cvs/hq/wine/dlls/commdlg/colordlg.c wine/dlls/commdlg/colordlg.c
--- cvs/hq/wine/dlls/commdlg/colordlg.c Tue Sep 17 14:03:22 2002
+++ wine/dlls/commdlg/colordlg.c Wed Oct 30 23:19:29 2002
@@ -41,7 +41,7 @@
#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 @@
* 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 @@
/***********************************************************************
* 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 @@
}
bRet = DialogBoxIndirectParamW(COMMDLG_hInstance32, template, lpChCol->hwndOwner,
- (DLGPROC)ColorDlgProc, (DWORD)lpChCol);
+ ColorDlgProc, (DWORD)lpChCol);
return bRet;
}
diff -u cvs/hq/wine/dlls/commdlg/filedlg.c wine/dlls/commdlg/filedlg.c
--- cvs/hq/wine/dlls/commdlg/filedlg.c Wed Oct 16 13:27:58 2002
+++ wine/dlls/commdlg/filedlg.c Wed Oct 30 23:08:25 2002
@@ -89,12 +89,12 @@
*
*/
-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 @@
{
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 @@
{
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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
* 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 @@
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 @@
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 @@
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);
}
diff -u cvs/hq/wine/dlls/commdlg/filedlg95.c wine/dlls/commdlg/filedlg95.c
--- cvs/hq/wine/dlls/commdlg/filedlg95.c Fri Sep 20 14:30:10 2002
+++ wine/dlls/commdlg/filedlg95.c Wed Oct 30 23:17:57 2002
@@ -213,7 +213,7 @@
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 @@
lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
(LPDLGTEMPLATEA) template,
fodInfos->ofnInfos->hwndOwner,
- (DLGPROC) FileOpenDlgProc95,
+ FileOpenDlgProc95,
(LPARAM) fodInfos);
/* Unable to create the dialog */
@@ -642,7 +642,7 @@
}
-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 @@
}
hChildDlg= CreateDialogIndirectParamA(hinst, template,
- hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+ hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
if(hChildDlg)
{
ShowWindow(hChildDlg,SW_SHOW);
@@ -752,8 +752,8 @@
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 @@
*
* 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);
diff -u cvs/hq/wine/dlls/commdlg/finddlg.c wine/dlls/commdlg/finddlg.c
--- cvs/hq/wine/dlls/commdlg/finddlg.c Tue Sep 17 14:03:22 2002
+++ wine/dlls/commdlg/finddlg.c Wed Oct 30 23:10:45 2002
@@ -45,9 +45,9 @@
#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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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);
diff -u cvs/hq/wine/dlls/commdlg/finddlg32.c wine/dlls/commdlg/finddlg32.c
--- cvs/hq/wine/dlls/commdlg/finddlg32.c Mon Jun 3 13:00:44 2002
+++ wine/dlls/commdlg/finddlg32.c Wed Oct 30 23:21:29 2002
@@ -172,10 +172,10 @@
* 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 @@
hdlgwnd = CreateDialogIndirectParamA(COMDLG32_hInstance,
rcs,
pdata->fr.hwndOwner,
- (DLGPROC)COMDLG32_FindReplaceDlgProc,
+ COMDLG32_FindReplaceDlgProc,
(LPARAM)pdata);
if(!hdlgwnd)
{
diff -u cvs/hq/wine/dlls/commdlg/fontdlg.c wine/dlls/commdlg/fontdlg.c
--- cvs/hq/wine/dlls/commdlg/fontdlg.c Tue Sep 17 14:03:22 2002
+++ wine/dlls/commdlg/fontdlg.c Wed Oct 30 23:12:27 2002
@@ -42,11 +42,11 @@
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 @@
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 @@
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 @@
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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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);
diff -u cvs/hq/wine/dlls/commdlg/printdlg.c wine/dlls/commdlg/printdlg.c
--- cvs/hq/wine/dlls/commdlg/printdlg.c Wed Oct 23 12:06:35 2002
+++ wine/dlls/commdlg/printdlg.c Wed Oct 30 23:15:17 2002
@@ -2002,11 +2002,11 @@
/***********************************************************************
* 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 @@
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 @@
}
-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 @@
return FALSE;
}
-static BOOL WINAPI
+static INT_PTR CALLBACK
PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
PageSetupDataW *pda;
@@ -3469,12 +3469,12 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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);
diff -u cvs/hq/wine/dlls/msacm/format.c wine/dlls/msacm/format.c
--- cvs/hq/wine/dlls/msacm/format.c Wed Oct 23 12:06:38 2002
+++ wine/dlls/msacm/format.c Wed Oct 30 23:30:24 2002
@@ -193,7 +193,7 @@
return affd.ret;
}
-static BOOL WINAPI FormatChooseDlgProc(HWND hWnd, UINT msg,
+static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
WPARAM wParam, LPARAM lParam)
{
diff -u cvs/hq/wine/dlls/serialui/confdlg.c wine/dlls/serialui/confdlg.c
--- cvs/hq/wine/dlls/serialui/confdlg.c Sat Oct 19 18:08:50 2002
+++ wine/dlls/serialui/confdlg.c Wed Oct 30 23:27:25 2002
@@ -338,7 +338,7 @@
*
* 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 @@
return DialogBoxParamA(SERIALUI_hModule,
MAKEINTRESOURCEA(IDD_SERIALUICONFIG),
hWndParent,
- (DLGPROC) SERIALUI_ConfigDialogProc,
+ SERIALUI_ConfigDialogProc,
(LPARAM)&info);
}
diff -u cvs/hq/wine/dlls/setupapi/virtcopy.c wine/dlls/setupapi/virtcopy.c
--- cvs/hq/wine/dlls/setupapi/virtcopy.c Tue Sep 17 14:03:23 2002
+++ wine/dlls/setupapi/virtcopy.c Wed Oct 30 23:31:07 2002
@@ -579,9 +579,9 @@
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)
{
diff -u cvs/hq/wine/dlls/shell32/brsfolder.c wine/dlls/shell32/brsfolder.c
--- cvs/hq/wine/dlls/shell32/brsfolder.c Thu Aug 15 17:57:56 2002
+++ wine/dlls/shell32/brsfolder.c Wed Oct 30 23:31:38 2002
@@ -254,7 +254,7 @@
/*************************************************************************
* 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 );
diff -u cvs/hq/wine/dlls/shell32/dialogs.c wine/dlls/shell32/dialogs.c
--- cvs/hq/wine/dlls/shell32/dialogs.c Wed Oct 16 13:28:33 2002
+++ wine/dlls/shell32/dialogs.c Wed Oct 30 23:32:12 2002
@@ -46,7 +46,7 @@
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 @@
}
/* 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] ;
diff -u cvs/hq/wine/dlls/shell32/shell32_main.c wine/dlls/shell32/shell32_main.c
--- cvs/hq/wine/dlls/shell32/shell32_main.c Wed Oct 30 21:55:50 2002
+++ wine/dlls/shell32/shell32_main.c Wed Oct 30 23:33:38 2002
@@ -669,7 +669,7 @@
/*************************************************************************
* 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];
diff -u cvs/hq/wine/dlls/shell32/shell32_main.h wine/dlls/shell32/shell32_main.h
--- cvs/hq/wine/dlls/shell32/shell32_main.h Wed Oct 30 21:55:50 2002
+++ wine/dlls/shell32/shell32_main.h Wed Oct 30 23:35:33 2002
@@ -62,7 +62,7 @@
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);
/****************************************************************************
diff -u cvs/hq/wine/dlls/user/message.c wine/dlls/user/message.c
--- cvs/hq/wine/dlls/user/message.c Wed Oct 30 21:55:53 2002
+++ wine/dlls/user/message.c Wed Oct 30 23:49:46 2002
@@ -1705,7 +1705,7 @@
* 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 @@
* 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;
diff -u cvs/hq/wine/dlls/wineps/driver.c wine/dlls/wineps/driver.c
--- cvs/hq/wine/dlls/wineps/driver.c Sat Oct 19 18:08:52 2002
+++ wine/dlls/wineps/driver.c Wed Oct 30 23:36:24 2002
@@ -188,7 +188,7 @@
*
* 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;
diff -u cvs/hq/wine/include/winuser.h wine/include/winuser.h
--- cvs/hq/wine/include/winuser.h Wed Oct 30 21:56:05 2002
+++ wine/include/winuser.h Wed Oct 30 23:54:17 2002
@@ -30,7 +30,7 @@
/* Define a bunch of callback types */
#if defined(STRICT) || defined(__WINE__)
-typedef BOOL (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef INT_PTR (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
typedef BOOL (CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
typedef INT (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
typedef INT (CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT);
@@ -43,7 +43,7 @@
typedef BOOL (CALLBACK *PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,ULONG_PTR);
typedef BOOL (CALLBACK *PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,ULONG_PTR);
typedef VOID (CALLBACK *SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT);
-typedef VOID (CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
+typedef VOID (CALLBACK *TIMERPROC)(HWND,UINT,UINT_PTR,DWORD);
typedef VOID (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,
DWORD,DWORD);
typedef BOOL (CALLBACK *WNDENUMPROC)(HWND,LPARAM);
@@ -317,7 +317,7 @@
POINT pt;
HWND hwnd;
UINT wHitTestCode;
- DWORD dwExtraInfo;
+ ULONG_PTR dwExtraInfo;
} MOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT, *LPMOUSEHOOKSTRUCT;
@@ -439,7 +439,7 @@
typedef struct tagNMHDR
{
HWND hwndFrom;
- UINT idFrom;
+ UINT_PTR idFrom;
UINT code;
} NMHDR, *LPNMHDR;
@@ -495,8 +495,8 @@
/***** Dialogs *****/
-#define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
-#define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
+#define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i)))
+#define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i)))
#define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE)
/* Predefined resource types */
@@ -1669,9 +1669,9 @@
DECL_WINELIB_TYPE_AW(LPWNDCLASS)
typedef struct {
- DWORD dwData;
+ ULONG_PTR dwData;
DWORD cbData;
- LPVOID lpData;
+ PVOID lpData;
} COPYDATASTRUCT, *PCOPYDATASTRUCT;
typedef struct {
@@ -1894,7 +1894,7 @@
HMENU hSubMenu;
HBITMAP hbmpChecked;
HBITMAP hbmpUnchecked;
- DWORD dwItemData;
+ ULONG_PTR dwItemData;
LPSTR dwTypeData;
UINT cch;
HBITMAP hbmpItem;
@@ -1909,7 +1909,7 @@
HMENU hSubMenu;
HBITMAP hbmpChecked;
HBITMAP hbmpUnchecked;
- DWORD dwItemData;
+ ULONG_PTR dwItemData;
LPWSTR dwTypeData;
UINT cch;
HBITMAP hbmpItem;
@@ -1928,7 +1928,7 @@
UINT cyMax;
HBRUSH hbrBack;
DWORD dwContextHelpID;
- DWORD dwMenuData;
+ ULONG_PTR dwMenuData;
} MENUINFO, *LPMENUINFO;
typedef const MENUINFO *LPCMENUINFO;
@@ -2404,8 +2404,6 @@
#include "pshpack2.h"
-/* FIXME: use this instead of LPCVOID for CreateDialogIndirectParam
- and DialogBoxIndirectParam */
typedef struct tagDLGTEMPLATE
{
DWORD style;
@@ -3203,7 +3201,7 @@
HWND hwndItem;
HDC hDC;
RECT rcItem WINE_PACKED;
- DWORD itemData WINE_PACKED;
+ ULONG_PTR itemData WINE_PACKED;
} DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT;
@@ -3214,7 +3212,7 @@
UINT itemID;
UINT itemWidth;
UINT itemHeight;
- DWORD itemData;
+ ULONG_PTR itemData;
} MEASUREITEMSTRUCT, *PMEASUREITEMSTRUCT, *LPMEASUREITEMSTRUCT;
@@ -3224,7 +3222,7 @@
UINT CtlID;
UINT itemID;
HWND hwndItem;
- DWORD itemData;
+ ULONG_PTR itemData;
} DELETEITEMSTRUCT, *PDELETEITEMSTRUCT, *LPDELETEITEMSTRUCT;
@@ -3234,10 +3232,10 @@
UINT CtlID;
HWND hwndItem;
UINT itemID1;
- DWORD itemData1;
+ ULONG_PTR itemData1;
UINT itemID2;
- DWORD itemData2;
- DWORD dwLocaleId;
+ ULONG_PTR itemData2;
+ DWORD dwLocaleId;
} COMPAREITEMSTRUCT, *PCOMPAREITEMSTRUCT, *LPCOMPAREITEMSTRUCT;
@@ -3807,8 +3805,8 @@
BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY);
BOOL WINAPI UnregisterHotKey(HWND,INT);
DWORD WINAPI WaitForInputIdle(HANDLE,DWORD);
-VOID WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD);
-VOID WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,DWORD);
+VOID WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR);
+VOID WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
/* Declarations for functions that are the same in Win16 and Win32 */
VOID WINAPI EndMenu(void);
@@ -3846,8 +3844,8 @@
#define AnsiUpperBuffW CharUpperBuffW
#define AnsiUpperBuff WINELIB_NAME_AW(AnsiUpperBuff)
BOOL WINAPI AnyPopup(void);
-BOOL WINAPI AppendMenuA(HMENU,UINT,UINT,LPCSTR);
-BOOL WINAPI AppendMenuW(HMENU,UINT,UINT,LPCWSTR);
+BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
#define AppendMenu WINELIB_NAME_AW(AppendMenu)
UINT WINAPI ArrangeIconicWindows(HWND);
HDWP WINAPI BeginDeferWindowPos(INT);
@@ -3922,9 +3920,9 @@
#define CreateDialogIndirectW(inst,ptr,hwnd,dlg) \
CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
#define CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
-HWND WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCVOID,HWND,
+HWND WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,
DLGPROC,LPARAM);
-HWND WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCVOID,HWND,
+HWND WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,
DLGPROC,LPARAM);
#define CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
HWND WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
@@ -3988,11 +3986,11 @@
#define DialogBoxIndirectW(inst,template,owner,func) \
DialogBoxIndirectParamW(inst,template,owner,func,0)
#define DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
-INT WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCVOID,HWND,DLGPROC,LPARAM);
-INT WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCVOID,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
#define DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
-INT WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
-INT WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
+INT_PTR WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
#define DialogBoxParam WINELIB_NAME_AW(DialogBoxParam)
LONG WINAPI DispatchMessageA(const MSG*);
LONG WINAPI DispatchMessageW(const MSG*);
@@ -4010,7 +4008,7 @@
BOOL WINAPI DlgDirSelectExW(HWND,LPWSTR,INT,INT);
#define DlgDirSelectEx WINELIB_NAME_AW(DlgDirSelectEx)
BOOL WINAPI DragDetect(HWND,POINT);
-DWORD WINAPI DragObject(HWND,HWND,UINT,DWORD,HCURSOR);
+DWORD WINAPI DragObject(HWND,HWND,UINT,ULONG_PTR,HCURSOR);
BOOL WINAPI DrawAnimatedRects(HWND,int,const RECT*,const RECT*);
BOOL WINAPI DrawCaption(HWND,HDC,const RECT*,UINT);
BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
@@ -4036,7 +4034,7 @@
BOOL WINAPI EnableScrollBar(HWND,INT,UINT);
BOOL WINAPI EnableWindow(HWND,BOOL);
BOOL WINAPI EndDeferWindowPos(HDWP);
-BOOL WINAPI EndDialog(HWND,INT);
+BOOL WINAPI EndDialog(HWND,INT_PTR);
BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
BOOL WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM);
UINT WINAPI EnumClipboardFormats(UINT);
@@ -4184,8 +4182,8 @@
BOOL WINAPI InflateRect(LPRECT,INT,INT);
BOOL WINAPI InSendMessage(void);
DWORD WINAPI InSendMessageEx(LPVOID);
-BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
#define InsertMenu WINELIB_NAME_AW(InsertMenu)
BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
BOOL WINAPI InsertMenuItemW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
@@ -4220,8 +4218,8 @@
BOOL WINAPI IsWindowEnabled(HWND);
BOOL WINAPI IsWindowVisible(HWND);
BOOL WINAPI IsZoomed(HWND);
-BOOL WINAPI KillSystemTimer(HWND,UINT);
-BOOL WINAPI KillTimer(HWND,UINT);
+BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
+BOOL WINAPI KillTimer(HWND,UINT_PTR);
HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
#define LoadAccelerators WINELIB_NAME_AW(LoadAccelerators)
@@ -4268,8 +4266,8 @@
INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
#define MessageBoxIndirect WINELIB_NAME_AW(MessageBoxIndirect)
-BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
#define ModifyMenu WINELIB_NAME_AW(ModifyMenu)
BOOL WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL);
BOOL WINAPI OemToCharA(LPCSTR,LPSTR);
@@ -4328,8 +4326,8 @@
LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
LRESULT WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM);
#define SendMessage WINELIB_NAME_AW(SendMessage)
-LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,LPDWORD);
-LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,LPDWORD);
+LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
+LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
#define SendMessageTimeout WINELIB_NAME_AW(SendMessageTimeout)
HWND WINAPI SetActiveWindow(HWND);
HWND WINAPI SetCapture(HWND);
@@ -4370,8 +4368,8 @@
#define SetSysModalWindow(hwnd) ((HWND)0)
BOOL WINAPI SetSystemCursor(HCURSOR,DWORD);
BOOL WINAPI SetSystemMenu(HWND,HMENU);
-UINT WINAPI SetSystemTimer(HWND,UINT,UINT,TIMERPROC);
-UINT WINAPI SetTimer(HWND,UINT,UINT,TIMERPROC);
+UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
+UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
LONG WINAPI SetWindowLongA(HWND,INT,LONG);
LONG WINAPI SetWindowLongW(HWND,INT,LONG);
@@ -4432,8 +4430,8 @@
BOOL WINAPI WaitMessage(void);
HWND WINAPI WindowFromDC(HDC);
HWND WINAPI WindowFromPoint(POINT);
-BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,DWORD);
-BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,DWORD);
+BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR);
+BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,ULONG_PTR);
#define WinHelp WINELIB_NAME_AW(WinHelp)
INT WINAPIV wsprintfA(LPSTR,LPCSTR,...);
INT WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
diff -u cvs/hq/wine/windows/dialog.c wine/windows/dialog.c
--- cvs/hq/wine/windows/dialog.c Sat Oct 19 18:08:57 2002
+++ wine/windows/dialog.c Wed Oct 30 22:44:23 2002
@@ -686,7 +686,7 @@
* (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 @@
* CreateDialogIndirectParamA (USER32.@)
*/
HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst,
- LPCVOID dlgTemplate,
+ LPCDLGTEMPLATEA dlgTemplate,
HWND owner, DLGPROC dlgProc,
LPARAM param )
{
@@ -1004,7 +1004,7 @@
* CreateDialogIndirectParamW (USER32.@)
*/
HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst,
- LPCVOID dlgTemplate,
+ LPCDLGTEMPLATEW dlgTemplate,
HWND owner, DLGPROC dlgProc,
LPARAM param )
{
@@ -1096,7 +1096,7 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* EndDialog (USER32.@)
*/
-BOOL WINAPI EndDialog( HWND hwnd, INT retval )
+BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval )
{
BOOL wasEnabled = TRUE;
DIALOGINFO * dlgInfo;
diff -u cvs/hq/wine/windows/input.c wine/windows/input.c
--- cvs/hq/wine/windows/input.c Wed Oct 30 21:56:08 2002
+++ wine/windows/input.c Wed Oct 30 23:41:36 2002
@@ -347,7 +347,7 @@
* 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 @@
* mouse_event (USER32.@)
*/
void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
- DWORD dwData, DWORD dwExtraInfo )
+ DWORD dwData, ULONG_PTR dwExtraInfo )
{
INPUT input;
diff -u cvs/hq/wine/windows/mdi.c wine/windows/mdi.c
--- cvs/hq/wine/windows/mdi.c Wed Oct 30 21:56:08 2002
+++ wine/windows/mdi.c Wed Oct 30 22:50:48 2002
@@ -2114,7 +2114,7 @@
*
*/
-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)
{
diff -u cvs/hq/wine/windows/msgbox.c wine/windows/msgbox.c
--- cvs/hq/wine/windows/msgbox.c Fri Oct 25 16:00:02 2002
+++ wine/windows/msgbox.c Wed Oct 30 22:51:07 2002
@@ -263,7 +263,7 @@
*
* 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;
diff -u cvs/hq/wine/windows/timer.c wine/windows/timer.c
--- cvs/hq/wine/windows/timer.c Fri Oct 25 16:00:02 2002
+++ wine/windows/timer.c Wed Oct 30 23:55:01 2002
@@ -111,7 +111,7 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 @@
/***********************************************************************
* 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 );
diff -u cvs/hq/wine/windows/winhelp.c wine/windows/winhelp.c
--- cvs/hq/wine/windows/winhelp.c Sat Oct 19 18:08:57 2002
+++ wine/windows/winhelp.c Wed Oct 30 23:57:09 2002
@@ -78,8 +78,7 @@
/**********************************************************************
* 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 @@
/**********************************************************************
* 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;
