Move __stdcall/__cdecl to the right place.

dlls/comctl32/animate.c

@@ -25,10 +25,10 @@ DEFAULT_DEBUG_CHANNEL(animate);
 
 static struct {
     HMODULE	hModule;
-    HIC         WINAPI  (*fnICOpen)(DWORD, DWORD, UINT);
-    LRESULT     WINAPI  (*fnICClose)(HIC);
-    LRESULT     WINAPI  (*fnICSendMessage)(HIC, UINT, DWORD, DWORD);
-    DWORD       WINAPIV (*fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
+    HIC         (WINAPI *fnICOpen)(DWORD, DWORD, UINT);
+    LRESULT     (WINAPI *fnICClose)(HIC);
+    LRESULT     (WINAPI *fnICSendMessage)(HIC, UINT, DWORD, DWORD);
+    DWORD       (WINAPIV *fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
 } fnIC;
 
 typedef struct

dlls/comctl32/smoothscroll.c

@@ -17,7 +17,7 @@ DEFAULT_DEBUG_CHANNEL(commctrl);
 
 static DWORD	smoothscroll = 2;
 
-typedef BOOL CALLBACK (*SCROLLWINDOWEXPROC)(HWND,INT,INT,LPRECT,LPRECT,HRGN,LPRECT,DWORD);
+typedef BOOL (CALLBACK *SCROLLWINDOWEXPROC)(HWND,INT,INT,LPRECT,LPRECT,HRGN,LPRECT,DWORD);
 typedef struct tagSMOOTHSCROLLSTRUCT {
 	DWORD			dwSize;
 	DWORD			x2;

dlls/commdlg/cdlg.h

@@ -94,16 +94,16 @@ typedef struct {
 
 /* ITEMIDLIST */
 
-extern LPITEMIDLIST WINAPI (*COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
-extern LPITEMIDLIST WINAPI (*COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
-extern LPITEMIDLIST WINAPI (*COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
-extern BOOL WINAPI (*COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
-extern BOOL WINAPI (*COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
+extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
+extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
+extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
+extern BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
+extern BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
 
 /* SHELL */
-extern LPVOID WINAPI (*COMDLG32_SHAlloc)(DWORD);
-extern DWORD WINAPI (*COMDLG32_SHFree)(LPVOID);
-extern BOOL WINAPI (*COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR);
+extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD);
+extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID);
+extern BOOL (WINAPI *COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR);
 
 extern BOOL  WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType);
 extern BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType);
@@ -112,7 +112,7 @@ extern BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType);
 
 #include "pshpack1.h"
 
-typedef UINT16 CALLBACK (*LPOFNHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
+typedef UINT16 (CALLBACK *LPOFNHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
 
 typedef struct {
 	DWORD		lStructSize;
@@ -137,7 +137,7 @@ typedef struct {
 	SEGPTR 		lpTemplateName;
 }   OPENFILENAME16,*LPOPENFILENAME16;
 
-typedef UINT16 CALLBACK (*LPCCHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
+typedef UINT16 (CALLBACK *LPCCHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
 
 typedef struct {
 	DWORD		lStructSize;
@@ -152,7 +152,7 @@ typedef struct {
 } CHOOSECOLOR16;
 typedef CHOOSECOLOR16 *LPCHOOSECOLOR16;
 
-typedef UINT16 CALLBACK (*LPFRHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
+typedef UINT16 (CALLBACK *LPFRHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
 typedef struct {
 	DWORD		lStructSize; 			/* size of this struct 0x20 */
 	HWND16		hwndOwner; 				/* handle to owner's window */
@@ -168,7 +168,7 @@ typedef struct {
 	SEGPTR 		lpTemplateName;         /* custom template name     */
 } FINDREPLACE16, *LPFINDREPLACE16;
 
-typedef UINT16 CALLBACK (*LPCFHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
+typedef UINT16 (CALLBACK *LPCFHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
 typedef struct 
 {
 	DWORD			lStructSize;
@@ -194,8 +194,8 @@ typedef struct
 } CHOOSEFONT16, *LPCHOOSEFONT16;
 
 
-typedef UINT16 CALLBACK (*LPPRINTHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
-typedef UINT16 CALLBACK (*LPSETUPHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
+typedef UINT16 (CALLBACK *LPPRINTHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
+typedef UINT16 (CALLBACK *LPSETUPHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
 typedef struct
 {
     DWORD            lStructSize;

dlls/commdlg/cdlg32.c

@@ -25,16 +25,16 @@ HINSTANCE	SHELL32_hInstance = 0;
 HINSTANCE	SHFOLDER_hInstance = 0;
 
 /* ITEMIDLIST */
-LPITEMIDLIST WINAPI (*COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
-LPITEMIDLIST WINAPI (*COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
-LPITEMIDLIST WINAPI (*COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
-BOOL WINAPI (*COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
-BOOL WINAPI (*COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
+LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
+LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
+LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
+BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
+BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
 
 /* SHELL */
-LPVOID WINAPI (*COMDLG32_SHAlloc)(DWORD);
-DWORD WINAPI (*COMDLG32_SHFree)(LPVOID);
-BOOL WINAPI (*COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR);
+LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD);
+DWORD (WINAPI *COMDLG32_SHFree)(LPVOID);
+BOOL (WINAPI *COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR);
 
 /***********************************************************************
  *	COMDLG32_DllEntryPoint			(COMDLG32.init)

dlls/ddraw/ddraw_private.h

@@ -265,7 +265,7 @@ struct IDirectDrawSurfaceImpl
     BOOL (*aux_flip)(LPVOID ctx, LPVOID data);
     void (*aux_unlock)(LPVOID ctx, LPVOID data, LPRECT lpRect);
     struct IDirect3DTexture2Impl*	texture;
-    HRESULT WINAPI		(*SetColorKey_cb)(struct IDirect3DTexture2Impl *texture, DWORD dwFlags, LPDDCOLORKEY ckey ) ; 
+    HRESULT (WINAPI *SetColorKey_cb)(struct IDirect3DTexture2Impl *texture, DWORD dwFlags, LPDDCOLORKEY ckey ) ; 
 };
 
 /*****************************************************************************

dlls/dplayx/dplaysp.h

@@ -9,7 +9,7 @@ DEFINE_GUID(IID_IDirectPlaySP, 0xc9f6360, 0xcc61, 0x11cf, 0xac, 0xec, 0x0, 0xaa,
 typedef struct IDirectPlaySP IDirectPlaySP, *LPDIRECTPLAYSP;
 
 
-typedef BOOL CALLBACK (*LPENUMMRUCALLBACK)( LPCVOID lpData,
+typedef BOOL (CALLBACK *LPENUMMRUCALLBACK)( LPCVOID lpData,
                                             DWORD  dwDataSize,
                                             LPVOID lpContext );
 
@@ -261,28 +261,28 @@ typedef struct tagDPSP_SHUTDOWNDATA
 
 
 /* Prototypes returned by SPInit */
-typedef HRESULT WINAPI (*LPDPSP_CREATEPLAYER)(LPDPSP_CREATEPLAYERDATA);
-typedef HRESULT WINAPI (*LPDPSP_DELETEPLAYER)(LPDPSP_DELETEPLAYERDATA);
-typedef HRESULT WINAPI (*LPDPSP_SEND)(LPDPSP_SENDDATA);
-typedef HRESULT WINAPI (*LPDPSP_ENUMSESSIONS)(LPDPSP_ENUMSESSIONSDATA);
-typedef HRESULT WINAPI (*LPDPSP_REPLY)(LPDPSP_REPLYDATA);
-typedef HRESULT WINAPI (*LPDPSP_SHUTDOWN)(void);
-typedef HRESULT WINAPI (*LPDPSP_CREATEGROUP)(LPDPSP_CREATEGROUPDATA);
-typedef HRESULT WINAPI (*LPDPSP_DELETEGROUP)(LPDPSP_DELETEGROUPDATA);
-typedef HRESULT WINAPI (*LPDPSP_ADDPLAYERTOGROUP)(LPDPSP_ADDPLAYERTOGROUPDATA);
-typedef HRESULT WINAPI (*LPDPSP_REMOVEPLAYERFROMGROUP)(LPDPSP_REMOVEPLAYERFROMGROUPDATA);
-typedef HRESULT WINAPI (*LPDPSP_GETCAPS)(LPDPSP_GETCAPSDATA);
-typedef HRESULT WINAPI (*LPDPSP_GETADDRESS)(LPDPSP_GETADDRESSDATA);
-typedef HRESULT WINAPI (*LPDPSP_GETADDRESSCHOICES)(LPDPSP_GETADDRESSCHOICESDATA);
-typedef HRESULT WINAPI (*LPDPSP_OPEN)(LPDPSP_OPENDATA);
-typedef HRESULT WINAPI (*LPDPSP_CLOSE)(void);
-typedef HRESULT WINAPI (*LPDPSP_SENDTOGROUP)(LPDPSP_SENDTOGROUPDATA);
-typedef HRESULT WINAPI (*LPDPSP_SHUTDOWNEX)(LPDPSP_SHUTDOWNDATA);
-typedef HRESULT WINAPI (*LPDPSP_CLOSEEX)(LPDPSP_CLOSEDATA);
-typedef HRESULT WINAPI (*LPDPSP_SENDEX)(LPDPSP_SENDEXDATA);
-typedef HRESULT WINAPI (*LPDPSP_SENDTOGROUPEX)(LPDPSP_SENDTOGROUPEXDATA);
-typedef HRESULT WINAPI (*LPDPSP_CANCEL)(LPDPSP_CANCELDATA);
-typedef HRESULT WINAPI (*LPDPSP_GETMESSAGEQUEUE)(LPDPSP_GETMESSAGEQUEUEDATA);
+typedef HRESULT (WINAPI *LPDPSP_CREATEPLAYER)(LPDPSP_CREATEPLAYERDATA);
+typedef HRESULT (WINAPI *LPDPSP_DELETEPLAYER)(LPDPSP_DELETEPLAYERDATA);
+typedef HRESULT (WINAPI *LPDPSP_SEND)(LPDPSP_SENDDATA);
+typedef HRESULT (WINAPI *LPDPSP_ENUMSESSIONS)(LPDPSP_ENUMSESSIONSDATA);
+typedef HRESULT (WINAPI *LPDPSP_REPLY)(LPDPSP_REPLYDATA);
+typedef HRESULT (WINAPI *LPDPSP_SHUTDOWN)(void);
+typedef HRESULT (WINAPI *LPDPSP_CREATEGROUP)(LPDPSP_CREATEGROUPDATA);
+typedef HRESULT (WINAPI *LPDPSP_DELETEGROUP)(LPDPSP_DELETEGROUPDATA);
+typedef HRESULT (WINAPI *LPDPSP_ADDPLAYERTOGROUP)(LPDPSP_ADDPLAYERTOGROUPDATA);
+typedef HRESULT (WINAPI *LPDPSP_REMOVEPLAYERFROMGROUP)(LPDPSP_REMOVEPLAYERFROMGROUPDATA);
+typedef HRESULT (WINAPI *LPDPSP_GETCAPS)(LPDPSP_GETCAPSDATA);
+typedef HRESULT (WINAPI *LPDPSP_GETADDRESS)(LPDPSP_GETADDRESSDATA);
+typedef HRESULT (WINAPI *LPDPSP_GETADDRESSCHOICES)(LPDPSP_GETADDRESSCHOICESDATA);
+typedef HRESULT (WINAPI *LPDPSP_OPEN)(LPDPSP_OPENDATA);
+typedef HRESULT (WINAPI *LPDPSP_CLOSE)(void);
+typedef HRESULT (WINAPI *LPDPSP_SENDTOGROUP)(LPDPSP_SENDTOGROUPDATA);
+typedef HRESULT (WINAPI *LPDPSP_SHUTDOWNEX)(LPDPSP_SHUTDOWNDATA);
+typedef HRESULT (WINAPI *LPDPSP_CLOSEEX)(LPDPSP_CLOSEDATA);
+typedef HRESULT (WINAPI *LPDPSP_SENDEX)(LPDPSP_SENDEXDATA);
+typedef HRESULT (WINAPI *LPDPSP_SENDTOGROUPEX)(LPDPSP_SENDTOGROUPEXDATA);
+typedef HRESULT (WINAPI *LPDPSP_CANCEL)(LPDPSP_CANCELDATA);
+typedef HRESULT (WINAPI *LPDPSP_GETMESSAGEQUEUE)(LPDPSP_GETMESSAGEQUEUEDATA);
 
 
 typedef struct tagDPSP_SPCALLBACKS
@@ -330,7 +330,7 @@ typedef struct tagSPINITDATA
     DWORD               dwSPVersion;        
 } SPINITDATA, *LPSPINITDATA;
 
-typedef HRESULT WINAPI (*LPDPSP_SPINIT)(LPSPINITDATA);
+typedef HRESULT (WINAPI *LPDPSP_SPINIT)(LPSPINITDATA);
 
 /* This variable is exported from the DLL at ordinal 6 to be accessed by the 
  * SP directly 

dlls/gdi/printdrv.c

@@ -656,7 +656,7 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
     return nRet;
 }
 
-typedef INT WINAPI (*MSGBOX_PROC)( HWND, LPCSTR, LPCSTR, UINT );
+typedef INT (WINAPI *MSGBOX_PROC)( HWND, LPCSTR, LPCSTR, UINT );
 
 /**********************************************************************
  *           WriteDialog   (GDI.242)

dlls/imm32/imm_private.h

@@ -16,43 +16,43 @@ typedef struct IMM32_tagMOVEABLEMEM	IMM32_MOVEABLEMEM;
 
 /* IME APIs */
 
-typedef BOOL WINAPI (*IMM32_pImeInquireA)(LPIMEINFO, LPSTR, LPCSTR);
-typedef BOOL WINAPI (*IMM32_pImeInquireW)(LPIMEINFO, LPWSTR, LPCWSTR);
+typedef BOOL (WINAPI *IMM32_pImeInquireA)(LPIMEINFO, LPSTR, LPCSTR);
+typedef BOOL (WINAPI *IMM32_pImeInquireW)(LPIMEINFO, LPWSTR, LPCWSTR);
 
-typedef  BOOL WINAPI (*IMM32_pImeConfigureA)(HKL, HWND, DWORD, LPVOID);
-typedef  BOOL WINAPI (*IMM32_pImeConfigureW)(HKL, HWND, DWORD, LPVOID);
-typedef  DWORD WINAPI (*IMM32_pImeConversionListA)
+typedef  BOOL (WINAPI *IMM32_pImeConfigureA)(HKL, HWND, DWORD, LPVOID);
+typedef  BOOL (WINAPI *IMM32_pImeConfigureW)(HKL, HWND, DWORD, LPVOID);
+typedef  DWORD (WINAPI *IMM32_pImeConversionListA)
 	(HIMC, LPCSTR, LPCANDIDATELIST, DWORD, UINT);
-typedef  DWORD WINAPI (*IMM32_pImeConversionListW)
+typedef  DWORD (WINAPI *IMM32_pImeConversionListW)
 	(HIMC, LPCWSTR, LPCANDIDATELIST, DWORD, UINT);
-typedef  BOOL WINAPI (*IMM32_pImeDestroy)(UINT);
-typedef  UINT WINAPI (*IMM32_pImeEnumRegisterWordA)
+typedef  BOOL (WINAPI *IMM32_pImeDestroy)(UINT);
+typedef  UINT (WINAPI *IMM32_pImeEnumRegisterWordA)
 	(REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID);
-typedef  UINT WINAPI (*IMM32_pImeEnumRegisterWordW)
+typedef  UINT (WINAPI *IMM32_pImeEnumRegisterWordW)
 	(REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID);
-typedef UINT WINAPI (*IMM32_pImeGetRegisterWordStyleA)(UINT, LPSTYLEBUFA);
-typedef UINT WINAPI (*IMM32_pImeGetRegisterWordStyleW)(UINT, LPSTYLEBUFW);
-typedef LRESULT WINAPI (*IMM32_pImeEscapeA)(HIMC, UINT, LPVOID);
-typedef LRESULT WINAPI (*IMM32_pImeEscapeW)(HIMC, UINT, LPVOID);
-typedef BOOL WINAPI (*IMM32_pImeProcessKey)(HIMC, UINT, LPARAM, CONST LPBYTE);
-typedef BOOL WINAPI (*IMM32_pImeRegisterWordA)(LPCSTR, DWORD, LPCSTR);
-typedef BOOL WINAPI (*IMM32_pImeRegisterWordW)(LPCWSTR, DWORD, LPCWSTR);
-typedef BOOL WINAPI (*IMM32_pImeSelect)(HIMC, BOOL);
-typedef BOOL WINAPI (*IMM32_pImeSetActiveContext)(HIMC, BOOL);
-typedef BOOL WINAPI (*IMM32_pImeSetCompositionStringA)
+typedef UINT (WINAPI *IMM32_pImeGetRegisterWordStyleA)(UINT, LPSTYLEBUFA);
+typedef UINT (WINAPI *IMM32_pImeGetRegisterWordStyleW)(UINT, LPSTYLEBUFW);
+typedef LRESULT (WINAPI *IMM32_pImeEscapeA)(HIMC, UINT, LPVOID);
+typedef LRESULT (WINAPI *IMM32_pImeEscapeW)(HIMC, UINT, LPVOID);
+typedef BOOL (WINAPI *IMM32_pImeProcessKey)(HIMC, UINT, LPARAM, CONST LPBYTE);
+typedef BOOL (WINAPI *IMM32_pImeRegisterWordA)(LPCSTR, DWORD, LPCSTR);
+typedef BOOL (WINAPI *IMM32_pImeRegisterWordW)(LPCWSTR, DWORD, LPCWSTR);
+typedef BOOL (WINAPI *IMM32_pImeSelect)(HIMC, BOOL);
+typedef BOOL (WINAPI *IMM32_pImeSetActiveContext)(HIMC, BOOL);
+typedef BOOL (WINAPI *IMM32_pImeSetCompositionStringA)
 	(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD);
-typedef BOOL WINAPI (*IMM32_pImeSetCompositionStringW)
+typedef BOOL (WINAPI *IMM32_pImeSetCompositionStringW)
 	(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD);
-typedef UINT WINAPI (*IMM32_pImeToAsciiEx)
+typedef UINT (WINAPI *IMM32_pImeToAsciiEx)
 	(UINT, UINT, CONST LPBYTE, LPDWORD, UINT, HIMC);
-typedef BOOL WINAPI (*IMM32_pImeUnregisterWordA)(LPCSTR, DWORD, LPCSTR);
-typedef BOOL WINAPI (*IMM32_pImeUnregisterWordW)(LPCWSTR, DWORD, LPCWSTR);
-typedef BOOL WINAPI (*IMM32_pNotifyIME)(HIMC, DWORD, DWORD, DWORD);
+typedef BOOL (WINAPI *IMM32_pImeUnregisterWordA)(LPCSTR, DWORD, LPCSTR);
+typedef BOOL (WINAPI *IMM32_pImeUnregisterWordW)(LPCWSTR, DWORD, LPCWSTR);
+typedef BOOL (WINAPI *IMM32_pNotifyIME)(HIMC, DWORD, DWORD, DWORD);
 
 /* for Win98 and later */
-typedef DWORD WINAPI (*IMM32_pImeGetImeMenuItemsA)
+typedef DWORD (WINAPI *IMM32_pImeGetImeMenuItemsA)
 	(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOA, LPIMEMENUITEMINFOA, DWORD);
-typedef DWORD WINAPI (*IMM32_pImeGetImeMenuItemsW)
+typedef DWORD (WINAPI *IMM32_pImeGetImeMenuItemsW)
 	(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD);
 
 struct IMM32_IME_EXPORTED_HANDLERS

dlls/kernel/string.c

@@ -9,8 +9,8 @@
 #include "wine/winbase16.h"
 
 
-static INT WINAPI (*pLoadStringA)(HINSTANCE, UINT, LPSTR, INT);
-static INT WINAPI (*pwvsprintfA)(LPSTR, LPCSTR, va_list);
+static INT (WINAPI *pLoadStringA)(HINSTANCE, UINT, LPSTR, INT);
+static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, va_list);
 
 /***********************************************************************
  * Helper for k32 family functions

dlls/kernel/utthunk.c

@@ -50,7 +50,7 @@ typedef struct _UTINFO
 
 static UTINFO *UT_head; /* head of Universal Thunk list */
 
-typedef DWORD CALLBACK (*UTGLUEPROC)( LPVOID lpBuff, DWORD dwUserDefined );
+typedef DWORD (CALLBACK *UTGLUEPROC)( LPVOID lpBuff, DWORD dwUserDefined );
 
 BOOL WINAPI UTRegister( HMODULE hModule, LPSTR lpsz16BITDLL, 
                         LPSTR lpszInitName, LPSTR lpszProcName,

dlls/lzexpand/lzexpand_main.c

@@ -502,7 +502,7 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest )
 	/* we need that weird typedef, for i can't seem to get function pointer
 	 * casts right. (Or they probably just do not like WINAPI in general)
 	 */
-	typedef	UINT	WINAPI (*_readfun)(HFILE,LPVOID,UINT);
+	typedef	UINT	(WINAPI *_readfun)(HFILE,LPVOID,UINT);
 
 	_readfun	xread;
 

dlls/msacm/wineacm.h

@@ -8,13 +8,13 @@
 /***********************************************************************
  * Win16 definitions
  */
-typedef BOOL16 CALLBACK (*ACMDRIVERENUMCB16)(
+typedef BOOL16 (CALLBACK *ACMDRIVERENUMCB16)(
   HACMDRIVERID16 hadid, DWORD dwInstance, DWORD fdwSupport
 );
-typedef UINT CALLBACK (*ACMFILTERCHOOSEHOOKPROC16)(
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
   HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 );
-typedef UINT16 CALLBACK (*ACMFORMATCHOOSEHOOKPROC16)(
+typedef UINT16 (CALLBACK *ACMFORMATCHOOSEHOOKPROC16)(
   HWND16 hwnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam
 );
 
@@ -142,22 +142,22 @@ typedef struct _ACMFORMATTAGDETAILS16
 
 typedef ACMSTREAMHEADER ACMSTREAMHEADER16, *NPACMSTREAMHEADER16, *LPACMSTREAMHEADER16;
 
-typedef BOOL16 CALLBACK (*ACMFILTERENUMCB16)(
+typedef BOOL16 (CALLBACK *ACMFILTERENUMCB16)(
  HACMDRIVERID16 hadid, LPACMFILTERDETAILS16 pafd,
  DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL16 CALLBACK (*ACMFILTERTAGENUMCB16)(
+typedef BOOL16 (CALLBACK *ACMFILTERTAGENUMCB16)(
   HACMDRIVERID16 hadid, LPACMFILTERTAGDETAILS16 paftd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL16 CALLBACK (*ACMFORMATENUMCB16)(
+typedef BOOL16 (CALLBACK *ACMFORMATENUMCB16)(
   HACMDRIVERID16 hadid, LPACMFORMATDETAILS16 pafd,
   DWORD dwInstance, DWORD fdwSupport
 );
 
-typedef BOOL16 CALLBACK (*ACMFORMATTAGENUMCB16)(
+typedef BOOL16 (CALLBACK *ACMFORMATTAGENUMCB16)(
   HACMDRIVERID16 hadid, LPACMFORMATTAGDETAILS16 paftd,
   DWORD dwInstance, DWORD fdwSupport
 );

dlls/ole32/compobj.c

@@ -1241,7 +1241,7 @@ HRESULT WINAPI CoGetClassObject(
     WCHAR ProviderName[MAX_PATH+1];
     DWORD ProviderNameLen = sizeof(ProviderName);
     HINSTANCE hLibrary;
-    typedef HRESULT CALLBACK (*DllGetClassObjectFunc)(REFCLSID clsid,
+    typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid,
 			     REFIID iid, LPVOID *ppv);
     DllGetClassObjectFunc DllGetClassObject;
     HKEY key;

dlls/setupapi/setupx16.h

@@ -337,9 +337,9 @@ enum {
 	VCPM_FILECERTIFYWARN
 };
 
-typedef LRESULT CALLBACK (*VIFPROC)(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, LPARAM lParam, LPARAM lparamRef);
+typedef LRESULT (CALLBACK *VIFPROC)(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, LPARAM lParam, LPARAM lparamRef);
 
-typedef int CALLBACK (*VCPENUMPROC)(LPVIRTNODE lpvn, LPARAM lparamRef);
+typedef int (CALLBACK *VCPENUMPROC)(LPVIRTNODE lpvn, LPARAM lparamRef);
 
 RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef);
 RETERR16 WINAPI VcpQueueCopy16(

dlls/shell32/shell32_main.c

@@ -968,23 +968,23 @@ HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi)
  * all are once per process
  *
  */
-void	WINAPI (*pDLLInitComctl)(LPVOID);
-
-LPVOID	WINAPI (*pCOMCTL32_Alloc) (INT);  
-BOOL	WINAPI (*pCOMCTL32_Free) (LPVOID);  
-
-HDPA	WINAPI (*pDPA_Create) (INT);  
-INT	WINAPI (*pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
-BOOL	WINAPI (*pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
-LPVOID	WINAPI (*pDPA_GetPtr) (const HDPA, INT);   
-BOOL	WINAPI (*pDPA_Destroy) (const HDPA); 
-INT	WINAPI (*pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
-LPVOID	WINAPI (*pDPA_DeletePtr) (const HDPA hdpa, INT i);
-HANDLE  WINAPI (*pCreateMRUListA) (LPVOID lpcml);
-DWORD   WINAPI (*pFreeMRUListA) (HANDLE hMRUList);
-INT     WINAPI (*pAddMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData);
-INT     WINAPI (*pFindMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum);
-INT     WINAPI (*pEnumMRUListA) (HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize);
+void	(WINAPI *pDLLInitComctl)(LPVOID);
+
+LPVOID	(WINAPI *pCOMCTL32_Alloc) (INT);  
+BOOL	(WINAPI *pCOMCTL32_Free) (LPVOID);  
+
+HDPA	(WINAPI *pDPA_Create) (INT);  
+INT	(WINAPI *pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
+BOOL	(WINAPI *pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
+LPVOID	(WINAPI *pDPA_GetPtr) (const HDPA, INT);   
+BOOL	(WINAPI *pDPA_Destroy) (const HDPA); 
+INT	(WINAPI *pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
+LPVOID	(WINAPI *pDPA_DeletePtr) (const HDPA hdpa, INT i);
+HANDLE  (WINAPI *pCreateMRUListA) (LPVOID lpcml);
+DWORD   (WINAPI *pFreeMRUListA) (HANDLE hMRUList);
+INT     (WINAPI *pAddMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData);
+INT     (WINAPI *pFindMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum);
+INT     (WINAPI *pEnumMRUListA) (HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize);
 
 static HINSTANCE	hComctl32;
 

dlls/shell32/shell32_main.h

@@ -29,32 +29,32 @@ extern HDPA		sic_hdpa;
 /*******************************************
 * pointer to functions dynamically loaded
 */
-extern void	WINAPI (*pDLLInitComctl)(LPVOID);
-
-extern LPVOID	WINAPI (*pCOMCTL32_Alloc) (INT);  
-extern BOOL	WINAPI (*pCOMCTL32_Free) (LPVOID);  
-
-extern HDPA	WINAPI (*pDPA_Create) (INT);  
-extern INT	WINAPI (*pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
-extern BOOL	WINAPI (*pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
-extern LPVOID	WINAPI (*pDPA_GetPtr) (const HDPA, INT);   
-extern BOOL	WINAPI (*pDPA_Destroy) (const HDPA); 
-extern INT	WINAPI (*pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
-extern LPVOID	WINAPI (*pDPA_DeletePtr) (const HDPA hdpa, INT i);
-extern HANDLE   WINAPI (*pCreateMRUListA) (LPVOID lpcml);
-extern DWORD    WINAPI (*pFreeMRUListA) (HANDLE hMRUList);
-extern INT      WINAPI (*pAddMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData);
-extern INT      WINAPI (*pFindMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum);
-extern INT      WINAPI (*pEnumMRUListA) (HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize);
+extern void	(WINAPI *pDLLInitComctl)(LPVOID);
+
+extern LPVOID	(WINAPI *pCOMCTL32_Alloc) (INT);  
+extern BOOL	(WINAPI *pCOMCTL32_Free) (LPVOID);  
+
+extern HDPA	(WINAPI *pDPA_Create) (INT);  
+extern INT	(WINAPI *pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
+extern BOOL	(WINAPI *pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
+extern LPVOID	(WINAPI *pDPA_GetPtr) (const HDPA, INT);   
+extern BOOL	(WINAPI *pDPA_Destroy) (const HDPA); 
+extern INT	(WINAPI *pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
+extern LPVOID	(WINAPI *pDPA_DeletePtr) (const HDPA hdpa, INT i);
+extern HANDLE   (WINAPI *pCreateMRUListA) (LPVOID lpcml);
+extern DWORD    (WINAPI *pFreeMRUListA) (HANDLE hMRUList);
+extern INT      (WINAPI *pAddMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData);
+extern INT      (WINAPI *pFindMRUData) (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum);
+extern INT      (WINAPI *pEnumMRUListA) (HANDLE hList, INT nItemPos, LPVOID lpBuffer, DWORD nBufferSize);
 #define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))   
 
 /* ole2 */
 /*
-extern HRESULT WINAPI (*pOleInitialize)(LPVOID reserved);
-extern void WINAPI (*pOleUninitialize)(void);
-extern HRESULT WINAPI (*pDoDragDrop)(IDataObject* pDataObject, IDropSource * pDropSource, DWORD dwOKEffect, DWORD * pdwEffect);
-extern HRESULT WINAPI (*pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
-extern HRESULT WINAPI (*pRevokeDragDrop)(HWND hwnd);
+extern HRESULT (WINAPI *pOleInitialize)(LPVOID reserved);
+extern void (WINAPI *pOleUninitialize)(void);
+extern HRESULT (WINAPI *pDoDragDrop)(IDataObject* pDataObject, IDropSource * pDropSource, DWORD dwOKEffect, DWORD * pdwEffect);
+extern HRESULT (WINAPI *pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
+extern HRESULT (WINAPI *pRevokeDragDrop)(HWND hwnd);
 */
 BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
 
@@ -133,14 +133,14 @@ void InitShellOle(void);
 void FreeShellOle(void);
 BOOL GetShellOle(void);
 
-HRESULT WINAPI (*pOleInitialize)(LPVOID reserved);
-void    WINAPI (*pOleUninitialize)(void);
-HRESULT WINAPI (*pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
-HRESULT WINAPI (*pRevokeDragDrop)(HWND hwnd);
-HRESULT WINAPI (*pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*); 
-void 	WINAPI (*pReleaseStgMedium)(STGMEDIUM* pmedium);
-HRESULT WINAPI (*pOleSetClipboard)(IDataObject* pDataObj);
-HRESULT WINAPI (*pOleGetClipboard)(IDataObject** ppDataObj);
+HRESULT (WINAPI *pOleInitialize)(LPVOID reserved);
+void    (WINAPI *pOleUninitialize)(void);
+HRESULT (WINAPI *pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
+HRESULT (WINAPI *pRevokeDragDrop)(HWND hwnd);
+HRESULT (WINAPI *pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*); 
+void 	(WINAPI *pReleaseStgMedium)(STGMEDIUM* pmedium);
+HRESULT (WINAPI *pOleSetClipboard)(IDataObject* pDataObj);
+HRESULT (WINAPI *pOleGetClipboard)(IDataObject** ppDataObj);
 
 HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
 HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);

dlls/shell32/shellole.c

@@ -349,7 +349,7 @@ static ICOM_VTABLE(IClassFactory) clfvt =
  *  a generic classfactory is returned
  *  when the CreateInstance of the cf is called the callback is executed
  */
-typedef HRESULT CALLBACK (*LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
+typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
 
 typedef struct
 {

dlls/shell32/shlview.c

@@ -135,7 +135,7 @@ MYTOOLINFO Tools[] =
 { -1, 0, 0, 0, 0, 0}
 };
 
-typedef void CALLBACK (*PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
+typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 
 /**********************************************************
  *	IShellView_Constructor

dlls/shell32/undocshell.h

@@ -367,7 +367,7 @@ BOOL WINAPI FileMenu_AppendItem(
 #define FMF_NO_PROGRAM_GROUPS  0x04
 
 /* FileMenu_InsertUsingPidl callback function */
-typedef void CALLBACK (*LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
 
 int WINAPI FileMenu_InsertUsingPidl(
 	HMENU hMenu,
@@ -637,7 +637,7 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs);
  */
 
 /* SHCreateShellFolderViewEx callback function */
-typedef HRESULT CALLBACK (*LPFNSFVCALLBACK)(
+typedef HRESULT (CALLBACK *LPFNSFVCALLBACK)(
 	DWORD dwUser,
 	LPSHELLFOLDER pshf,
 	HWND hWnd,
@@ -828,7 +828,7 @@ BOOL WINAPI RegisterShellHook(
 	DWORD dwType);
 
 /* SHCreateDefClassObject callback function */
-typedef HRESULT CALLBACK (*LPFNCDCOCALLBACK)(
+typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)(
 	LPUNKNOWN pUnkOuter,
 	REFIID riidObject,
 	LPVOID *ppvObject);

dlls/user/dde/ddeml16.c

@@ -25,7 +25,7 @@
 DEFAULT_DEBUG_CHANNEL(ddeml);
 
 
-typedef HDDEDATA CALLBACK (*PFNCALLBACK16)(UINT16,UINT16,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
+typedef HDDEDATA (CALLBACK *PFNCALLBACK16)(UINT16,UINT16,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
 
 typedef struct
 {

dlls/winedos/vga.c

@@ -30,7 +30,7 @@ static int vga_width;
 static int vga_height;
 static int vga_depth;
 
-typedef HRESULT WINAPI (*DirectDrawCreateProc)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN);
+typedef HRESULT (WINAPI *DirectDrawCreateProc)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN);
 static DirectDrawCreateProc pDirectDrawCreate;
 
 static PALETTEENTRY vga_def_palette[256]={

dlls/wineps/driver.c

@@ -239,9 +239,9 @@ BOOL WINAPI PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 }
 
 
-static void WINAPI (*pInitCommonControls) (void);
-static HPROPSHEETPAGE WINAPI (*pCreatePropertySheetPage) (LPCPROPSHEETPAGEA);
-static int WINAPI (*pPropertySheet) (LPCPROPSHEETHEADERA);
+static void (WINAPI *pInitCommonControls) (void);
+static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEA);
+static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERA);
 
 /***************************************************************
  *	ExtDeviceMode	[WINEPS16.90]

dlls/winmm/lolvldrv.c

@@ -17,8 +17,8 @@
 
 DEFAULT_DEBUG_CHANNEL(mmsys);
 
-typedef	DWORD	CALLBACK (*WINEMM_msgFunc16)(UINT16, WORD, DWORD, DWORD, DWORD);
-typedef	DWORD	CALLBACK (*WINEMM_msgFunc32)(UINT  , UINT, DWORD, DWORD, DWORD);
+typedef	DWORD	(CALLBACK *WINEMM_msgFunc16)(UINT16, WORD, DWORD, DWORD, DWORD);
+typedef	DWORD	(CALLBACK *WINEMM_msgFunc32)(UINT  , UINT, DWORD, DWORD, DWORD);
 
 /* for each loaded driver and each known type of driver, this structure contains
  * the information needed to access it

dlls/winmm/mmsystem.c

@@ -5274,7 +5274,7 @@ void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt)
     TRACE("done\n");
 }
 
-typedef	BOOL16 WINAPI (*MMCPLCALLBACK)(HWND, LPCSTR, LPCSTR, LPCSTR);
+typedef	BOOL16 (WINAPI *MMCPLCALLBACK)(HWND, LPCSTR, LPCSTR, LPCSTR);
 
 /**************************************************************************
  * 			mmShowMMCPLPropertySheet	[MMSYSTEM.1150]

dlls/winmm/winemm.h

@@ -12,8 +12,8 @@
 
 #include "mmddk.h"
 
-typedef DWORD WINAPI (*MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
-typedef DWORD WINAPI (*MessageProc32)(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
+typedef DWORD (WINAPI *MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
+typedef DWORD (WINAPI *MessageProc32)(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 
 /* Who said goofy boy ? */
 #define	WINE_DI_MAGIC	0x900F1B01

dlls/winspool/info.c

@@ -33,10 +33,10 @@ DEFAULT_DEBUG_CHANNEL(winspool);
 static LPWSTR *printer_array;
 static int nb_printers;
 
-static DWORD WINAPI (*GDI_CallDeviceCapabilities16)( LPCSTR lpszDevice, LPCSTR lpszPort,
+static DWORD (WINAPI *GDI_CallDeviceCapabilities16)( LPCSTR lpszDevice, LPCSTR lpszPort,
                                                      WORD fwCapability, LPSTR lpszOutput,
                                                      LPDEVMODEA lpdm );
-static INT WINAPI (*GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput,
+static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput,
                                               LPSTR lpszDevice, LPSTR lpszPort,
                                               LPDEVMODEA lpdmInput, LPSTR lpszProfile,
                                               DWORD fwMode );

include/msvcrt/process.h

@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-typedef void __cdecl (*_beginthread_start_routine_t)(void *);
-typedef unsigned int __stdcall (*_beginthreadex_start_routine_t)(void *);
+typedef void (__cdecl *_beginthread_start_routine_t)(void *);
+typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *);
 
 unsigned long _beginthread(_beginthread_start_routine_t,unsigned int,void*);
 unsigned long _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*);

libtest/hello5.c

@@ -7,7 +7,7 @@
 int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
 	SYSTEM_INFO	si;
-	void CALLBACK (*fnGetSystemInfo)(LPSYSTEM_INFO si);
+	void (CALLBACK *fnGetSystemInfo)(LPSYSTEM_INFO si);
 	HMODULE	kernel32;
 
 	kernel32 = LoadLibrary("KERNEL32");

loader/ne/segment.c

@@ -695,7 +695,7 @@ void NE_InitializeDLLs( HMODULE16 hModule )
  *
  * Call the DllEntryPoint of DLLs with subsystem >= 4.0 
  */
-typedef DWORD WINAPI (*WinNEEntryProc)(DWORD,WORD,WORD,WORD,DWORD,WORD);
+typedef DWORD (WINAPI *WinNEEntryProc)(DWORD,WORD,WORD,WORD,DWORD,WORD);
 
 static void NE_CallDllEntryPoint( NE_MODULE *pModule, DWORD dwReason )
 {

loader/pe_image.c

@@ -729,7 +729,7 @@ WINE_MODREF *PE_LoadLibraryExA (LPCSTR name, DWORD flags)
  * DLL_PROCESS_ATTACH. Only new created threads do DLL_THREAD_ATTACH
  * (SDK)
  */
-typedef DWORD CALLBACK(*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
+typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
 
 BOOL PE_InitDLL( HMODULE module, DWORD type, LPVOID lpReserved )
 {

loader/resource.c

@@ -408,7 +408,7 @@ LPVOID WINAPI LockResource( HGLOBAL handle )
     return LockResource16( handle );
 }
 
-typedef WORD WINAPI (*pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags );
+typedef WORD (WINAPI *pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags );
 
 
 /**********************************************************************

objects/palette.c

@@ -818,8 +818,8 @@ UINT WINAPI RealizePalette(
 }
 
 
-typedef HWND WINAPI (*WindowFromDC_funcptr)( HDC );
-typedef BOOL WINAPI (*RedrawWindow_funcptr)( HWND, const RECT *, HRGN, UINT );
+typedef HWND (WINAPI *WindowFromDC_funcptr)( HDC );
+typedef BOOL (WINAPI *RedrawWindow_funcptr)( HWND, const RECT *, HRGN, UINT );
 
 /**********************************************************************
  * UpdateColors [GDI32.@]  Remaps current colors to logical palette

programs/avitools/aviinfo.c

@@ -17,14 +17,14 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     AVIFILEINFO		afi;
     AVISTREAMINFO	asi;
 
-void	WINAPI (*fnAVIFileInit)(void);
-void	WINAPI (*fnAVIFileExit)(void);
-ULONG	WINAPI (*fnAVIFileRelease)(PAVIFILE);
-ULONG	WINAPI (*fnAVIStreamRelease)(PAVISTREAM);
-HRESULT WINAPI (*fnAVIFileOpen)(PAVIFILE * ppfile,LPCTSTR szFile,UINT uMode,LPCLSID lpHandler);
-HRESULT WINAPI (*fnAVIFileInfo)(PAVIFILE ppfile,AVIFILEINFO *afi,LONG size);
-HRESULT WINAPI (*fnAVIFileGetStream)(PAVIFILE ppfile,PAVISTREAM *afi,DWORD fccType,LONG lParam);
-HRESULT WINAPI (*fnAVIStreamInfo)(PAVISTREAM iface,AVISTREAMINFO *afi,LONG size);
+void	(WINAPI *fnAVIFileInit)(void);
+void	(WINAPI *fnAVIFileExit)(void);
+ULONG	(WINAPI *fnAVIFileRelease)(PAVIFILE);
+ULONG	(WINAPI *fnAVIStreamRelease)(PAVISTREAM);
+HRESULT (WINAPI *fnAVIFileOpen)(PAVIFILE * ppfile,LPCTSTR szFile,UINT uMode,LPCLSID lpHandler);
+HRESULT (WINAPI *fnAVIFileInfo)(PAVIFILE ppfile,AVIFILEINFO *afi,LONG size);
+HRESULT (WINAPI *fnAVIFileGetStream)(PAVIFILE ppfile,PAVISTREAM *afi,DWORD fccType,LONG lParam);
+HRESULT (WINAPI *fnAVIStreamInfo)(PAVISTREAM iface,AVISTREAMINFO *afi,LONG size);
 
 #define XX(x) fn##x = (void*)GetProcAddress(avifil32,#x);assert(fn##x);
 #ifdef UNICODE

programs/avitools/aviplay.c

@@ -48,18 +48,18 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     PALETTEENTRY	palent[256];
 
 
-void	WINAPI (*fnAVIFileInit)(void);
-void	WINAPI (*fnAVIFileExit)(void);
-ULONG	WINAPI (*fnAVIFileRelease)(PAVIFILE);
-ULONG	WINAPI (*fnAVIStreamRelease)(PAVISTREAM);
-HRESULT WINAPI (*fnAVIFileOpen)(PAVIFILE * ppfile,LPCTSTR szFile,UINT uMode,LPCLSID lpHandler);
-HRESULT WINAPI (*fnAVIFileInfo)(PAVIFILE ppfile,AVIFILEINFO *afi,LONG size);
-HRESULT WINAPI (*fnAVIFileGetStream)(PAVIFILE ppfile,PAVISTREAM *afi,DWORD fccType,LONG lParam);
-HRESULT WINAPI (*fnAVIStreamInfo)(PAVISTREAM iface,AVISTREAMINFO *afi,LONG size);
-HRESULT WINAPI (*fnAVIStreamReadFormat)(PAVISTREAM iface,LONG pos,LPVOID format,LPLONG size);
-PGETFRAME WINAPI (*fnAVIStreamGetFrameOpen)(PAVISTREAM iface,LPBITMAPINFOHEADER wanted);
-LPVOID WINAPI (*fnAVIStreamGetFrame)(PGETFRAME pg,LONG pos);
-HRESULT WINAPI (*fnAVIStreamGetFrameClose)(PGETFRAME pg);
+void	(WINAPI *fnAVIFileInit)(void);
+void	(WINAPI *fnAVIFileExit)(void);
+ULONG	(WINAPI *fnAVIFileRelease)(PAVIFILE);
+ULONG	(WINAPI *fnAVIStreamRelease)(PAVISTREAM);
+HRESULT (WINAPI *fnAVIFileOpen)(PAVIFILE * ppfile,LPCTSTR szFile,UINT uMode,LPCLSID lpHandler);
+HRESULT (WINAPI *fnAVIFileInfo)(PAVIFILE ppfile,AVIFILEINFO *afi,LONG size);
+HRESULT (WINAPI *fnAVIFileGetStream)(PAVIFILE ppfile,PAVISTREAM *afi,DWORD fccType,LONG lParam);
+HRESULT (WINAPI *fnAVIStreamInfo)(PAVISTREAM iface,AVISTREAMINFO *afi,LONG size);
+HRESULT (WINAPI *fnAVIStreamReadFormat)(PAVISTREAM iface,LONG pos,LPVOID format,LPLONG size);
+PGETFRAME (WINAPI *fnAVIStreamGetFrameOpen)(PAVISTREAM iface,LPBITMAPINFOHEADER wanted);
+LPVOID (WINAPI *fnAVIStreamGetFrame)(PGETFRAME pg,LONG pos);
+HRESULT (WINAPI *fnAVIStreamGetFrameClose)(PGETFRAME pg);
 
 #define XX(x) fn##x = (void*)GetProcAddress(avifil32,#x);assert(fn##x);
 #ifdef UNICODE

relay32/relay386.c

@@ -158,7 +158,7 @@ static inline void RELAY_PrintArgs( int *args, int nb_args, unsigned int typemas
 
 
 typedef LONGLONG (*LONGLONG_CPROC)();
-typedef LONGLONG WINAPI (*LONGLONG_FARPROC)();
+typedef LONGLONG (WINAPI *LONGLONG_FARPROC)();
 
 
 /***********************************************************************

windows/defwnd.c

@@ -251,7 +251,7 @@ static void DEFWND_Print( HWND hwnd, HDC hdc, ULONG uFlags)
 static HWND DEFWND_ImmGetDefaultIMEWnd( HWND hwnd )
 {
     HINSTANCE hInstIMM = GetModuleHandleA( "imm32" );
-    HWND WINAPI (*pFunc)(HWND);
+    HWND (WINAPI *pFunc)(HWND);
     HWND hwndRet = 0;
 
     if (!hInstIMM)
@@ -270,7 +270,7 @@ static HWND DEFWND_ImmGetDefaultIMEWnd( HWND hwnd )
 static BOOL DEFWND_ImmIsUIMessageA( HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     HINSTANCE hInstIMM = GetModuleHandleA( "imm32" );
-    BOOL WINAPI (*pFunc)(HWND,UINT,WPARAM,LPARAM);
+    BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM);
     BOOL fRet = FALSE;
 
     if (!hInstIMM)
@@ -289,7 +289,7 @@ static BOOL DEFWND_ImmIsUIMessageA( HWND hwndIME, UINT msg, WPARAM wParam, LPARA
 static BOOL DEFWND_ImmIsUIMessageW( HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     HINSTANCE hInstIMM = GetModuleHandleA( "imm32" );
-    BOOL WINAPI (*pFunc)(HWND,UINT,WPARAM,LPARAM);
+    BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM);
     BOOL fRet = FALSE;
 
     if (!hInstIMM)