diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c index e3bf9b65dc2..140c650d5bd 100644 --- a/dlls/comctl32/smoothscroll.c +++ b/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; diff --git a/dlls/commdlg/cdlg.h b/dlls/commdlg/cdlg.h index aca356a60ae..b204e001279 100644 --- a/dlls/commdlg/cdlg.h +++ b/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; diff --git a/dlls/commdlg/cdlg32.c b/dlls/commdlg/cdlg32.c index 2fe9b1d1125..4944f220073 100644 --- a/dlls/commdlg/cdlg32.c +++ b/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.entry) diff --git a/dlls/dplayx/dplaysp.h b/dlls/dplayx/dplaysp.h index 3ca69a3694c..2fb6b41f2ce 100644 --- a/dlls/dplayx/dplaysp.h +++ b/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 diff --git a/dlls/imm32/imm_private.h b/dlls/imm32/imm_private.h index 58f0a047b69..eae5d01f02e 100644 --- a/dlls/imm32/imm_private.h +++ b/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 diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c index eae510cc658..74f42c1b1b0 100644 --- a/dlls/kernel/utthunk.c +++ b/dlls/kernel/utthunk.c @@ -52,7 +52,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, diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 52f36fd5ae3..75508dfe383 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1159,7 +1159,7 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, WCHAR dllName[MAX_PATH+1]; DWORD dllNameLen = sizeof(dllName); HINSTANCE hLibrary; - typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, + typedef HRESULT CALLBACK (*DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); DllGetClassObjectFunc DllGetClassObject; diff --git a/dlls/setupapi/setupx16.h b/dlls/setupapi/setupx16.h index 32d3ccb4993..12292fa4e70 100644 --- a/dlls/setupapi/setupx16.h +++ b/dlls/setupapi/setupx16.h @@ -198,7 +198,7 @@ typedef struct _DEVICE_INFO } DEVICE_INFO16, *LPDEVICE_INFO16, **LPLPDEVICE_INFO16; -typedef LRESULT (CALLBACK *VIFPROC)(LPVOID lpvObj, UINT uMsg, WPARAM wParam, LPARAM lParam, LPARAM lparamRef); +typedef LRESULT CALLBACK (*VIFPROC)(LPVOID lpvObj, UINT uMsg, WPARAM wParam, LPARAM lParam, LPARAM lparamRef); extern void WINAPI GenFormStrWithoutPlaceHolders16(LPSTR,LPCSTR,HINF16); extern RETERR16 WINAPI IpOpen16(LPCSTR,HINF16 *); diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 3fb6d4d4068..3cfe8b64cb3 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -835,18 +835,18 @@ HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi) * all are once per process * */ -void (WINAPI* pDLLInitComctl)(LPVOID); +void WINAPI (*pDLLInitComctl)(LPVOID); -LPVOID (WINAPI* pCOMCTL32_Alloc) (INT); -BOOL (WINAPI* pCOMCTL32_Free) (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); +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); static HINSTANCE hComctl32; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 2faa619f8c5..41b4bbe5dc8 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -29,27 +29,27 @@ extern HDPA sic_hdpa; /******************************************* * pointer to functions dynamically loaded */ -extern void (WINAPI* pDLLInitComctl)(LPVOID); +extern void WINAPI (*pDLLInitComctl)(LPVOID); -extern LPVOID (WINAPI* pCOMCTL32_Alloc) (INT); -extern BOOL (WINAPI* pCOMCTL32_Free) (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 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); #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); @@ -127,14 +127,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); diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index ec1fe85849e..4e203669658 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -344,7 +344,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 { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2bbb23148a8..acd24f96c4a 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -136,7 +136,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 diff --git a/dlls/wineps/driver.c b/dlls/wineps/driver.c index 93b49fecc1f..021e3fc0a26 100644 --- a/dlls/wineps/driver.c +++ b/dlls/wineps/driver.c @@ -240,9 +240,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); /*************************************************************** * diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index ebb4895a61b..6a77e53280a 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -5256,7 +5256,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] diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 7c138efba09..42cc1c4249a 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -34,14 +34,14 @@ typedef struct _OPENEDPRINTER /* The OpenedPrinter Table dynamic array */ static HDPA pOpenedPrinterDPA = NULL; -extern HDPA (WINAPI* WINSPOOL_DPA_CreateEx) (INT, HANDLE); -extern LPVOID (WINAPI* WINSPOOL_DPA_GetPtr) (const HDPA, INT); -extern INT (WINAPI* WINSPOOL_DPA_InsertPtr) (const HDPA, INT, LPVOID); +extern HDPA WINAPI (*WINSPOOL_DPA_CreateEx) (INT, HANDLE); +extern LPVOID WINAPI (*WINSPOOL_DPA_GetPtr) (const HDPA, INT); +extern INT WINAPI (*WINSPOOL_DPA_InsertPtr) (const HDPA, INT, LPVOID); -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 ); diff --git a/dlls/winspool/wspool.c b/dlls/winspool/wspool.c index 339e6fbea4c..23a93201b44 100644 --- a/dlls/winspool/wspool.c +++ b/dlls/winspool/wspool.c @@ -11,9 +11,9 @@ DEFAULT_DEBUG_CHANNEL(winspool); HINSTANCE hcomctl32 = 0; -HDPA (WINAPI* WINSPOOL_DPA_CreateEx)(INT, HANDLE); -LPVOID (WINAPI* WINSPOOL_DPA_GetPtr)(const HDPA, INT); -INT (WINAPI* WINSPOOL_DPA_InsertPtr)(const HDPA, INT, LPVOID); +HDPA WINAPI (*WINSPOOL_DPA_CreateEx)(INT, HANDLE); +LPVOID WINAPI (*WINSPOOL_DPA_GetPtr)(const HDPA, INT); +INT WINAPI (*WINSPOOL_DPA_InsertPtr)(const HDPA, INT, LPVOID); /****************************************************************************** * WINSPOOL_EntryPoint diff --git a/libtest/hello5.c b/libtest/hello5.c index c3047bdb88c..6aee39ef3aa 100644 --- a/libtest/hello5.c +++ b/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"); diff --git a/programs/avitools/aviinfo.c b/programs/avitools/aviinfo.c index 3a7aa27b432..dd358d1130f 100644 --- a/programs/avitools/aviinfo.c +++ b/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 diff --git a/programs/avitools/aviplay.c b/programs/avitools/aviplay.c index a3c40b21b3f..26bfdf1f037 100644 --- a/programs/avitools/aviplay.c +++ b/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 diff --git a/windows/defwnd.c b/windows/defwnd.c index ea42f41ede4..986917a9d51 100644 --- a/windows/defwnd.c +++ b/windows/defwnd.c @@ -222,7 +222,7 @@ static void DEFWND_Print( static HWND DEFWND_ImmGetDefaultIMEWnd( HWND hwnd ) { HINSTANCE hInstIMM = GetModuleHandleA( "imm32" ); - HWND (WINAPI* pFunc)(HWND); + HWND WINAPI (*pFunc)(HWND); HWND hwndRet = 0; if (!hInstIMM) @@ -241,7 +241,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) @@ -260,7 +260,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)