Callback declarations - part 2

Francois Gouget fgouget at free.fr
Mon Feb 5 22:40:28 CST 2001


   And this is the changelog for part 2:

Changelog:

 * dlls/commdlg/cdlg.h,
   dlls/commdlg/cdlg32.c,
   dlls/dplayx/dplaysp.h`,
   dlls/imm32/imm_private.h,
   dlls/shell32/shell32_main.c,
   dlls/shell32/shell32_main.h,
   dlls/wineps/driver.c,
   dlls/winmm/mmsystem.c,
   dlls/winspool/info.c,
   dlls/winspool/wspool.c,
   programs/avitools/aviinfo.c,
   programs/avitools/aviplay.c,
   windows/defwnd.c,
   dlls/comctl32/smoothscroll.c,
   dlls/commdlg/cdlg.h,
   dlls/dplayx/dplaysp.h,
   dlls/kernel/utthunk.c,
   dlls/ole32/compobj.c,
   dlls/setupapi/setupx16.h,
   dlls/shell32/shellole.c,
   dlls/shell32/shlview.c,
   windows/win.c,
   libtest/hello5.c

   Change the callback declarations to a safer format


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
 "Only wimps use tape backup: _real_ men just upload their important stuff on
       ftp, and let the rest of the world mirror it ;)" -- Linus Torvalds
-------------- next part --------------
Index: dlls/commdlg/cdlg.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/commdlg/cdlg.h,v
retrieving revision 1.16
diff -u -r1.16 cdlg.h
--- dlls/commdlg/cdlg.h	2001/01/17 22:05:24	1.16
+++ dlls/commdlg/cdlg.h	2001/01/23 19:15:39
@@ -94,16 +94,16 @@
 
 /* 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);
Index: dlls/commdlg/cdlg32.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/commdlg/cdlg32.c,v
retrieving revision 1.16
diff -u -r1.16 cdlg32.c
--- dlls/commdlg/cdlg32.c	2001/01/17 22:05:24	1.16
+++ dlls/commdlg/cdlg32.c	2001/01/23 19:15:39
@@ -25,16 +25,16 @@
 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)
Index: dlls/dplayx/dplaysp.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/dplayx/dplaysp.h,v
retrieving revision 1.4
diff -u -r1.4 dplaysp.h
--- dlls/dplayx/dplaysp.h	2000/12/15 20:53:05	1.4
+++ dlls/dplayx/dplaysp.h	2001/01/23 19:15:41
@@ -261,28 +261,28 @@
 
 
 /* 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 @@
     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 
Index: dlls/imm32/imm_private.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/imm32/imm_private.h,v
retrieving revision 1.3
diff -u -r1.3 imm_private.h
--- dlls/imm32/imm_private.h	2000/12/18 03:51:16	1.3
+++ dlls/imm32/imm_private.h	2001/01/23 19:15:41
@@ -16,43 +16,43 @@
 
 /* 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
Index: dlls/shell32/shell32_main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shell32_main.c,v
retrieving revision 1.70
diff -u -r1.70 shell32_main.c
--- dlls/shell32/shell32_main.c	2001/01/20 02:48:31	1.70
+++ dlls/shell32/shell32_main.c	2001/01/23 19:15:43
@@ -835,18 +835,18 @@
  * 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;
 
Index: dlls/shell32/shell32_main.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shell32_main.h,v
retrieving revision 1.38
diff -u -r1.38 shell32_main.h
--- dlls/shell32/shell32_main.h	2001/01/17 22:05:30	1.38
+++ dlls/shell32/shell32_main.h	2001/01/23 19:15:43
@@ -29,27 +29,27 @@
 /*******************************************
 * 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 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);
Index: dlls/wineps/driver.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/wineps/driver.c,v
retrieving revision 1.3
diff -u -r1.3 driver.c
--- dlls/wineps/driver.c	2000/11/27 23:54:28	1.3
+++ dlls/wineps/driver.c	2001/01/23 19:15:43
@@ -240,9 +240,9 @@
 }
 
 
-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);
 
 /***************************************************************
  *
Index: dlls/winmm/mmsystem.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/mmsystem.c,v
retrieving revision 1.32
diff -u -r1.32 mmsystem.c
--- dlls/winmm/mmsystem.c	2001/01/17 22:03:20	1.32
+++ dlls/winmm/mmsystem.c	2001/01/23 19:15:47
@@ -5256,7 +5256,7 @@
     TRACE("done\n");
 }
 
-typedef	BOOL16 (WINAPI *MMCPLCALLBACK)(HWND, LPCSTR, LPCSTR, LPCSTR);
+typedef	BOOL16 WINAPI (*MMCPLCALLBACK)(HWND, LPCSTR, LPCSTR, LPCSTR);
 
 /**************************************************************************
  * 			mmShowMMCPLPropertySheet	[MMSYSTEM.1150]
Index: dlls/winspool/info.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.30
diff -u -r1.30 info.c
--- dlls/winspool/info.c	2001/01/09 20:52:17	1.30
+++ dlls/winspool/info.c	2001/01/23 19:15:48
@@ -34,14 +34,14 @@
 /* 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 );
Index: dlls/winspool/wspool.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winspool/wspool.c,v
retrieving revision 1.2
diff -u -r1.2 wspool.c
--- dlls/winspool/wspool.c	2000/11/27 23:54:29	1.2
+++ dlls/winspool/wspool.c	2001/01/23 19:15:48
@@ -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
Index: programs/avitools/aviinfo.c
===================================================================
RCS file: /home/cvs/wine/wine/programs/avitools/aviinfo.c,v
retrieving revision 1.4
diff -u -r1.4 aviinfo.c
--- programs/avitools/aviinfo.c	2001/01/05 03:42:54	1.4
+++ programs/avitools/aviinfo.c	2001/01/23 19:15:52
@@ -17,14 +17,14 @@
     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
Index: programs/avitools/aviplay.c
===================================================================
RCS file: /home/cvs/wine/wine/programs/avitools/aviplay.c,v
retrieving revision 1.9
diff -u -r1.9 aviplay.c
--- programs/avitools/aviplay.c	2001/01/11 00:54:38	1.9
+++ programs/avitools/aviplay.c	2001/01/23 19:15:52
@@ -48,18 +48,18 @@
     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
Index: windows/defwnd.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/defwnd.c,v
retrieving revision 1.46
diff -u -r1.46 defwnd.c
--- windows/defwnd.c	2001/01/15 20:12:56	1.46
+++ windows/defwnd.c	2001/01/23 19:15:55
@@ -222,7 +222,7 @@
 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 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_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)
Index: dlls/comctl32/smoothscroll.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/smoothscroll.c,v
retrieving revision 1.1
diff -u -r1.1 smoothscroll.c
--- dlls/comctl32/smoothscroll.c	2000/07/29 21:54:38	1.1
+++ dlls/comctl32/smoothscroll.c	2001/01/29 11:00:04
@@ -17,7 +17,7 @@
 
 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;
Index: dlls/commdlg/cdlg.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/commdlg/cdlg.h,v
retrieving revision 1.16
diff -u -r1.16 cdlg.h
--- dlls/commdlg/cdlg.h	2001/01/17 22:05:24	1.16
+++ dlls/commdlg/cdlg.h	2001/01/29 11:00:11
@@ -112,7 +112,7 @@
 
 #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 @@
 	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 @@
 } 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 @@
 	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 @@
 } 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;
Index: dlls/dplayx/dplaysp.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/dplayx/dplaysp.h,v
retrieving revision 1.4
diff -u -r1.4 dplaysp.h
--- dlls/dplayx/dplaysp.h	2000/12/15 20:53:05	1.4
+++ dlls/dplayx/dplaysp.h	2001/01/29 11:00:22
@@ -9,7 +9,7 @@
 typedef struct IDirectPlaySP IDirectPlaySP, *LPDIRECTPLAYSP;
 
 
-typedef BOOL (CALLBACK* LPENUMMRUCALLBACK)( LPCVOID lpData,
+typedef BOOL CALLBACK (*LPENUMMRUCALLBACK)( LPCVOID lpData,
                                             DWORD  dwDataSize,
                                             LPVOID lpContext );
 
@@ -330,7 +330,7 @@
     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 
Index: dlls/kernel/utthunk.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/kernel/utthunk.c,v
retrieving revision 1.9
diff -u -r1.9 utthunk.c
--- dlls/kernel/utthunk.c	2001/01/25 22:22:21	1.9
+++ dlls/kernel/utthunk.c	2001/01/29 11:00:23
@@ -52,7 +52,7 @@
 
 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,
Index: dlls/ole32/compobj.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ole32/compobj.c,v
retrieving revision 1.35
diff -u -r1.35 compobj.c
--- dlls/ole32/compobj.c	2001/01/17 22:03:19	1.35
+++ dlls/ole32/compobj.c	2001/01/29 11:00:29
@@ -1159,7 +1159,7 @@
     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;
 
Index: dlls/setupapi/setupx16.h
===================================================================
RCS file: /home/cvs/wine/wine/dlls/setupapi/setupx16.h,v
retrieving revision 1.5
diff -u -r1.5 setupx16.h
--- dlls/setupapi/setupx16.h	2000/12/13 21:31:37	1.5
+++ dlls/setupapi/setupx16.h	2001/01/29 11:01:05
@@ -198,7 +198,7 @@
 } 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 *);
Index: dlls/shell32/shellole.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shellole.c,v
retrieving revision 1.35
diff -u -r1.35 shellole.c
--- dlls/shell32/shellole.c	2001/01/02 21:00:46	1.35
+++ dlls/shell32/shellole.c	2001/01/29 11:01:06
@@ -344,7 +344,7 @@
  *  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
 {
Index: dlls/shell32/shlview.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shlview.c,v
retrieving revision 1.56
diff -u -r1.56 shlview.c
--- dlls/shell32/shlview.c	2000/11/28 22:40:58	1.56
+++ dlls/shell32/shlview.c	2001/01/29 11:01:14
@@ -136,7 +134,7 @@
 { -1, 0, 0, 0, 0, 0}
 };
 
-typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
+typedef void CALLBACK (*PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 
 /**********************************************************
  *	IShellView_Constructor
Index: windows/win.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/win.c,v
retrieving revision 1.118
diff -u -r1.118 win.c
--- windows/win.c	2001/01/25 22:22:22	1.118
+++ windows/win.c	2001/01/29 11:02:04
@@ -720,7 +720,7 @@
     DWORD clsStyle;
     WNDPROC winproc;
     DCE *dce;
-    LRESULT (CALLBACK *localSend32)(HWND, UINT, WPARAM, LPARAM);
+    LRESULT CALLBACK (*localSend32)(HWND, UINT, WPARAM, LPARAM);
 
     TRACE("%s %s %08lx %08lx %d,%d %dx%d %04x %04x %08x %p\n",
           (type == WIN_PROC_32W) ? debugres_w((LPWSTR)cs->lpszName) : debugres_a(cs->lpszName), 
Index: libtest/hello5.c
===================================================================
RCS file: /home/cvs/wine/wine/libtest/hello5.c,v
retrieving revision 1.5
diff -u -r1.5 hello5.c
--- libtest/hello5.c	2000/07/23 19:32:11	1.5
+++ libtest/hello5.c	2001/01/29 11:01:37
@@ -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");


More information about the wine-patches mailing list