commit f94462fb75f98079b451f23a4120073b3a7947b8
author Patrik Stridvall <ps@leissner.se> Thu Jan 31 23:22:07 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 31 23:22:07 2002 +0000
tree 2e50959797160be8ecac7d479455ac2eb7063e4f
parent d4c0ff155ee9fbe101e08f7f7f2893d9d9326151

Move __stdcall/__cdecl to the right place.

include/winuser.h

diff --git a/include/winuser.h b/include/winuser.h
index d558b29..ff8dbe9 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -12,21 +12,21 @@
 /* Define a bunch of callback types */
 
 #if defined(STRICT) || defined(__WINE__)
-typedef BOOL    CALLBACK (*DLGPROC)(HWND,UINT,WPARAM,LPARAM);
-typedef BOOL    CALLBACK (*DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
-typedef INT     CALLBACK (*EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
-typedef INT     CALLBACK (*EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT);
-typedef BOOL    CALLBACK (*GRAYSTRINGPROC)(HDC,LPARAM,INT);
-typedef LRESULT CALLBACK (*HOOKPROC)(INT,WPARAM,LPARAM);
-typedef BOOL    CALLBACK (*NAMEENUMPROCA)(LPSTR,LPARAM);
-typedef BOOL    CALLBACK (*NAMEENUMPROCW)(LPWSTR,LPARAM);
-typedef BOOL    CALLBACK (*PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
-typedef BOOL    CALLBACK (*PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
-typedef BOOL    CALLBACK (*PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,ULONG_PTR);
-typedef BOOL    CALLBACK (*PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,ULONG_PTR);
-typedef VOID    CALLBACK (*SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT);
-typedef VOID    CALLBACK (*TIMERPROC)(HWND,UINT,UINT,DWORD);
-typedef BOOL    CALLBACK (*WNDENUMPROC)(HWND,LPARAM);
+typedef BOOL    (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef BOOL    (CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
+typedef INT     (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
+typedef INT     (CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT);
+typedef BOOL    (CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,INT);
+typedef LRESULT (CALLBACK *HOOKPROC)(INT,WPARAM,LPARAM);
+typedef BOOL    (CALLBACK *NAMEENUMPROCA)(LPSTR,LPARAM);
+typedef BOOL    (CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM);
+typedef BOOL    (CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
+typedef BOOL    (CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
+typedef BOOL    (CALLBACK *PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,ULONG_PTR);
+typedef BOOL    (CALLBACK *PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,ULONG_PTR);
+typedef VOID    (CALLBACK *SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT);
+typedef VOID    (CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
+typedef BOOL    (CALLBACK *WNDENUMPROC)(HWND,LPARAM);
 #else
 typedef FARPROC DLGPROC;
 typedef FARPROC DRAWSTATEPROC;
@@ -50,7 +50,7 @@
 typedef NAMEENUMPROCW WINSTAENUMPROCW;
 typedef NAMEENUMPROCW DESKTOPENUMPROCW;
 
-typedef LRESULT CALLBACK (*WNDPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef LRESULT (CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM);
 
 DECL_WINELIB_TYPE_AW(DESKTOPENUMPROC)
 DECL_WINELIB_TYPE_AW(EDITWORDBREAKPROC)
@@ -2237,7 +2237,7 @@
     POINT	MousePos;	/* Mouse Position in screen co-ordinates */
 }  HELPINFO,*LPHELPINFO;
 
-typedef void CALLBACK (*MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
+typedef void (CALLBACK *MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
 
 typedef struct
 {
@@ -2304,7 +2304,7 @@
 DECL_WINELIB_TYPE_AW(MONITORINFOEX)
 DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)
 
-typedef BOOL  CALLBACK (*MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
+typedef BOOL  (CALLBACK *MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
 
 #include "pshpack2.h"