From 8f6061137ae90e79f43dee7848fdddd34d5f0b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 21 Mar 2004 12:34:02 +0000
Subject: [PATCH] Fix calling convention of various callback function
 prototypes

svn path=/trunk/; revision=8827
---
 reactos/include/base.h    | 162 +++++++++++++++++++-------------------
 reactos/include/epsapi.h  |  10 +--
 reactos/include/structs.h |  28 +++----
 3 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/reactos/include/base.h b/reactos/include/base.h
index 848727e9453..6e1210168ce 100644
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -150,7 +150,7 @@ typedef HANDLE HWND;
 typedef HANDLE HRAWINPUT;
 typedef HANDLE HTASK;
 typedef HANDLE HWINEVENTHOOK;
-typedef VOID CALLBACK(* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
+typedef VOID (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
 typedef unsigned short LANGID;
 /*typedef DWORD LCID; */
 typedef DWORD LCTYPE;
@@ -498,71 +498,71 @@ typedef enum _AUDIT_EVENT_TYPE {
     AuditEventObjectAccess,
     AuditEventDirectoryServiceAccess
 } AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
-typedef int CALLBACK (*BFFCALLBACK) (HWND, UINT, LPARAM, LPARAM);
-typedef UINT CALLBACK (*LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef UINT CALLBACK (*LPCFHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef DWORD CALLBACK (*EDITSTREAMCALLBACK) (DWORD, LPBYTE, LONG, LONG);
-typedef UINT CALLBACK (*LPFRHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef UINT CALLBACK (*LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef UINT CALLBACK (*LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef UINT CALLBACK (*LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef WINBOOL CALLBACK (*DLGPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef int CALLBACK (*PFNPROPSHEETCALLBACK) (HWND, UINT, LPARAM);
-typedef VOID CALLBACK (*LPSERVICE_MAIN_FUNCTIONA) (DWORD, LPSTR*);
-typedef VOID CALLBACK (*LPSERVICE_MAIN_FUNCTIONW) (DWORD, LPWSTR*);
-typedef int CALLBACK (*PFNTVCOMPARE) (LPARAM, LPARAM, LPARAM);
-typedef LRESULT CALLBACK (*WNDPROC) (HWND, UINT, WPARAM, LPARAM);
-typedef int CALLBACK (*FARPROC)(void);
+typedef int (CALLBACK *BFFCALLBACK) (HWND, UINT, LPARAM, LPARAM);
+typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef UINT (CALLBACK *LPCFHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef DWORD (CALLBACK *EDITSTREAMCALLBACK) (DWORD, LPBYTE, LONG, LONG);
+typedef UINT (CALLBACK *LPFRHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef UINT (CALLBACK *LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef WINBOOL (CALLBACK *DLGPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef int (CALLBACK *PFNPROPSHEETCALLBACK) (HWND, UINT, LPARAM);
+typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTIONA) (DWORD, LPSTR*);
+typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTIONW) (DWORD, LPWSTR*);
+typedef int (CALLBACK *PFNTVCOMPARE) (LPARAM, LPARAM, LPARAM);
+typedef LRESULT (CALLBACK *WNDPROC) (HWND, UINT, WPARAM, LPARAM);
+typedef int (CALLBACK *FARPROC)(void);
 typedef FARPROC PROC;
-typedef WINBOOL CALLBACK (*ENUMRESTYPEPROCA) (HANDLE, LPSTR, LONG);
-typedef WINBOOL CALLBACK (*ENUMRESTYPEPROCW) (HANDLE, LPWSTR, LONG);
-typedef WINBOOL CALLBACK (*ENUMRESNAMEPROCA) (HANDLE, LPCSTR, LPSTR, LONG);
-typedef WINBOOL CALLBACK (*ENUMRESNAMEPROCW) (HANDLE, LPCWSTR, LPWSTR, LONG);
-typedef WINBOOL CALLBACK (*ENUMRESLANGPROCA) (HANDLE, LPCSTR, LPCSTR, WORD, LONG);
-typedef WINBOOL CALLBACK (*ENUMRESLANGPROCW) (HANDLE, LPCWSTR, LPCWSTR, WORD, LONG);
-typedef WINBOOL CALLBACK (*DESKTOPENUMPROCA) (LPSTR,  LPARAM);
-typedef WINBOOL CALLBACK (*DESKTOPENUMPROCW) (LPWSTR, LPARAM);
-typedef WINBOOL CALLBACK (*ENUMWINDOWSPROC) (HWND, LPARAM);
-typedef WINBOOL CALLBACK (*ENUMWINDOWSTATIONPROCA) (LPSTR, LPARAM);
-typedef WINBOOL CALLBACK (*ENUMWINDOWSTATIONPROCW) (LPWSTR, LPARAM);
-typedef VOID CALLBACK (*SENDASYNCPROC) (HWND, UINT, DWORD, LRESULT);
-typedef VOID CALLBACK (*TIMERPROC) (HWND, UINT, UINT, DWORD);
-typedef WINBOOL CALLBACK (*GRAYSTRINGPROC) (HDC, LPARAM, int);
-typedef WINBOOL CALLBACK (*DRAWSTATEPROC) (HDC, LPARAM, WPARAM, int, int);
-typedef WINBOOL CALLBACK (*PROPENUMPROCEXA) (HWND, LPCSTR, HANDLE, DWORD);
-typedef WINBOOL CALLBACK (*PROPENUMPROCEXW) (HWND, LPCWSTR, HANDLE, DWORD);
-typedef WINBOOL CALLBACK (*PROPENUMPROCA) (HWND, LPCSTR, HANDLE);
-typedef WINBOOL CALLBACK (*PROPENUMPROCW) (HWND, LPCWSTR, HANDLE);
-typedef LRESULT CALLBACK (*HOOKPROC) (int, WPARAM, LPARAM);
-typedef VOID CALLBACK (*ENUMOBJECTSPROC) (LPVOID, LPARAM);
-typedef VOID CALLBACK (*LINEDDAPROC) (int, int, LPARAM);
-typedef WINBOOL CALLBACK (*ABORTPROC) (HDC, int);
-typedef UINT CALLBACK (*LPPAGEPAINTHOOK) (HWND, UINT, WPARAM, LPARAM );
-typedef UINT CALLBACK (*LPPAGESETUPHOOK) (HWND, UINT, WPARAM, LPARAM );
-typedef int CALLBACK (*ICMENUMPROCA) (LPSTR, LPARAM);
-typedef int CALLBACK (*ICMENUMPROCW) (LPWSTR, LPARAM);
+typedef WINBOOL (CALLBACK *ENUMRESTYPEPROCA) (HANDLE, LPSTR, LONG);
+typedef WINBOOL (CALLBACK *ENUMRESTYPEPROCW) (HANDLE, LPWSTR, LONG);
+typedef WINBOOL (CALLBACK *ENUMRESNAMEPROCA) (HANDLE, LPCSTR, LPSTR, LONG);
+typedef WINBOOL (CALLBACK *ENUMRESNAMEPROCW) (HANDLE, LPCWSTR, LPWSTR, LONG);
+typedef WINBOOL (CALLBACK *ENUMRESLANGPROCA) (HANDLE, LPCSTR, LPCSTR, WORD, LONG);
+typedef WINBOOL (CALLBACK *ENUMRESLANGPROCW) (HANDLE, LPCWSTR, LPCWSTR, WORD, LONG);
+typedef WINBOOL (CALLBACK *DESKTOPENUMPROCA) (LPSTR,  LPARAM);
+typedef WINBOOL (CALLBACK *DESKTOPENUMPROCW) (LPWSTR, LPARAM);
+typedef WINBOOL (CALLBACK *ENUMWINDOWSPROC) (HWND, LPARAM);
+typedef WINBOOL (CALLBACK *ENUMWINDOWSTATIONPROCA) (LPSTR, LPARAM);
+typedef WINBOOL (CALLBACK *ENUMWINDOWSTATIONPROCW) (LPWSTR, LPARAM);
+typedef VOID (CALLBACK *SENDASYNCPROC) (HWND, UINT, DWORD, LRESULT);
+typedef VOID (CALLBACK *TIMERPROC) (HWND, UINT, UINT, DWORD);
+typedef WINBOOL (CALLBACK *GRAYSTRINGPROC) (HDC, LPARAM, int);
+typedef WINBOOL (CALLBACK *DRAWSTATEPROC) (HDC, LPARAM, WPARAM, int, int);
+typedef WINBOOL (CALLBACK *PROPENUMPROCEXA) (HWND, LPCSTR, HANDLE, DWORD);
+typedef WINBOOL (CALLBACK *PROPENUMPROCEXW) (HWND, LPCWSTR, HANDLE, DWORD);
+typedef WINBOOL (CALLBACK *PROPENUMPROCA) (HWND, LPCSTR, HANDLE);
+typedef WINBOOL (CALLBACK *PROPENUMPROCW) (HWND, LPCWSTR, HANDLE);
+typedef LRESULT (CALLBACK *HOOKPROC) (int, WPARAM, LPARAM);
+typedef VOID (CALLBACK *ENUMOBJECTSPROC) (LPVOID, LPARAM);
+typedef VOID (CALLBACK *LINEDDAPROC) (int, int, LPARAM);
+typedef WINBOOL (CALLBACK *ABORTPROC) (HDC, int);
+typedef UINT (CALLBACK *LPPAGEPAINTHOOK) (HWND, UINT, WPARAM, LPARAM );
+typedef UINT (CALLBACK *LPPAGESETUPHOOK) (HWND, UINT, WPARAM, LPARAM );
+typedef int (CALLBACK *ICMENUMPROCA) (LPSTR, LPARAM);
+typedef int (CALLBACK *ICMENUMPROCW) (LPWSTR, LPARAM);
 typedef LONG (*EDITWORDBREAKPROCEX) (char *, LONG, BYTE, INT);
-typedef int CALLBACK (*PFNLVCOMPARE) (LPARAM, LPARAM, LPARAM);
-typedef WINBOOL CALLBACK (*LOCALE_ENUMPROCA) (LPSTR);
-typedef WINBOOL CALLBACK (*LOCALE_ENUMPROCW) (LPWSTR);
-typedef WINBOOL CALLBACK (*CODEPAGE_ENUMPROCA) (LPSTR);
-typedef WINBOOL CALLBACK (*CODEPAGE_ENUMPROCW) (LPWSTR);
-typedef WINBOOL CALLBACK (*DATEFMT_ENUMPROCA) (LPSTR);
-typedef WINBOOL CALLBACK (*DATEFMT_ENUMPROCW) (LPWSTR);
-typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCA) (LPSTR);
-typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCW) (LPWSTR);
-typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCA) (LPSTR);
-typedef int CALLBACK (*EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery );
-typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCW) (LPWSTR);
-typedef WINBOOL CALLBACK (*PHANDLER_ROUTINE) (DWORD);
-typedef VOID CALLBACK (*LPHANDLER_FUNCTION) (DWORD);
-typedef DWORD CALLBACK (*LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID);
-typedef UINT CALLBACK (*PFNGETPROFILEPATHA) (LPCSTR, LPSTR, UINT);
-typedef UINT CALLBACK (*PFNGETPROFILEPATHW) (LPCWSTR, LPWSTR, UINT);
-typedef UINT CALLBACK (*PFNRECONCILEPROFILEA) (LPCSTR, LPCSTR, DWORD);
-typedef UINT CALLBACK (*PFNRECONCILEPROFILEW) (LPCWSTR, LPCWSTR, DWORD);
-typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESA) (HWND, LPCSTR, LPCSTR, LPCSTR, DWORD);
-typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR, DWORD);
+typedef int (CALLBACK *PFNLVCOMPARE) (LPARAM, LPARAM, LPARAM);
+typedef WINBOOL (CALLBACK *LOCALE_ENUMPROCA) (LPSTR);
+typedef WINBOOL (CALLBACK *LOCALE_ENUMPROCW) (LPWSTR);
+typedef WINBOOL (CALLBACK *CODEPAGE_ENUMPROCA) (LPSTR);
+typedef WINBOOL (CALLBACK *CODEPAGE_ENUMPROCW) (LPWSTR);
+typedef WINBOOL (CALLBACK *DATEFMT_ENUMPROCA) (LPSTR);
+typedef WINBOOL (CALLBACK *DATEFMT_ENUMPROCW) (LPWSTR);
+typedef WINBOOL (CALLBACK *TIMEFMT_ENUMPROCA) (LPSTR);
+typedef WINBOOL (CALLBACK *TIMEFMT_ENUMPROCW) (LPWSTR);
+typedef WINBOOL (CALLBACK *CALINFO_ENUMPROCA) (LPSTR);
+typedef int (CALLBACK *EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery );
+typedef WINBOOL (CALLBACK *CALINFO_ENUMPROCW) (LPWSTR);
+typedef WINBOOL (CALLBACK *PHANDLER_ROUTINE) (DWORD);
+typedef VOID (CALLBACK *LPHANDLER_FUNCTION) (DWORD);
+typedef DWORD (CALLBACK *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID);
+typedef UINT (CALLBACK *PFNGETPROFILEPATHA) (LPCSTR, LPSTR, UINT);
+typedef UINT (CALLBACK *PFNGETPROFILEPATHW) (LPCWSTR, LPWSTR, UINT);
+typedef UINT (CALLBACK *PFNRECONCILEPROFILEA) (LPCSTR, LPCSTR, DWORD);
+typedef UINT (CALLBACK *PFNRECONCILEPROFILEW) (LPCWSTR, LPCWSTR, DWORD);
+typedef WINBOOL (CALLBACK *PFNPROCESSPOLICIESA) (HWND, LPCSTR, LPCSTR, LPCSTR, DWORD);
+typedef WINBOOL (CALLBACK *PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR, DWORD);
 
 #ifndef _DISABLE_TIDENTS
 #ifdef UNICODE
@@ -636,18 +636,18 @@ typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR
 #define SE_CHANGE_NOTIFY_NAME             TEXT("SeChangeNotifyPrivilege")
 #define SE_REMOTE_SHUTDOWN_NAME           TEXT("SeRemoteShutdownPrivilege")
 
-typedef BOOL CALLBACK (*LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
-typedef BOOL CALLBACK (*LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
-typedef BOOL CALLBACK (*UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
-typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
-typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXA)(LPSTR, CALID);
+typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
+typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
+typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
+typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
+typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXA)(LPSTR, CALID);
 
-typedef BOOL CALLBACK (*LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
-typedef BOOL CALLBACK (*LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
-typedef BOOL CALLBACK (*UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
-typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
-typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
-typedef BOOL CALLBACK (*GEO_ENUMPROC)(GEOID);
+typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
+typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
+typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
+typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
+typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
+typedef BOOL (CALLBACK *GEO_ENUMPROC)(GEOID);
 
 #define SERVICES_ACTIVE_DATABASEW      L"ServicesActive"
 #define SERVICES_FAILED_DATABASEW      L"ServicesFailed"
@@ -700,13 +700,13 @@ typedef enum {
     LT_LOWEST_LATENCY
 } LATENCY_TIME;
 
-typedef LONG CALLBACK (*PVECTORED_EXCEPTION_HANDLER)(
+typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)(
     struct _EXCEPTION_POINTERS *ExceptionInfo
     );
 
 typedef
 VOID
-CALLBACK (*PAPCFUNC)(
+(CALLBACK *PAPCFUNC)(
     ULONG_PTR dwParam
     );
 
@@ -716,10 +716,10 @@ CALLBACK (*PAPCFUNC)(
 #define REFGUID const GUID *
 #endif
 
-typedef DWORD CALLBACK (*PFE_EXPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,ULONG ulLength);
+typedef DWORD (CALLBACK *PFE_EXPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,ULONG ulLength);
 
-typedef DWORD CALLBACK (*PFE_IMPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,PULONG ulLength);
-typedef VOID CALLBACK (*PFIBER_START_ROUTINE)(
+typedef DWORD (CALLBACK *PFE_IMPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,PULONG ulLength);
+typedef VOID (CALLBACK *PFIBER_START_ROUTINE)(
     LPVOID lpFiberParameter
     );
 typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
@@ -729,7 +729,7 @@ typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE {
     HighMemoryResourceNotification
 } MEMORY_RESOURCE_NOTIFICATION_TYPE;
 
-typedef VOID CALLBACK (*WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
+typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
 typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK;
 /* End of stuff from ddeml.h in old Cygnus headers */
 /* ----------------------------------------------- */
diff --git a/reactos/include/epsapi.h b/reactos/include/epsapi.h
index 01db5edcc42..cac0fcd3a65 100644
--- a/reactos/include/epsapi.h
+++ b/reactos/include/epsapi.h
@@ -1,4 +1,4 @@
-/* $Id: epsapi.h,v 1.3 2003/06/01 14:59:01 chorns Exp $
+/* $Id: epsapi.h,v 1.4 2004/03/21 12:34:02 gvg Exp $
 */
 /*
  * epsapi.h
@@ -32,25 +32,25 @@
 /* OBJECTS */
 
 /* TYPES */
-typedef NTSTATUS NTAPI (*PPROC_ENUM_ROUTINE)
+typedef NTSTATUS (NTAPI *PPROC_ENUM_ROUTINE)
 (
  IN PSYSTEM_PROCESSES CurrentProcess,
  IN OUT PVOID CallbackContext
 );
 
-typedef NTSTATUS NTAPI (*PTHREAD_ENUM_ROUTINE)
+typedef NTSTATUS (NTAPI *PTHREAD_ENUM_ROUTINE)
 (
  IN PSYSTEM_THREADS CurrentThread,
  IN OUT PVOID CallbackContext
 );
 
-typedef NTSTATUS NTAPI (*PSYSMOD_ENUM_ROUTINE)
+typedef NTSTATUS (NTAPI *PSYSMOD_ENUM_ROUTINE)
 (
  IN PSYSTEM_MODULE_INFORMATION_ENTRY CurrentModule,
  IN OUT PVOID CallbackContext
 );
 
-typedef NTSTATUS NTAPI (*PPROCMOD_ENUM_ROUTINE)
+typedef NTSTATUS (NTAPI *PPROCMOD_ENUM_ROUTINE)
 (
  IN HANDLE ProcessHandle,
  IN PLDR_MODULE CurrentModule,
diff --git a/reactos/include/structs.h b/reactos/include/structs.h
index db33b5bdeb2..8bc4bec495e 100644
--- a/reactos/include/structs.h
+++ b/reactos/include/structs.h
@@ -3447,7 +3447,7 @@ typedef struct tagMSG {
   POINT  pt;
 } MSG, *LPMSG;
 
-typedef void CALLBACK (*MSGBOXCALLBACK) (LPHELPINFO lpHelpInfo);
+typedef void (CALLBACK *MSGBOXCALLBACK) (LPHELPINFO lpHelpInfo);
 
 typedef struct {
   UINT      cbSize;
@@ -4492,7 +4492,7 @@ typedef struct _PROCESS_INFORMATION {
   DWORD dwThreadId;
 } PROCESS_INFORMATION, *LPPROCESS_INFORMATION;
 
-typedef UINT CALLBACK (*LPFNPSPCALLBACK) (HWND, UINT, LPVOID);
+typedef UINT (CALLBACK *LPFNPSPCALLBACK) (HWND, UINT, LPVOID);
 
 typedef struct _PROPSHEETPAGEA {
   DWORD     dwSize;
@@ -4591,8 +4591,8 @@ typedef_tident(LPPROPSHEETHEADER)
 typedef_tident(LPCPROPSHEETHEADER)
 
 /* PropertySheet callbacks */
-typedef WINBOOL CALLBACK (*LPFNADDPROPSHEETPAGE) (HPROPSHEETPAGE, LPARAM);
-typedef WINBOOL CALLBACK (*LPFNADDPROPSHEETPAGES) (LPVOID,
+typedef WINBOOL (CALLBACK *LPFNADDPROPSHEETPAGE) (HPROPSHEETPAGE, LPARAM);
+typedef WINBOOL (CALLBACK *LPFNADDPROPSHEETPAGES) (LPVOID,
 						   LPFNADDPROPSHEETPAGE,
 						   LPARAM);
 
@@ -5799,26 +5799,26 @@ typedef struct _NETCONNECTINFOSTRUCT{
   DWORD dwOptDataSize;
 } NETCONNECTINFOSTRUCT, *LPNETCONNECTINFOSTRUCT;
 
-typedef int CALLBACK (*ENUMMETAFILEPROC) (HDC, HANDLETABLE,
+typedef int (CALLBACK *ENUMMETAFILEPROC) (HDC, HANDLETABLE,
 					  METARECORD, int, LPARAM);
-typedef int CALLBACK (*ENHMETAFILEPROC) (HDC, HANDLETABLE,
+typedef int (CALLBACK *ENHMETAFILEPROC) (HDC, HANDLETABLE,
 					 ENHMETARECORD, int, LPARAM);
 
-typedef int CALLBACK (*ENUMFONTSPROCA) (LPLOGFONTA, LPTEXTMETRICA, DWORD, LPARAM);
-typedef int CALLBACK (*ENUMFONTSPROCW) (LPLOGFONTW, LPTEXTMETRICW, DWORD, LPARAM);
+typedef int (CALLBACK *ENUMFONTSPROCA) (LPLOGFONTA, LPTEXTMETRICA, DWORD, LPARAM);
+typedef int (CALLBACK *ENUMFONTSPROCW) (LPLOGFONTW, LPTEXTMETRICW, DWORD, LPARAM);
 typedef_tident(ENUMFONTSPROC)
-typedef int CALLBACK (*FONTENUMPROCA) (ENUMLOGFONTA *, NEWTEXTMETRICA *,
+typedef int (CALLBACK *FONTENUMPROCA) (ENUMLOGFONTA *, NEWTEXTMETRICA *,
 				       int, LPARAM);
-typedef int CALLBACK (*FONTENUMPROCW) (ENUMLOGFONTW *, NEWTEXTMETRICW *,
+typedef int (CALLBACK *FONTENUMPROCW) (ENUMLOGFONTW *, NEWTEXTMETRICW *,
 				       int, LPARAM);
 typedef_tident(FONTENUMPROC)
-typedef int CALLBACK (*FONTENUMEXPROCA) (ENUMLOGFONTEXA *, NEWTEXTMETRICEXA *,
+typedef int (CALLBACK *FONTENUMEXPROCA) (ENUMLOGFONTEXA *, NEWTEXTMETRICEXA *,
 				         int, LPARAM);
-typedef int CALLBACK (*FONTENUMEXPROCW) (ENUMLOGFONTEXW *, NEWTEXTMETRICEXW *,
+typedef int (CALLBACK *FONTENUMEXPROCW) (ENUMLOGFONTEXW *, NEWTEXTMETRICEXW *,
 				         int, LPARAM);
 typedef_tident(FONTENUMEXPROC)
 
-typedef VOID CALLBACK (*LPOVERLAPPED_COMPLETION_ROUTINE) (DWORD, DWORD,
+typedef VOID (CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE) (DWORD, DWORD,
 							  LPOVERLAPPED);
 
 /*
@@ -5991,7 +5991,7 @@ typedef struct _DISPLAY_DEVICE {
 typedef HANDLE HMONITOR;
 typedef HANDLE HDEVNOTIFY;
 
-typedef BOOL CALLBACK (*MonitorEnumProc)(
+typedef BOOL (CALLBACK *MonitorEnumProc)(
   HMONITOR hMonitor,
   HDC hdcMonitor,
   LPRECT lprcMonitor,