diff --git a/include/process.h b/include/process.h index eb03635ca62af1109668ead9f374d746f7a9f38d..3c2e27456b82978f8abe65f1149bc005ff9949dc 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 ca8881a37fe15193d41c0f7a8a3faa16b7cd6916..cdc421ad4c1cda338cd806c91953c59327f63f26 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -26,9 +26,9 @@ typedef struct _INFCONTEXT 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 80ea898252ac85c5b53d11469908fc44ec38c111..64f5a57bc11080e38d65e4e1bf087943167be4ef 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -237,7 +237,7 @@ typedef struct _DllVersionInfo { #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 879a208c69c009e05fc996b2b956c4ef7da42001..1a5c197ef5354b6c6732e84f4a11e4380007ab18 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -680,7 +680,7 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb 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 80cb6a41203b79db5b215ee2b80cd9ab4f62f98c..d673d955a490da2bc09cfb3ba15950b5081c71c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -23,7 +23,7 @@ extern "C" { 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 a29d14e85dc839f298a0ca2b8d59d00bf221585c..a96a962e2be2aaf2446d45d2af08dc895a6da1dc 100644 --- a/include/wine/undocshell.h +++ b/include/wine/undocshell.h @@ -641,7 +641,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, diff --git a/include/winsock2.h b/include/winsock2.h index 96de4d4f9f513094cab59d4e0c2a1076685aad73..336288172a3eb6daf795f68457a7e6558c6e7577 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -196,8 +196,7 @@ typedef struct _OVERLAPPED * LPWSAOVERLAPPED; 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 5657b38b42ae201218fcc4af010451a818e786bf..0e9e6e00935603fe988819d00f45b81fd7eeaa85 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -136,7 +136,7 @@ DECL_WINELIB_TYPE_AW(LPENUM_SERVICE_STATUS) /* Service control handler function prototype */ -typedef VOID (WINAPI *LPHANDLER_FUNCTION)(DWORD); +typedef VOID WINAPI (*LPHANDLER_FUNCTION)(DWORD); /* API function prototypes */