--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/win32/WINTYPES.d	Sat Nov 13 14:15:51 2010 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/win32/WINTYPES.d	Wed Mar 16 21:53:53 2011 +0900
@@ -251,56 +251,56 @@
     alias TOKEN_TYPE TAGTOKEN_TYPE;
 
     extern(Windows){
-    alias int (*BFFCALLBACK)(HWND, UINT, LPARAM, LPARAM);
-    alias UINT (*LPCCHOOKPROC)(HWND, UINT, WPARAM, LPARAM);
-    alias UINT (*LPCFHOOKPROC)(HWND, UINT, WPARAM, LPARAM);
+    alias int function(HWND, UINT, LPARAM, LPARAM) BFFCALLBACK;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPCCHOOKPROC;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPCFHOOKPROC;
     alias POINTER PTHREAD_START_ROUTINE;
     alias PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
-    alias DWORD (*EDITSTREAMCALLBACK)(DWORD, LPBYTE, LONG, LONG);
-    alias UINT (*LPFRHOOKPROC)(HWND, UINT, WPARAM, LPARAM);
-    alias UINT (*LPOFNHOOKPROC)(HWND, UINT, WPARAM, LPARAM);
-    alias UINT (*LPPRINTHOOKPROC)(HWND, UINT, WPARAM, LPARAM);
-    alias UINT (*LPSETUPHOOKPROC)(HWND, UINT, WPARAM, LPARAM);
-    alias LRESULT (*DLGPROC)(HWND, UINT, WPARAM, LPARAM);
-    alias int (*PFNPROPSHEETCALLBACK)(HWND, UINT, LPARAM);
-    alias void (*LPSERVICE_MAIN_FUNCTION)(DWORD, LPTSTR);
-    alias int (*PFNTVCOMPARE)(LPARAM, LPARAM, LPARAM);
-    alias LRESULT (*WNDPROC)(HWND, UINT, WPARAM, LPARAM);
+    alias DWORD function(DWORD, LPBYTE, LONG, LONG) EDITSTREAMCALLBACK;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPFRHOOKPROC;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPOFNHOOKPROC;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPPRINTHOOKPROC;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPSETUPHOOKPROC;
+    alias LRESULT function(HWND, UINT, WPARAM, LPARAM) DLGPROC;
+    alias int function(HWND, UINT, LPARAM) PFNPROPSHEETCALLBACK;
+    alias void function(DWORD, LPTSTR) LPSERVICE_MAIN_FUNCTION;
+    alias int function(LPARAM, LPARAM, LPARAM) PFNTVCOMPARE;
+    alias LRESULT function(HWND, UINT, WPARAM, LPARAM) WNDPROC;
     alias POINTER FARPROC;
     alias FARPROC PROC;
-    alias WINBOOL (*ENUMRESTYPEPROC)(HANDLE, LPTSTR, LONG);
-    alias WINBOOL (*ENUMRESNAMEPROC)(HANDLE, LPCTSTR, LPTSTR, LONG);
-    alias WINBOOL (*ENUMRESLANGPROC)(HANDLE, LPCTSTR, LPCTSTR, ushort, LONG);
+    alias WINBOOL function(HANDLE, LPTSTR, LONG) ENUMRESTYPEPROC;
+    alias WINBOOL function(HANDLE, LPCTSTR, LPTSTR, LONG) ENUMRESNAMEPROC;
+    alias WINBOOL function(HANDLE, LPCTSTR, LPCTSTR, ushort, LONG) ENUMRESLANGPROC;
     alias FARPROC DESKTOPENUMPROC;
-    alias WINBOOL (*ENUMWINDOWSPROC)(HWND, LPARAM);
-    alias WINBOOL (*ENUMWINDOWSTATIONPROC)(LPTSTR, LPARAM);
-    alias void (*SENDASYNCPROC)(HWND, UINT, DWORD);
-    alias void (*TIMERPROC)(HWND, UINT, UINT, DWORD);
-    alias BOOL(*MONITORENUMPROC)(HMONITOR, HDC, RECT*, LPARAM);
+    alias WINBOOL function(HWND, LPARAM) ENUMWINDOWSPROC;
+    alias WINBOOL function(LPTSTR, LPARAM) ENUMWINDOWSTATIONPROC;
+    alias void function(HWND, UINT, DWORD) SENDASYNCPROC;
+    alias void function(HWND, UINT, UINT, DWORD) TIMERPROC;
+    alias BOOL function(HMONITOR, HDC, RECT*, LPARAM) MONITORENUMPROC;
     alias FARPROC GRAYSTRINGPROC;
-    alias WINBOOL (*DRAWSTATEPROC)(HDC, LPARAM, WPARAM, int, int);
-    alias WINBOOL (*PROPENUMPROCEX)(HWND, LPCTSTR, HANDLE, DWORD);
-    alias WINBOOL (*PROPENUMPROC)(HWND, LPCTSTR, HANDLE);
-    alias LRESULT (*HOOKPROC)(int, WPARAM, LPARAM);
-    alias void (*ENUMOBJECTSPROC)(LPVOID);
-    alias void (*LINEDDAPROC)(int, int);
-    alias WINBOOL (*TABORTPROC)(HDC, int);
-    alias UINT (*LPPAGEPAINTHOOK)(HWND, UINT, WPARAM, LPARAM);
-    alias UINT (*LPPAGESETUPHOOK)(HWND, UINT, WPARAM, LPARAM);
-    alias int (*ICMENUMPROC)(LPTSTR, LPARAM);
-    alias LONG (*EDITWORDBREAKPROCEX)(PCHAR, LONG, ubyte, INT);
-    alias int (*PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
-    alias WINBOOL (*LOCALE_ENUMPROC)(LPTSTR);
-    alias WINBOOL (*CODEPAGE_ENUMPROC)(LPTSTR);
-    alias WINBOOL (*DATEFMT_ENUMPROC)(LPTSTR);
-    alias WINBOOL (*TIMEFMT_ENUMPROC)(LPTSTR);
-    alias WINBOOL (*CALINFO_ENUMPROC)(LPTSTR);
-    alias WINBOOL (*PHANDLER_ROUTINE)(DWORD);
-    alias WINBOOL (*LPHANDLER_FUNCTION)(DWORD);
-    alias void (*PTIMERAPCROUTINE)(LPVOID, DWORD, DWORD);
-    alias UINT (*PFNGETPROFILEPATH)(LPCTSTR, LPSTR, UINT);
-    alias UINT (*PFNRECONCILEPROFILE)(LPCTSTR, LPCTSTR, DWORD);
-    alias WINBOOL (*PFNPROCESSPOLICIES)(HWND, LPCTSTR, LPCTSTR, LPCTSTR, DWORD);
+    alias WINBOOL function(HDC, LPARAM, WPARAM, int, int) DRAWSTATEPROC;
+    alias WINBOOL function(HWND, LPCTSTR, HANDLE, DWORD) PROPENUMPROCEX;
+    alias WINBOOL function(HWND, LPCTSTR, HANDLE) PROPENUMPROC;
+    alias LRESULT function(int, WPARAM, LPARAM) HOOKPROC;
+    alias void function(LPVOID) ENUMOBJECTSPROC;
+    alias void function(int, int) LINEDDAPROC;
+    alias WINBOOL function(HDC, int) TABORTPROC;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPPAGEPAINTHOOK;
+    alias UINT function(HWND, UINT, WPARAM, LPARAM) LPPAGESETUPHOOK;
+    alias int function(LPTSTR, LPARAM) ICMENUMPROC;
+    alias LONG function(PCHAR, LONG, ubyte, INT) EDITWORDBREAKPROCEX;
+    alias int function(LPARAM, LPARAM, LPARAM) PFNLVCOMPARE;
+    alias WINBOOL function(LPTSTR) LOCALE_ENUMPROC;
+    alias WINBOOL function(LPTSTR) CODEPAGE_ENUMPROC;
+    alias WINBOOL function(LPTSTR) DATEFMT_ENUMPROC;
+    alias WINBOOL function(LPTSTR) TIMEFMT_ENUMPROC;
+    alias WINBOOL function(LPTSTR) CALINFO_ENUMPROC;
+    alias WINBOOL function(DWORD) PHANDLER_ROUTINE;
+    alias WINBOOL function(DWORD) LPHANDLER_FUNCTION;
+    alias void function(LPVOID, DWORD, DWORD) PTIMERAPCROUTINE;
+    alias UINT function(LPCTSTR, LPSTR, UINT) PFNGETPROFILEPATH;
+    alias UINT function(LPCTSTR, LPCTSTR, DWORD) PFNRECONCILEPROFILE;
+    alias WINBOOL function(HWND, LPCTSTR, LPCTSTR, LPCTSTR, DWORD) PFNPROCESSPOLICIES;
     }
 
     const {
@@ -348,7 +348,7 @@
     }
 
     extern(Windows){
-    alias HDDEDATA (*PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD);
+    alias HDDEDATA function(UINT, UINT, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD) PFNCALLBACK;
     }
     alias PFNCALLBACK CALLB;
     alias WINBOOL SECURITY___FILE___TRACKING_MODE;
@@ -10882,7 +10882,7 @@
     alias MSG TMSG;
     alias MSG* PMSG;
     extern(Windows){
-    alias void (*MSGBOXCALLBACK)(LPHELPINFO);
+    alias void function(LPHELPINFO) MSGBOXCALLBACK;
     }
     alias MSGBOXCALLBACK TMSGBOXCALLBACK;
 
@@ -12105,7 +12105,7 @@
     alias PROCESS_INFORMATION _PROCESS_INFORMATION;
     alias PROCESS_INFORMATION TPROCESSINFORMATION;
     alias PROCESS_INFORMATION* PPROCESSINFORMATION;
-    extern(Windows){alias UINT (*LPFNPSPCALLBACK)(HWND, UINT, LPVOID);}
+    extern(Windows){alias UINT function(HWND, UINT, LPVOID) LPFNPSPCALLBACK;}
     alias LPFNPSPCALLBACK TFNPSPCALLBACK;
 
 
@@ -12230,8 +12230,8 @@
     alias PROPSHEETHEADER TPROPSHEETHEADER;
     alias PROPSHEETHEADER* PPROPSHEETHEADER;
     extern(Windows){
-    alias WINBOOL (*LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE, LPARAM);
-    alias WINBOOL (*LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM);
+    alias WINBOOL function(HPROPSHEETPAGE, LPARAM) LPFNADDPROPSHEETPAGE;
+    alias WINBOOL function(LPVOID, LPFNADDPROPSHEETPAGE, LPARAM) LPFNADDPROPSHEETPAGES;
     }
     alias LPFNADDPROPSHEETPAGE TFNADDPROPSHEETPAGE;
     alias LPFNADDPROPSHEETPAGES TFNADDPROPSHEETPAGES;
@@ -13817,12 +13817,12 @@
     alias NETCONNECTINFOSTRUCT TNETCONNECTINFOSTRUCT;
     alias NETCONNECTINFOSTRUCT* PNETCONNECTINFOSTRUCT;
     extern(Windows){
-    alias int (*ENUMMETAFILEPROC)(HDC, HANDLETABLE*, METARECORD*, int, LPARAM);
-    alias int (*ENHMETAFILEPROC)(HDC, HANDLETABLE*, ENHMETARECORD*, int, LPARAM);
-    alias int (*ENUMFONTSPROC)(LPLOGFONT, LPTEXTMETRIC, DWORD, LPARAM);
-    alias int (*FONTENUMPROC)(ENUMLOGFONT*, NEWTEXTMETRIC*, int, LPARAM);
-    alias int (*FONTENUMEXPROC)(ENUMLOGFONTEX*, NEWTEXTMETRICEX*, int, LPARAM);
-    alias void (*LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD, DWORD);
+    alias int function(HDC, HANDLETABLE*, METARECORD*, int, LPARAM) ENUMMETAFILEPROC;
+    alias int function(HDC, HANDLETABLE*, ENHMETARECORD*, int, LPARAM) ENHMETAFILEPROC;
+    alias int function(LPLOGFONT, LPTEXTMETRIC, DWORD, LPARAM) ENUMFONTSPROC;
+    alias int function(ENUMLOGFONT*, NEWTEXTMETRIC*, int, LPARAM) FONTENUMPROC;
+    alias int function(ENUMLOGFONTEX*, NEWTEXTMETRICEX*, int, LPARAM) FONTENUMEXPROC;
+    alias void function(DWORD, DWORD) LPOVERLAPPED_COMPLETION_ROUTINE;
     }
 
     struct POINTFLOAT