Change the callback declarations to a safer format.

This commit is contained in:
Francois Gouget 2001-02-12 01:29:08 +00:00 committed by Alexandre Julliard
parent 2fd8388c7b
commit 40774c3c91
8 changed files with 9 additions and 10 deletions

View File

@ -8,7 +8,7 @@
#define _INC_PROCESS #define _INC_PROCESS
typedef void (*LPBEGINTHREAD)(LPVOID); typedef void (*LPBEGINTHREAD)(LPVOID);
typedef UINT (WINAPI *LPBEGINTHREADEX)(LPVOID); typedef UINT WINAPI (*LPBEGINTHREADEX)(LPVOID);
ULONG _beginthread(LPBEGINTHREAD,UINT,LPVOID); ULONG _beginthread(LPBEGINTHREAD,UINT,LPVOID);
void _endthread(void); void _endthread(void);

View File

@ -26,9 +26,9 @@ typedef struct _INFCONTEXT
UINT Line; UINT Line;
} INFCONTEXT, *PINFCONTEXT; } INFCONTEXT, *PINFCONTEXT;
typedef UINT (CALLBACK* PSP_FILE_CALLBACK_A)( PVOID Context, UINT Notification, typedef UINT CALLBACK (*PSP_FILE_CALLBACK_A)( PVOID Context, UINT Notification,
UINT Param1, UINT Param2 ); UINT Param1, UINT Param2 );
typedef UINT (CALLBACK* PSP_FILE_CALLBACK_W)( PVOID Context, UINT Notification, typedef UINT CALLBACK (*PSP_FILE_CALLBACK_W)( PVOID Context, UINT Notification,
UINT Param1, UINT Param2 ); UINT Param1, UINT Param2 );
#define PSP_FILE_CALLBACK WINELIB_NAME_AW(PSP_FILE_CALLBACK_) #define PSP_FILE_CALLBACK WINELIB_NAME_AW(PSP_FILE_CALLBACK_)

View File

@ -237,7 +237,7 @@ typedef struct _DllVersionInfo {
#define DLLVER_PLATFORM_WINDOWS 0x00000001 // Windows 9x #define DLLVER_PLATFORM_WINDOWS 0x00000001 // Windows 9x
#define DLLVER_PLATFORM_NT 0x00000002 // Windows NT #define DLLVER_PLATFORM_NT 0x00000002 // Windows NT
typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *); typedef HRESULT CALLBACK (*DLLGETVERSIONPROC)(DLLVERSIONINFO *);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

View File

@ -680,7 +680,7 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb
ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0) ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0)
inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam, inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam,
LONG (CALLBACK *fpfnStatus)(LPARAM, UINT, LONG)) LONG CALLBACK (*fpfnStatus)(LPARAM, UINT, LONG))
{ {
ICSETSTATUSPROC ic; ICSETSTATUSPROC ic;

View File

@ -23,7 +23,7 @@ extern "C" {
typedef DWORD CALLBACK (*LPTHREAD_START_ROUTINE)(LPVOID); typedef DWORD CALLBACK (*LPTHREAD_START_ROUTINE)(LPVOID);
typedef VOID (WINAPI *PFIBER_START_ROUTINE)( LPVOID lpFiberParameter ); typedef VOID WINAPI (*PFIBER_START_ROUTINE)( LPVOID lpFiberParameter );
typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
typedef RTL_CRITICAL_SECTION CRITICAL_SECTION; typedef RTL_CRITICAL_SECTION CRITICAL_SECTION;

View File

@ -641,7 +641,7 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs);
*/ */
/* SHCreateShellFolderViewEx callback function */ /* SHCreateShellFolderViewEx callback function */
typedef HRESULT (CALLBACK* LPFNSFVCALLBACK)( typedef HRESULT CALLBACK (*LPFNSFVCALLBACK)(
DWORD dwUser, DWORD dwUser,
LPSHELLFOLDER pshf, LPSHELLFOLDER pshf,
HWND hWnd, HWND hWnd,

View File

@ -196,8 +196,7 @@ typedef struct _OVERLAPPED * LPWSAOVERLAPPED;
typedef HANDLE WSAEVENT; typedef HANDLE WSAEVENT;
typedef unsigned int GROUP; typedef unsigned int GROUP;
typedef void typedef void CALLBACK (*LPWSAOVERLAPPED_COMPLETION_ROUTINE)
(CALLBACK * LPWSAOVERLAPPED_COMPLETION_ROUTINE)
( (
DWORD dwError, DWORD dwError,
DWORD cbTransferred, DWORD cbTransferred,

View File

@ -136,7 +136,7 @@ DECL_WINELIB_TYPE_AW(LPENUM_SERVICE_STATUS)
/* Service control handler function prototype */ /* Service control handler function prototype */
typedef VOID (WINAPI *LPHANDLER_FUNCTION)(DWORD); typedef VOID WINAPI (*LPHANDLER_FUNCTION)(DWORD);
/* API function prototypes */ /* API function prototypes */