Large-scale renaming of all Win32 functions and types to use the
standard Windows names.

diff --git a/include/hook.h b/include/hook.h
index 9d53a11..b98786a 100644
--- a/include/hook.h
+++ b/include/hook.h
@@ -25,28 +25,26 @@
 typedef struct
 {
   LPARAM        lParam;
-  WPARAM32      wParam;
-  UINT32        message;
-  HWND32        hwnd;
-} CWPSTRUCT32, *LPCWPSTRUCT32;
+  WPARAM      wParam;
+  UINT        message;
+  HWND        hwnd;
+} CWPSTRUCT, *LPCWPSTRUCT;
 
-DECL_WINELIB_TYPE(CWPSTRUCT)
-DECL_WINELIB_TYPE(LPCWPSTRUCT)
 
 /* hook type mask */
 #define HOOK_MAPTYPE (HOOK_WIN16 | HOOK_WIN32A | HOOK_WIN32W)
 
 extern HOOKPROC16 HOOK_GetProc16( HHOOK hhook );
-extern BOOL32 HOOK_IsHooked( INT16 id );
+extern BOOL HOOK_IsHooked( INT16 id );
 extern LRESULT HOOK_CallHooks16( INT16 id, INT16 code, WPARAM16 wParam,
 				 LPARAM lParam );
-extern LRESULT HOOK_CallHooks32A( INT32 id, INT32 code, WPARAM32 wParam,
+extern LRESULT HOOK_CallHooksA( INT id, INT code, WPARAM wParam,
 				  LPARAM lParam );
-extern LRESULT HOOK_CallHooks32W( INT32 id, INT32 code, WPARAM32 wParam,
+extern LRESULT HOOK_CallHooksW( INT id, INT code, WPARAM wParam,
 				  LPARAM lParam );
 extern void HOOK_FreeModuleHooks( HMODULE16 hModule );
 extern void HOOK_FreeQueueHooks( HQUEUE16 hQueue );
 extern void HOOK_ResetQueueHooks( HQUEUE16 hQueue );
-extern HOOKPROC32 HOOK_GetProc( HHOOK hook );
+extern HOOKPROC HOOK_GetProc( HHOOK hook );
 
 #endif  /* __WINE_HOOK_H */