Ricardo Filipe : include: Fix commdlg hook procedures return type.
Alexandre Julliard
julliard at winehq.org
Mon Feb 9 10:29:54 CST 2009
Module: wine
Branch: master
Commit: d904d1359a8b5a313e522c824b7a61fd6598c4d5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d904d1359a8b5a313e522c824b7a61fd6598c4d5
Author: Ricardo Filipe <ricardo_barbano at hotmail.com>
Date: Sun Feb 8 12:20:47 2009 +0000
include: Fix commdlg hook procedures return type.
---
dlls/comdlg32/tests/filedlg.c | 4 ++--
include/commdlg.h | 6 +++---
programs/regedit/framewnd.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c
index 9c3487f..cff103e 100644
--- a/dlls/comdlg32/tests/filedlg.c
+++ b/dlls/comdlg32/tests/filedlg.c
@@ -29,7 +29,7 @@
/* ##### */
-static UINT CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
LPNMHDR nmh;
@@ -135,7 +135,7 @@ static void test_DialogCancel(void)
}
}
-static UINT CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (msg == WM_NOTIFY)
{
diff --git a/include/commdlg.h b/include/commdlg.h
index 8d410bd..b6e40c6 100644
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -72,7 +72,7 @@ extern "C" {
#define SAVE_DIALOG 1
#define OPEN_DIALOG 2
-typedef UINT (CALLBACK *LPOFNHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef UINT_PTR (CALLBACK *LPOFNHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
typedef struct tagOFNA {
DWORD lStructSize;
@@ -168,7 +168,7 @@ typedef struct _OFNOTIFYEXW
DECL_WINELIB_TYPE_AW(OFNOTIFYEX)
DECL_WINELIB_TYPE_AW(LPOFNOTIFYEX)
-typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef UINT_PTR (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
typedef struct {
DWORD lStructSize;
@@ -210,7 +210,7 @@ DECL_WINELIB_TYPE_AW(LPCHOOSECOLOR)
#define CC_SOLIDCOLOR 0x00000080
#define CC_ANYCOLOR 0x00000100
-typedef UINT (CALLBACK *LPFRHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef UINT_PTR (CALLBACK *LPFRHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
typedef struct {
DWORD lStructSize;
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 79dcf24..6c8745e 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -259,7 +259,7 @@ static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAMEW *pOpenFil
pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR));
}
-static UINT CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
{
static OPENFILENAMEW* pOpenFileName;
OFNOTIFYW *pOfNotify;
More information about the wine-cvs
mailing list