Change the callback declarations to a safer format.
diff --git a/include/process.h b/include/process.h
index eb03635..3c2e274 100644
--- a/include/process.h
+++ b/include/process.h
@@ -8,7 +8,7 @@
#define _INC_PROCESS
typedef void (*LPBEGINTHREAD)(LPVOID);
-typedef UINT (WINAPI *LPBEGINTHREADEX)(LPVOID);
+typedef UINT WINAPI (*LPBEGINTHREADEX)(LPVOID);
ULONG _beginthread(LPBEGINTHREAD,UINT,LPVOID);
void _endthread(void);
diff --git a/include/setupapi.h b/include/setupapi.h
index ca8881a..cdc421a 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -26,9 +26,9 @@
UINT Line;
} 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 );
-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 );
#define PSP_FILE_CALLBACK WINELIB_NAME_AW(PSP_FILE_CALLBACK_)
diff --git a/include/shlwapi.h b/include/shlwapi.h
index 80ea898..64f5a57 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -237,7 +237,7 @@
#define DLLVER_PLATFORM_WINDOWS 0x00000001 // Windows 9x
#define DLLVER_PLATFORM_NT 0x00000002 // Windows NT
-typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+typedef HRESULT CALLBACK (*DLLGETVERSIONPROC)(DLLVERSIONINFO *);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/include/vfw.h b/include/vfw.h
index 879a208..1a5c197 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -680,7 +680,7 @@
ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0)
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;
diff --git a/include/winbase.h b/include/winbase.h
index 80cb6a4..d673d95 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -23,7 +23,7 @@
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 RTL_CRITICAL_SECTION CRITICAL_SECTION;
diff --git a/include/wine/undocshell.h b/include/wine/undocshell.h
index a29d14e..a96a962 100644
--- a/include/wine/undocshell.h
+++ b/include/wine/undocshell.h
@@ -641,7 +641,7 @@
*/
/* SHCreateShellFolderViewEx callback function */
-typedef HRESULT (CALLBACK* LPFNSFVCALLBACK)(
+typedef HRESULT CALLBACK (*LPFNSFVCALLBACK)(
DWORD dwUser,
LPSHELLFOLDER pshf,
HWND hWnd,
diff --git a/include/winsock2.h b/include/winsock2.h
index 96de4d4..3362881 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -196,8 +196,7 @@
typedef HANDLE WSAEVENT;
typedef unsigned int GROUP;
-typedef void
-(CALLBACK * LPWSAOVERLAPPED_COMPLETION_ROUTINE)
+typedef void CALLBACK (*LPWSAOVERLAPPED_COMPLETION_ROUTINE)
(
DWORD dwError,
DWORD cbTransferred,
diff --git a/include/winsvc.h b/include/winsvc.h
index 5657b38..0e9e6e0 100644
--- a/include/winsvc.h
+++ b/include/winsvc.h
@@ -136,7 +136,7 @@
/* Service control handler function prototype */
-typedef VOID (WINAPI *LPHANDLER_FUNCTION)(DWORD);
+typedef VOID WINAPI (*LPHANDLER_FUNCTION)(DWORD);
/* API function prototypes */
