コミット: a41c43993b880f76e4675874469314cb195a1688 - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

コミットメタ情報

• リビジョン: a41c43993b880f76e4675874469314cb195a1688 (tree)
• 日時: 2016-12-08 23:30:41
• 作者: Keith Marshall <keithmarshall@user...>
• コミッター: Keith Marshall

ログメッセージ

Rationalize <winuser.h> ANSI vs. UNICODE definition strategy.

変更サマリ

• modified: w32api/ChangeLog
• modified: w32api/include/winuser.h

差分

--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,12 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Rationalize <winuser.h> ANSI vs. UNICODE definition strategy.
+
+	* include/winuser.h [UNICODE, !UNICODE]: Replace individual pairs of
+	alternative generic symbol mapping definitions, and typedefs, with...
+	(__AW_SUFFIXED__): ...one such macro expansion per pair; collate with
+	their respective ANSI and UNICODE specific references.
+
 2016-11-26  Keith Marshall  <[e-mail]>
 
 	Deprecate obsolete <winable.h> and <pbt.h> headers.

--- a/w32api/include/winuser.h
+++ b/w32api/include/winuser.h
@@ -2655,14 +2655,24 @@ _BEGIN_C_DECLS
 #define MAPVK_VK_TO_VSC_EX				    4
 
 #ifndef RC_INVOKED
+#define DEKSTOPENUMPROC __AW_SUFFIXED__(DEKSTOPENUMPROC)
+#define WINSTAENUMPROC  __AW_SUFFIXED__(WINSTAENUMPROC)
+#define MAKEINTRESOURCE __AW_SUFFIXED__(MAKEINTRESOURCE)
+
 typedef BOOL (CALLBACK *DLGPROC) (HWND, UINT, WPARAM, LPARAM);
 typedef VOID (CALLBACK *TIMERPROC) (HWND, UINT, UINT_PTR, DWORD);
 typedef BOOL (CALLBACK *GRAYSTRINGPROC) (HDC, LPARAM, int);
 typedef LRESULT (CALLBACK *HOOKPROC) (int, WPARAM, LPARAM);
+
+#define PROPENUMPROC __AW_SUFFIXED__(PROPENUMPROC)
 typedef BOOL (CALLBACK *PROPENUMPROCA) (HWND, LPCSTR, HANDLE);
 typedef BOOL (CALLBACK *PROPENUMPROCW) (HWND, LPCWSTR, HANDLE);
+
+#define PROPENUMPROCEX __AW_SUFFIXED__(PROPENUMPROCEX)
 typedef BOOL (CALLBACK *PROPENUMPROCEXA) (HWND, LPSTR, HANDLE, DWORD);
 typedef BOOL (CALLBACK *PROPENUMPROCEXW) (HWND, LPWSTR, HANDLE, DWORD);
+
+#define EDITWORDBREAKPROC __AW_SUFFIXED__(EDITWORDBREAKPROC)
 typedef int (CALLBACK *EDITWORDBREAKPROCA) (LPSTR, int, int, int);
 typedef int (CALLBACK *EDITWORDBREAKPROCW) (LPWSTR, int, int, int);
 typedef LRESULT (CALLBACK *WNDPROC) (HWND, UINT, WPARAM, LPARAM);
@@ -2738,6 +2748,8 @@ typedef struct tagCREATESTRUCTW
   DWORD 			dwExStyle;
 } CREATESTRUCTW, *LPCREATESTRUCTW;
 
+typedef __AW_SUFFIXED__(CREATESTRUCT) CREATESTRUCT, *LPCREATESTRUCT;
+
 typedef struct tagCBT_CREATEWNDA
 { LPCREATESTRUCTA		lpcs;
   HWND				hwndInsertAfter;
@@ -2748,6 +2760,8 @@ typedef struct tagCBT_CREATEWNDW
   HWND				hwndInsertAfter;
 } CBT_CREATEWNDW, *LPCBT_CREATEWNDW;
 
+typedef __AW_SUFFIXED__(CBT_CREATEWND) CBT_CREATEWND, *LPCBT_CREATEWND;
+
 typedef struct tagCBTACTIVATESTRUCT
 { BOOL				fMouse;
   HWND				hWndActive;
@@ -2920,6 +2934,8 @@ typedef struct _WNDCLASSW
   LPCWSTR			lpszClassName;
 } WNDCLASSW, *LPWNDCLASSW, *PWNDCLASSW;
 
+typedef __AW_SUFFIXED__(WNDCLASS) WNDCLASS, *LPWNDCLASS, *PWNDCLASS;
+
 typedef struct _WNDCLASSEXA
 { UINT				cbSize;
   UINT				style;
@@ -2950,6 +2966,8 @@ typedef struct _WNDCLASSEXW
   HICON 			hIconSm;
 } WNDCLASSEXW, *LPWNDCLASSEXW, *PWNDCLASSEXW;
 
+typedef __AW_SUFFIXED__(WNDCLASSEX) WNDCLASSEX, *LPWNDCLASSEX, *PWNDCLASSEX;
+
 typedef struct tagMENUITEMINFOA
 { UINT				cbSize;
   UINT				fMask;
@@ -2987,6 +3005,8 @@ typedef struct tagMENUITEMINFOW
 } MENUITEMINFOW, *LPMENUITEMINFOW;
 
 typedef const MENUITEMINFOW *LPCMENUITEMINFOW;
+typedef __AW_SUFFIXED__(MENUITEMINFO) MENUITEMINFO, *LPMENUITEMINFO;
+typedef __AW_SUFFIXED__(LPCMENUITEMINFO) LPCMENUITEMINFO;
 
 typedef struct tagSCROLLINFO
 { UINT				cbSize;
@@ -3060,6 +3080,8 @@ typedef struct
   DWORD 			dwLanguageId;
 } MSGBOXPARAMSW, *PMSGBOXPARAMSW, *LPMSGBOXPARAMSW;
 
+typedef __AW_SUFFIXED__(MSGBOXPARAMS) MSGBOXPARAMS, *PMSGBOXPARAMS, *LPMSGBOXPARAMS;
+
 typedef struct tagUSEROBJECTFLAGS
 { BOOL				fInherit;
   BOOL				fReserved;
@@ -3087,6 +3109,8 @@ typedef struct tagHIGHCONTRASTW
   LPWSTR			lpszDefaultScheme;
 } HIGHCONTRASTW, *LPHIGHCONTRASTW;
 
+typedef __AW_SUFFIXED__(HIGHCONTRAST) HIGHCONTRAST, *LPHIGHCONTRAST;
+
 #ifndef NOGDI
 typedef struct tagICONMETRICSA
 { UINT				cbSize;
@@ -3103,7 +3127,9 @@ typedef struct tagICONMETRICSW
   int				iTitleWrap;
   LOGFONTW			lfFont;
 } ICONMETRICSW, *LPICONMETRICSW;
-#endif	/*  NOGDI */
+
+typedef __AW_SUFFIXED__(ICONMETRICS) ICONMETRICS, *LPICONMETRICS;
+#endif	/* ! NOGDI */
 
 typedef struct tagMINIMIZEDMETRICS
 { UINT				cbSize;
@@ -3159,7 +3185,9 @@ typedef struct tagNONCLIENTMETRICSW
   LOGFONTW			lfStatusFont;
   LOGFONTW			lfMessageFont;
 } NONCLIENTMETRICSW, *LPNONCLIENTMETRICSW;
-#endif
+
+typedef __AW_SUFFIXED__(NONCLIENTMETRICS) NONCLIENTMETRICS, *LPNONCLIENTMETRICS;
+#endif	/* ! NOGDI */
 
 typedef struct tagSERIALKEYSA
 { UINT				cbSize;
@@ -3181,6 +3209,8 @@ typedef struct tagSERIALKEYSW
   UINT				iActive;
 } SERIALKEYSW, *LPSERIALKEYSW;
 
+typedef __AW_SUFFIXED__(SERIALKEYS) SERIALKEYS, *LPSERIALKEYS;
+
 typedef struct tagSOUNDSENTRYA
 { UINT				cbSize;
   DWORD 			dwFlags;
@@ -3211,6 +3241,8 @@ typedef struct tagSOUNDSENTRYW
   DWORD 			iWindowsEffectOrdinal;
 } SOUNDSENTRYW, *LPSOUNDSENTRYW;
 
+typedef __AW_SUFFIXED__(SOUNDSENTRY) SOUNDSENTRY, *LPSOUNDSENTRY;
+
 typedef struct tagSTICKYKEYS
 { DWORD 			cbSize;
   DWORD 			dwFlags;
@@ -3287,6 +3319,8 @@ typedef struct tagMDICREATESTRUCTW
   LPARAM			lParam;
 } MDICREATESTRUCTW, *LPMDICREATESTRUCTW;
 
+typedef __AW_SUFFIXED__(MDICREATESTRUCT) MDICREATESTRUCT, *LPMDICREATESTRUCT;
+
 typedef struct tagMINMAXINFO
 { POINT 			ptReserved;
   POINT 			ptMaxSize;
@@ -3333,6 +3367,8 @@ typedef struct tagMULTIKEYHELPW
   WCHAR 			szKeyphrase[1];
 } MULTIKEYHELPW, *PMULTIKEYHELPW, *LPMULTIKEYHELPW;
 
+typedef __AW_SUFFIXED__(MULTIKEYHELP) MULTIKEYHELP, *PMULTIKEYHELP, *LPMULTIKEYHELP;
+
 typedef struct tagHELPWININFOA
 { int				wStructSize;
   int				x;
@@ -3483,6 +3519,8 @@ typedef struct tagMONITORINFOEXW
 } MONITORINFOEXW, *LPMONITORINFOEXW;
 #endif	/* !__cplusplus */
 
+typedef __AW_SUFFIXED__(MONITORINFOEX) MONITORINFOEX, *LPMONITORINFOEX;
+
 typedef struct tagKBDLLHOOKSTRUCT
 { DWORD 			vkCode;
   DWORD 			scanCode;
@@ -3733,7 +3771,7 @@ extern const GUID GUID_SYSTEM_AWAYMODE;
 extern const GUID GUID_MONITOR_POWER_ON;
 #endif
 
-WINUSERAPI HKL WINAPI ActivateKeyboardLayout (HKL, UINT);
+WINUSERAPI HKL  WINAPI ActivateKeyboardLayout (HKL, UINT);
 WINUSERAPI BOOL WINAPI AdjustWindowRect (LPRECT, DWORD, BOOL);
 WINUSERAPI BOOL WINAPI AdjustWindowRectEx (LPRECT, DWORD, BOOL, DWORD);
 
@@ -3742,118 +3780,187 @@ WINUSERAPI BOOL WINAPI AnimateWindow (HWND, DWORD, DWORD);
 #endif	/* >= _WIN32_WINNT_WIN2K */
 
 WINUSERAPI BOOL WINAPI AnyPopup (void);
+
+#define AppendMenu __AW_SUFFIXED__(AppendMenu)
 WINUSERAPI BOOL WINAPI AppendMenuA (HMENU, UINT, UINT_PTR, LPCSTR);
 WINUSERAPI BOOL WINAPI AppendMenuW (HMENU, UINT, UINT_PTR, LPCWSTR);
+
 WINUSERAPI UINT WINAPI ArrangeIconicWindows (HWND);
 WINUSERAPI BOOL WINAPI AttachThreadInput (DWORD, DWORD, BOOL);
 WINUSERAPI HDWP WINAPI BeginDeferWindowPos (int);
-WINUSERAPI HDC WINAPI BeginPaint (HWND, LPPAINTSTRUCT);
+WINUSERAPI HDC  WINAPI BeginPaint (HWND, LPPAINTSTRUCT);
 WINUSERAPI BOOL WINAPI BringWindowToTop (HWND);
+
 WINUSERAPI long WINAPI BroadcastSystemMessage (DWORD, LPDWORD, UINT, WPARAM, LPARAM);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_NT4
+#define BroadcastSystemMessage __AW_SUFFIXED__(BroadcastSystemMessage)
 WINUSERAPI long WINAPI BroadcastSystemMessageA (DWORD, LPDWORD, UINT, WPARAM, LPARAM);
 WINUSERAPI long WINAPI BroadcastSystemMessageW (DWORD, LPDWORD, UINT, WPARAM, LPARAM);
 #endif	/* >= _WIN32_WINNT_NT4 */
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WINXP
+#define BroadcastSystemMessageEx __AW_SUFFIXED__(BroadcastSystemMessageEx)
 WINUSERAPI long WINAPI BroadcastSystemMessageExA (DWORD, LPDWORD, UINT, WPARAM, LPARAM, PBSMINFO);
 WINUSERAPI long WINAPI BroadcastSystemMessageExW (DWORD, LPDWORD, UINT, WPARAM, LPARAM, PBSMINFO);
 #endif	/* >= _WIN32_WINNT_WINXP */
 
+#define CallMsgFilter __AW_SUFFIXED__(CallMsgFilter)
 WINUSERAPI BOOL WINAPI CallMsgFilterA (LPMSG, INT);
 WINUSERAPI BOOL WINAPI CallMsgFilterW (LPMSG, INT);
-WINUSERAPI LRESULT WINAPI CallNextHookEx (HHOOK, int, WPARAM, LPARAM);
+
+#define CallWindowProc __AW_SUFFIXED__(CallWindowProc)
 WINUSERAPI LRESULT WINAPI CallWindowProcA (WNDPROC, HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI LRESULT WINAPI CallWindowProcW (WNDPROC, HWND, UINT, WPARAM, LPARAM);
+
 WINUSERAPI WORD WINAPI CascadeWindows (HWND, UINT, LPCRECT, UINT, const HWND *);
 WINUSERAPI BOOL WINAPI ChangeClipboardChain (HWND, HWND);
 
+#define DefHookProc(c, p, lp, h)  CallNextHookEx ((HHOOK)(*(h)), c, p, lp)
+WINUSERAPI LRESULT WINAPI CallNextHookEx (HHOOK, int, WPARAM, LPARAM);
+
 #ifndef NOGDI
+#define ChangeDisplaySettings __AW_SUFFIXED__(ChangeDisplaySettings)
 WINUSERAPI LONG WINAPI ChangeDisplaySettingsA (PDEVMODEA, DWORD);
 WINUSERAPI LONG WINAPI ChangeDisplaySettingsW (PDEVMODEW, DWORD);
+
+#define ChangeDisplaySettingsEx __AW_SUFFIXED__(ChangeDisplaySettingsEx)
 WINUSERAPI LONG WINAPI ChangeDisplaySettingsExA (LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID);
 WINUSERAPI LONG WINAPI ChangeDisplaySettingsExW (LPCWSTR, LPDEVMODEW, HWND, DWORD, LPVOID);
-#endif
+#endif	/* ! NOGDI */
 
+#define ChangeMenu __AW_SUFFIXED__(ChangeMenu)
 WINUSERAPI BOOL WINAPI ChangeMenuA (HMENU, UINT, LPCSTR, UINT, UINT);
 WINUSERAPI BOOL WINAPI ChangeMenuW (HMENU, UINT, LPCWSTR, UINT, UINT);
-WINUSERAPI LPSTR WINAPI CharLowerA (LPSTR);
+
+#define CharLower __AW_SUFFIXED__(CharLower)
+WINUSERAPI LPSTR  WINAPI CharLowerA (LPSTR);
 WINUSERAPI LPWSTR WINAPI CharLowerW (LPWSTR);
+
+#define CharLowerBuff __AW_SUFFIXED__(CharLowerBuff)
 WINUSERAPI DWORD WINAPI CharLowerBuffA (LPSTR, DWORD);
 WINUSERAPI DWORD WINAPI CharLowerBuffW (LPWSTR, DWORD);
-WINUSERAPI LPSTR WINAPI CharNextA (LPCSTR);
+
+#define CharNext __AW_SUFFIXED__(CharNext)
+WINUSERAPI LPSTR  WINAPI CharNextA (LPCSTR);
 WINUSERAPI LPWSTR WINAPI CharNextW (LPCWSTR);
-WINUSERAPI LPSTR WINAPI CharNextExA (WORD, LPCSTR, DWORD);
-WINUSERAPI LPSTR WINAPI CharPrevA (LPCSTR, LPCSTR);
+WINUSERAPI LPSTR  WINAPI CharNextExA (WORD, LPCSTR, DWORD);
+
+#define CharPrev __AW_SUFFIXED__(CharPrev)
+WINUSERAPI LPSTR  WINAPI CharPrevA (LPCSTR, LPCSTR);
 WINUSERAPI LPWSTR WINAPI CharPrevW (LPCWSTR, LPCWSTR);
-WINUSERAPI LPSTR WINAPI CharPrevExA (WORD, LPCSTR, LPCSTR, DWORD);
+WINUSERAPI LPSTR  WINAPI CharPrevExA (WORD, LPCSTR, LPCSTR, DWORD);
+
+#define CharToOem __AW_SUFFIXED__(CharToOem)
 WINUSERAPI BOOL WINAPI CharToOemA (LPCSTR, LPSTR);
 WINUSERAPI BOOL WINAPI CharToOemW (LPCWSTR, LPSTR);
+
+#define CharToOemBuff __AW_SUFFIXED__(CharToOemBuff)
 WINUSERAPI BOOL WINAPI CharToOemBuffA (LPCSTR, LPSTR, DWORD);
 WINUSERAPI BOOL WINAPI CharToOemBuffW (LPCWSTR, LPSTR, DWORD);
-WINUSERAPI LPSTR WINAPI CharUpperA (LPSTR);
+
+#define CharUpper __AW_SUFFIXED__(CharUpper)
+WINUSERAPI LPSTR  WINAPI CharUpperA (LPSTR);
 WINUSERAPI LPWSTR WINAPI CharUpperW (LPWSTR);
+
+#define CharUpperBuff __AW_SUFFIXED__(CharUpperBuff)
 WINUSERAPI DWORD WINAPI CharUpperBuffA (LPSTR, DWORD);
 WINUSERAPI DWORD WINAPI CharUpperBuffW (LPWSTR, DWORD);
-WINUSERAPI BOOL WINAPI CheckDlgButton (HWND, int, UINT);
+
+WINUSERAPI BOOL  WINAPI CheckDlgButton (HWND, int, UINT);
 WINUSERAPI DWORD WINAPI CheckMenuItem (HMENU, UINT, UINT);
-WINUSERAPI BOOL WINAPI CheckMenuRadioItem (HMENU, UINT, UINT, UINT, UINT);
-WINUSERAPI BOOL WINAPI CheckRadioButton (HWND, int, int, int);
-WINUSERAPI HWND WINAPI ChildWindowFromPoint (HWND, POINT);
-WINUSERAPI HWND WINAPI ChildWindowFromPointEx (HWND, POINT, UINT);
-WINUSERAPI BOOL WINAPI ClientToScreen (HWND, LPPOINT);
-WINUSERAPI BOOL WINAPI ClipCursor (LPCRECT);
-WINUSERAPI BOOL WINAPI CloseClipboard (void);
-WINUSERAPI BOOL WINAPI CloseDesktop (HDESK);
-WINUSERAPI BOOL WINAPI CloseWindow (HWND);
-WINUSERAPI BOOL WINAPI CloseWindowStation (HWINSTA);
+WINUSERAPI BOOL  WINAPI CheckMenuRadioItem (HMENU, UINT, UINT, UINT, UINT);
+WINUSERAPI BOOL  WINAPI CheckRadioButton (HWND, int, int, int);
+WINUSERAPI HWND  WINAPI ChildWindowFromPoint (HWND, POINT);
+WINUSERAPI HWND  WINAPI ChildWindowFromPointEx (HWND, POINT, UINT);
+WINUSERAPI BOOL  WINAPI ClientToScreen (HWND, LPPOINT);
+WINUSERAPI BOOL  WINAPI ClipCursor (LPCRECT);
+WINUSERAPI BOOL  WINAPI CloseClipboard (void);
+WINUSERAPI BOOL  WINAPI CloseDesktop (HDESK);
+WINUSERAPI BOOL  WINAPI CloseWindow (HWND);
+WINUSERAPI BOOL  WINAPI CloseWindowStation (HWINSTA);
+
+#define CopyAcceleratorTable __AW_SUFFIXED__(CopyAcceleratorTable)
 WINUSERAPI int WINAPI CopyAcceleratorTableA (HACCEL, LPACCEL, int);
 WINUSERAPI int WINAPI CopyAcceleratorTableW (HACCEL, LPACCEL, int);
+
 #define CopyCursor(c) ((HCURSOR)(CopyIcon ((HICON)(c))))
-WINUSERAPI HICON WINAPI CopyIcon (HICON);
+WINUSERAPI HICON  WINAPI CopyIcon (HICON);
 WINUSERAPI HANDLE WINAPI CopyImage (HANDLE, UINT, int, int, UINT);
-WINUSERAPI BOOL WINAPI CopyRect (LPRECT, LPCRECT);
-WINUSERAPI int WINAPI CountClipboardFormats (void);
+WINUSERAPI BOOL   WINAPI CopyRect (LPRECT, LPCRECT);
+WINUSERAPI int    WINAPI CountClipboardFormats (void);
+
+#define CreateAcceleratorTable __AW_SUFFIXED__(CreateAcceleratorTable)
 WINUSERAPI HACCEL WINAPI CreateAcceleratorTableA (LPACCEL, int);
 WINUSERAPI HACCEL WINAPI CreateAcceleratorTableW (LPACCEL, int);
-WINUSERAPI BOOL WINAPI CreateCaret (HWND, HBITMAP, int, int);
+
+WINUSERAPI BOOL    WINAPI CreateCaret (HWND, HBITMAP, int, int);
 WINUSERAPI HCURSOR WINAPI CreateCursor (HINSTANCE, int, int, int, int, PCVOID, PCVOID);
 
 #ifndef NOGDI
-WINUSERAPI HDESK WINAPI CreateDesktopA (LPCSTR, LPCSTR, LPDEVMODEA, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
-WINUSERAPI HDESK WINAPI CreateDesktopW (LPCWSTR, LPCWSTR, LPDEVMODEW, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
-#endif
-
-#define CreateDialogA(h, n, w, f)	   CreateDialogParamA (h, n, w, f, 0)
-#define CreateDialogW(h, n, w, f)	   CreateDialogParamW (h, n, w, f, 0)
-#define CreateDialogIndirectA(h, t, w, f)  CreateDialogIndirectParamA (h, t, w, f, 0)
-#define CreateDialogIndirectW(h, t, w, f)  CreateDialogIndirectParamW (h, t, w, f, 0)
-
-WINUSERAPI HWND WINAPI CreateDialogIndirectParamA (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
-WINUSERAPI HWND WINAPI CreateDialogIndirectParamW (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
+#define CreateDesktop __AW_SUFFIXED__(CreateDesktop)
+WINUSERAPI HDESK WINAPI CreateDesktopA
+(LPCSTR, LPCSTR, LPDEVMODEA, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
+WINUSERAPI HDESK WINAPI CreateDesktopW
+(LPCWSTR, LPCWSTR, LPDEVMODEW, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
+#endif	/* ! NOGDI */
+
+#define CreateDialog __AW_SUFFIXED__(CreateDialog)
+#define CreateDialogA(h,n,w,f)  CreateDialogParamA (h, n, w, f, 0)
+#define CreateDialogW(h,n,w,f)  CreateDialogParamW (h, n, w, f, 0)
+
+#define CreateDialogIndirect __AW_SUFFIXED__(CreateDialogIndirect)
+#define CreateDialogIndirectA(h,t,w,f)  CreateDialogIndirectParamA (h, t, w, f, 0)
+#define CreateDialogIndirectW(h,t,w,f)  CreateDialogIndirectParamW (h, t, w, f, 0)
+
+#define CreateDialogIndirectParam __AW_SUFFIXED__(CreateDialogIndirectParam)
+WINUSERAPI HWND WINAPI
+CreateDialogIndirectParamA (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
+WINUSERAPI HWND WINAPI
+CreateDialogIndirectParamW (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
+
+#define CreateDialogParam __AW_SUFFIXED__(CreateDialogParam)
 WINUSERAPI HWND WINAPI CreateDialogParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM);
 WINUSERAPI HWND WINAPI CreateDialogParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
+
 WINUSERAPI HICON WINAPI CreateIcon (HINSTANCE, int, int, BYTE, BYTE, const BYTE *, const BYTE *);
 WINUSERAPI HICON WINAPI CreateIconFromResource (PBYTE, DWORD, BOOL, DWORD);
 WINUSERAPI HICON WINAPI CreateIconFromResourceEx (PBYTE, DWORD, BOOL, DWORD, int, int, UINT);
 WINUSERAPI HICON WINAPI CreateIconIndirect (PICONINFO);
+
+#define CreateMDIWindow __AW_SUFFIXED__(CreateMDIWindow)
 WINUSERAPI HWND WINAPI CreateMDIWindowA (LPCSTR, LPCSTR, DWORD, int, int, int, int, HWND, HINSTANCE, LPARAM);
 WINUSERAPI HWND WINAPI CreateMDIWindowW (LPCWSTR, LPCWSTR, DWORD, int, int, int, int, HWND, HINSTANCE, LPARAM);
 WINUSERAPI HMENU WINAPI CreateMenu (void);
 WINUSERAPI HMENU WINAPI CreatePopupMenu (void);
-#define CreateWindowA(a, b, c, d, e, f, g, h, i, j, k) CreateWindowExA (0, a, b, c, d, e, f, g, h, i, j, k)
-#define CreateWindowW(a, b, c, d, e, f, g, h, i, j, k) CreateWindowExW (0, a, b, c, d, e, f, g, h, i, j, k)
-WINUSERAPI HWND WINAPI CreateWindowExA (DWORD, LPCSTR, LPCSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID);
-WINUSERAPI HWND WINAPI CreateWindowExW (DWORD, LPCWSTR, LPCWSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID);
+
+#define CreateWindow __AW_SUFFIXED__(CreateWindow)
+#define CreateWindowA(a, b, c, d, e, f, g, h, i, j, k)  \
+  CreateWindowExA (0, a, b, c, d, e, f, g, h, i, j, k)
+#define CreateWindowW(a, b, c, d, e, f, g, h, i, j, k)  \
+  CreateWindowExW (0, a, b, c, d, e, f, g, h, i, j, k)
+
+#define CreateWindowEx __AW_SUFFIXED__(CreateWindowEx)
+WINUSERAPI HWND WINAPI CreateWindowExA
+(DWORD, LPCSTR, LPCSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID);
+WINUSERAPI HWND WINAPI CreateWindowExW
+(DWORD, LPCWSTR, LPCWSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID);
+
+#define CreateWindowStation __AW_SUFFIXED__(CreateWindowStation)
 WINUSERAPI HWINSTA WINAPI CreateWindowStationA (LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES);
 WINUSERAPI HWINSTA WINAPI CreateWindowStationW (LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES);
+
+WINUSERAPI HDWP WINAPI DeferWindowPos (HDWP, HWND, HWND, int, int, int, int, UINT);
+
+#define DefDlgProc __AW_SUFFIXED__(DefDlgProc)
 WINUSERAPI LRESULT WINAPI DefDlgProcA (HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI LRESULT WINAPI DefDlgProcW (HWND, UINT, WPARAM, LPARAM);
-WINUSERAPI HDWP WINAPI DeferWindowPos (HDWP, HWND, HWND, int, int, int, int, UINT);
+
+#define DefFrameProc __AW_SUFFIXED__(DefFrameProc)
 WINUSERAPI LRESULT WINAPI DefFrameProcA (HWND, HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI LRESULT WINAPI DefFrameProcW (HWND, HWND, UINT, WPARAM, LPARAM);
-#define DefHookProc(c, p, lp, h)	CallNextHookEx ((HHOOK)(*(h)), c, p, lp)
+
+#define DefMDIChildProc __AW_SUFFIXED__(DefMDIChildProc)
 WINUSERAPI LRESULT WINAPI DefMDIChildProcA (HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI LRESULT WINAPI DefMDIChildProcW (HWND, UINT, WPARAM, LPARAM);
 
@@ -3861,8 +3968,10 @@ WINUSERAPI LRESULT WINAPI DefMDIChildProcW (HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI LRESULT WINAPI DefRawInputProc (PRAWINPUT *, INT, UINT);
 #endif
 
+#define DefWindowProc __AW_SUFFIXED__(DefWindowProc)
 WINUSERAPI LRESULT WINAPI DefWindowProcA (HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI LRESULT WINAPI DefWindowProcW (HWND, UINT, WPARAM, LPARAM);
+
 WINUSERAPI BOOL WINAPI DeleteMenu (HMENU, UINT, UINT);
 WINUSERAPI BOOL WINAPI DeregisterShellHookWindow (HWND);
 WINUSERAPI BOOL WINAPI DestroyAcceleratorTable (HACCEL);
@@ -3871,13 +3980,21 @@ WINUSERAPI BOOL WINAPI DestroyCursor (HCURSOR);
 WINUSERAPI BOOL WINAPI DestroyIcon (HICON);
 WINUSERAPI BOOL WINAPI DestroyMenu (HMENU);
 WINUSERAPI BOOL WINAPI DestroyWindow (HWND);
-#define DialogBoxA(i, t, p, f)	DialogBoxParamA (i, t, p, f, 0)
-#define DialogBoxW(i, t, p, f)	DialogBoxParamW (i, t, p, f, 0)
-#define DialogBoxIndirectA(i, t, p, f) DialogBoxIndirectParamA (i, t, p, f, 0)
-#define DialogBoxIndirectW(i, t, p, f) DialogBoxIndirectParamW (i, t, p, f, 0)
+
+#define DialogBox __AW_SUFFIXED__(DialogBox)
+#define DialogBoxA(i,t,p,f)  DialogBoxParamA (i, t, p, f, 0)
+#define DialogBoxW(i,t,p,f)  DialogBoxParamW (i, t, p, f, 0)
+
+#define DialogBoxIndirect __AW_SUFFIXED__(DialogBoxIndirect)
+#define DialogBoxIndirectA(i,t,p,f)  DialogBoxIndirectParamA (i, t, p, f, 0)
+#define DialogBoxIndirectW(i,t,p,f)  DialogBoxIndirectParamW (i, t, p, f, 0)
+
+#define DialogBoxIndirectParam __AW_SUFFIXED__(DialogBoxIndirectParam)
 WINUSERAPI int WINAPI DialogBoxIndirectParamA (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
 WINUSERAPI int WINAPI DialogBoxIndirectParamW (HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM);
 
+#define DialogBoxParam __AW_SUFFIXED__(DialogBoxParam)
+
 #ifdef _WIN32_WCE
 extern int DialogBoxParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM);
 extern int DialogBoxParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
@@ -3886,32 +4003,51 @@ WINUSERAPI int WINAPI DialogBoxParamA (HINSTANCE, LPCSTR, HWND, DLGPROC, LPARAM)
 WINUSERAPI int WINAPI DialogBoxParamW (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM);
 #endif
 
+#define DispatchMessage __AW_SUFFIXED__(DispatchMessage)
 WINUSERAPI LONG WINAPI DispatchMessageA (const MSG *);
 WINUSERAPI LONG WINAPI DispatchMessageW (const MSG *);
+
+#define DlgDirList __AW_SUFFIXED__(DlgDirList)
 WINUSERAPI int WINAPI DlgDirListA (HWND, LPSTR, int, int, UINT);
 WINUSERAPI int WINAPI DlgDirListW (HWND, LPWSTR, int, int, UINT);
+
+#define DlgDirListComboBox __AW_SUFFIXED__(DlgDirListComboBox)
 WINUSERAPI int WINAPI DlgDirListComboBoxA (HWND, LPSTR, int, int, UINT);
 WINUSERAPI int WINAPI DlgDirListComboBoxW (HWND, LPWSTR, int, int, UINT);
+
+#define DlgDirSelectComboBoxEx __AW_SUFFIXED__(DlgDirSelectComboBoxEx)
 WINUSERAPI BOOL WINAPI DlgDirSelectComboBoxExA (HWND, LPSTR, int, int);
 WINUSERAPI BOOL WINAPI DlgDirSelectComboBoxExW (HWND, LPWSTR, int, int);
+
+#define DlgDirSelectEx __AW_SUFFIXED__(DlgDirSelectEx)
 WINUSERAPI BOOL WINAPI DlgDirSelectExA (HWND, LPSTR, int, int);
 WINUSERAPI BOOL WINAPI DlgDirSelectExW (HWND, LPWSTR, int, int);
-WINUSERAPI BOOL WINAPI DragDetect (HWND, POINT);
+
+WINUSERAPI BOOL  WINAPI DragDetect (HWND, POINT);
 WINUSERAPI DWORD WINAPI DragObject (HWND, HWND, UINT, DWORD, HCURSOR);
-WINUSERAPI BOOL WINAPI DrawAnimatedRects (HWND, int, LPCRECT, LPCRECT);
-WINUSERAPI BOOL WINAPI DrawCaption (HWND, HDC, LPCRECT, UINT);
-WINUSERAPI BOOL WINAPI DrawEdge (HDC, LPRECT, UINT, UINT);
-WINUSERAPI BOOL WINAPI DrawFocusRect (HDC, LPCRECT);
-WINUSERAPI BOOL WINAPI DrawFrameControl (HDC, LPRECT, UINT, UINT);
-WINUSERAPI BOOL WINAPI DrawIcon (HDC, int, int, HICON);
-WINUSERAPI BOOL WINAPI DrawIconEx (HDC, int, int, HICON, int, int, UINT, HBRUSH, UINT);
-WINUSERAPI BOOL WINAPI DrawMenuBar (HWND);
-WINUSERAPI BOOL WINAPI DrawStateA (HDC, HBRUSH, DRAWSTATEPROC, LPARAM, WPARAM, int, int, int, int, UINT);
-WINUSERAPI BOOL WINAPI DrawStateW (HDC, HBRUSH, DRAWSTATEPROC, LPARAM, WPARAM, int, int, int, int, UINT);
+WINUSERAPI BOOL  WINAPI DrawAnimatedRects (HWND, int, LPCRECT, LPCRECT);
+WINUSERAPI BOOL  WINAPI DrawCaption (HWND, HDC, LPCRECT, UINT);
+WINUSERAPI BOOL  WINAPI DrawEdge (HDC, LPRECT, UINT, UINT);
+WINUSERAPI BOOL  WINAPI DrawFocusRect (HDC, LPCRECT);
+WINUSERAPI BOOL  WINAPI DrawFrameControl (HDC, LPRECT, UINT, UINT);
+WINUSERAPI BOOL  WINAPI DrawIcon (HDC, int, int, HICON);
+WINUSERAPI BOOL  WINAPI DrawIconEx (HDC, int, int, HICON, int, int, UINT, HBRUSH, UINT);
+WINUSERAPI BOOL  WINAPI DrawMenuBar (HWND);
+
+#define DrawState __AW_SUFFIXED__(DrawState)
+WINUSERAPI BOOL WINAPI DrawStateA
+(HDC, HBRUSH, DRAWSTATEPROC, LPARAM, WPARAM, int, int, int, int, UINT);
+WINUSERAPI BOOL WINAPI DrawStateW
+(HDC, HBRUSH, DRAWSTATEPROC, LPARAM, WPARAM, int, int, int, int, UINT);
+
+#define DrawText __AW_SUFFIXED__(DrawText)
 WINUSERAPI int WINAPI DrawTextA (HDC, LPCSTR, int, LPRECT, UINT);
 WINUSERAPI int WINAPI DrawTextW (HDC, LPCWSTR, int, LPRECT, UINT);
+
+#define DrawTextEx __AW_SUFFIXED__(DrawTextEx)
 WINUSERAPI int WINAPI DrawTextExA (HDC, LPSTR, int, LPRECT, UINT, LPDRAWTEXTPARAMS);
 WINUSERAPI int WINAPI DrawTextExW (HDC, LPWSTR, int, LPRECT, UINT, LPDRAWTEXTPARAMS);
+
 WINUSERAPI BOOL WINAPI EmptyClipboard (void);
 WINUSERAPI BOOL WINAPI EnableMenuItem (HMENU, UINT, UINT);
 WINUSERAPI BOOL WINAPI EnableScrollBar (HWND, UINT, UINT);
@@ -3927,76 +4063,107 @@ WINUSERAPI BOOL WINAPI EndTask (HWND, BOOL, BOOL);
 
 WINUSERAPI BOOL WINAPI EnumChildWindows (HWND, ENUMWINDOWSPROC, LPARAM);
 WINUSERAPI UINT WINAPI EnumClipboardFormats (UINT);
+
+#define EnumDesktops __AW_SUFFIXED__(EnumDesktops)
 WINUSERAPI BOOL WINAPI EnumDesktopsA (HWINSTA, DESKTOPENUMPROCA, LPARAM);
 WINUSERAPI BOOL WINAPI EnumDesktopsW (HWINSTA, DESKTOPENUMPROCW, LPARAM);
+
 WINUSERAPI BOOL WINAPI EnumDesktopWindows (HDESK, ENUMWINDOWSPROC, LPARAM);
 WINUSERAPI BOOL WINAPI EnumDisplayMonitors (HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 
 #ifndef NOGDI
+#define EnumDisplaySettings __AW_SUFFIXED__(EnumDisplaySettings)
 WINUSERAPI BOOL WINAPI EnumDisplaySettingsA (LPCSTR, DWORD, PDEVMODEA);
 WINUSERAPI BOOL WINAPI EnumDisplaySettingsW (LPCWSTR, DWORD, PDEVMODEW);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
 WINUSERAPI BOOL WINAPI EnumDisplaySettingsExA (LPCSTR, DWORD, LPDEVMODEA, DWORD);
 WINUSERAPI BOOL WINAPI EnumDisplaySettingsExW (LPCWSTR, DWORD, LPDEVMODEW, DWORD);
+#define EnumDisplaySettingsEx __AW_SUFFIXED__(EnumDisplaySettingsEx)
 #endif
 
+#define EnumDisplayDevices __AW_SUFFIXED__(EnumDisplayDevices)
 WINUSERAPI BOOL WINAPI EnumDisplayDevicesA (LPCSTR, DWORD, PDISPLAY_DEVICEA, DWORD);
 WINUSERAPI BOOL WINAPI EnumDisplayDevicesW (LPCWSTR, DWORD, PDISPLAY_DEVICEW, DWORD);
-#endif
+#endif	/* ! NOGDI */
 
+#define EnumProps __AW_SUFFIXED__(EnumProps)
 WINUSERAPI int WINAPI EnumPropsA (HWND, PROPENUMPROCA);
 WINUSERAPI int WINAPI EnumPropsW (HWND, PROPENUMPROCW);
+
+#define EnumPropsEx __AW_SUFFIXED__(EnumPropsEx)
 WINUSERAPI int WINAPI EnumPropsExA (HWND, PROPENUMPROCEXA, LPARAM);
 WINUSERAPI int WINAPI EnumPropsExW (HWND, PROPENUMPROCEXW, LPARAM);
-#define EnumTaskWindows(h, f, p) EnumThreadWindows ((DWORD)h, f, p)
+
+#define EnumTaskWindows(h,f,p)  EnumThreadWindows ((DWORD)(h), f, p)
 WINUSERAPI BOOL WINAPI EnumThreadWindows (DWORD, WNDENUMPROC, LPARAM);
 WINUSERAPI BOOL WINAPI EnumWindows (WNDENUMPROC, LPARAM);
+
+#define EnumWindowStations __AW_SUFFIXED__(EnumWindowStations)
 WINUSERAPI BOOL WINAPI EnumWindowStationsA (WINSTAENUMPROCA, LPARAM);
 WINUSERAPI BOOL WINAPI EnumWindowStationsW (WINSTAENUMPROCW, LPARAM);
+
 WINUSERAPI BOOL WINAPI EqualRect (LPCRECT, LPCRECT);
-#define ExitWindows(r, c) ExitWindowsEx (EWX_LOGOFF, 0)
+
+#define ExitWindows(r, c)  ExitWindowsEx (EWX_LOGOFF, 0)
 WINUSERAPI BOOL WINAPI ExitWindowsEx (UINT, DWORD);
+
+#define FindWindow __AW_SUFFIXED__(FindWindow)
 WINUSERAPI HWND WINAPI FindWindowA (LPCSTR, LPCSTR);
+WINUSERAPI HWND WINAPI FindWindowW (LPCWSTR, LPCWSTR);
+
+#define FindWindowEx __AW_SUFFIXED__(FindWindowEx)
 WINUSERAPI HWND WINAPI FindWindowExA (HWND, HWND, LPCSTR, LPCSTR);
 WINUSERAPI HWND WINAPI FindWindowExW (HWND, HWND, LPCWSTR, LPCWSTR);
-WINUSERAPI HWND WINAPI FindWindowW (LPCWSTR, LPCWSTR);
-WINUSERAPI BOOL WINAPI FlashWindow (HWND, BOOL);
 
+WINUSERAPI BOOL WINAPI FlashWindow (HWND, BOOL);
 #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
 WINUSERAPI BOOL WINAPI FlashWindowEx (PFLASHWINFO);
 #endif
 
 int WINAPI FrameRect (HDC, LPCRECT, HBRUSH);
-WINUSERAPI BOOL WINAPI FrameRgn (HDC, HRGN, HBRUSH, int, int);
-WINUSERAPI HWND WINAPI GetActiveWindow (void);
-WINUSERAPI HWND WINAPI GetAncestor (HWND, UINT);
+WINUSERAPI BOOL  WINAPI FrameRgn (HDC, HRGN, HBRUSH, int, int);
+WINUSERAPI HWND  WINAPI GetActiveWindow (void);
+WINUSERAPI HWND  WINAPI GetAncestor (HWND, UINT);
 WINUSERAPI SHORT WINAPI GetAsyncKeyState (int);
-WINUSERAPI HWND WINAPI GetCapture (void);
-WINUSERAPI UINT WINAPI GetCaretBlinkTime (void);
-WINUSERAPI BOOL WINAPI GetCaretPos (LPPOINT);
+WINUSERAPI HWND  WINAPI GetCapture (void);
+WINUSERAPI UINT  WINAPI GetCaretBlinkTime (void);
+WINUSERAPI BOOL  WINAPI GetCaretPos (LPPOINT);
+
+#define GetClassInfo __AW_SUFFIXED__(GetClassInfo)
 WINUSERAPI BOOL WINAPI GetClassInfoA (HINSTANCE, LPCSTR, LPWNDCLASSA);
-WINUSERAPI BOOL WINAPI GetClassInfoExA (HINSTANCE, LPCSTR, LPWNDCLASSEXA);
 WINUSERAPI BOOL WINAPI GetClassInfoW (HINSTANCE, LPCWSTR, LPWNDCLASSW);
+
+#define GetClassInfoEx __AW_SUFFIXED__(GetClassInfoEx)
+WINUSERAPI BOOL WINAPI GetClassInfoExA (HINSTANCE, LPCSTR, LPWNDCLASSEXA);
 WINUSERAPI BOOL WINAPI GetClassInfoExW (HINSTANCE, LPCWSTR, LPWNDCLASSEXW);
+
+#define GetClassLong __AW_SUFFIXED__(GetClassLong)
 WINUSERAPI DWORD WINAPI GetClassLongA (HWND, int);
 WINUSERAPI DWORD WINAPI GetClassLongW (HWND, int);
 
 #ifdef _WIN64
+#define GetClassLongPtr __AW_SUFFIXED__(GetClassLongPtr)
 WINUSERAPI ULONG_PTR WINAPI GetClassLongPtrA (HWND, int);
 WINUSERAPI ULONG_PTR WINAPI GetClassLongPtrW (HWND, int);
 #else
-#define GetClassLongPtrA GetClassLongA
-#define GetClassLongPtrW GetClassLongW
+#define GetClassLongPtr   GetClassLong
+#define GetClassLongPtrA  GetClassLongA
+#define GetClassLongPtrW  GetClassLongW
 #endif
 
+#define GetClassName __AW_SUFFIXED__(GetClassName)
 WINUSERAPI int WINAPI GetClassNameA (HWND, LPSTR, int);
 WINUSERAPI int WINAPI GetClassNameW (HWND, LPWSTR, int);
+
 WINUSERAPI WORD WINAPI GetClassWord (HWND, int);
 WINUSERAPI BOOL WINAPI GetClientRect (HWND, LPRECT);
-WINUSERAPI HANDLE WINAPI GetClipboardData (UINT);
+
+#define GetClipboardFormatName __AW_SUFFIXED__(GetClipboardFormatName)
 WINUSERAPI int WINAPI GetClipboardFormatNameA (UINT, LPSTR, int);
 WINUSERAPI int WINAPI GetClipboardFormatNameW (UINT, LPWSTR, int);
+
+WINUSERAPI HANDLE WINAPI GetClipboardData (UINT);
 WINUSERAPI HWND WINAPI GetClipboardOwner (void);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
@@ -4013,8 +4180,11 @@ WINUSERAPI long WINAPI GetDialogBaseUnits (void);
 WINUSERAPI int WINAPI GetDlgCtrlID (HWND);
 WINUSERAPI HWND WINAPI GetDlgItem (HWND, int);
 WINUSERAPI UINT WINAPI GetDlgItemInt (HWND, int, PBOOL, BOOL);
+
+#define GetDlgItemText __AW_SUFFIXED__(GetDlgItemText)
 WINUSERAPI UINT WINAPI GetDlgItemTextA (HWND, int, LPSTR, int);
 WINUSERAPI UINT WINAPI GetDlgItemTextW (HWND, int, LPWSTR, int);
+
 WINUSERAPI UINT WINAPI GetDoubleClickTime (void);
 WINUSERAPI HWND WINAPI GetFocus (void);
 WINUSERAPI HWND WINAPI GetForegroundWindow (void);
@@ -4028,12 +4198,18 @@ WINUSERAPI BOOL WINAPI GetInputState (void);
 WINUSERAPI UINT WINAPI GetKBCodePage (void);
 WINUSERAPI HKL WINAPI GetKeyboardLayout (DWORD);
 WINUSERAPI UINT WINAPI GetKeyboardLayoutList (int, HKL *);
+
+#define GetKeyboardLayoutName __AW_SUFFIXED__(GetKeyboardLayoutName)
 WINUSERAPI BOOL WINAPI GetKeyboardLayoutNameA (LPSTR);
 WINUSERAPI BOOL WINAPI GetKeyboardLayoutNameW (LPWSTR);
+
 WINUSERAPI BOOL WINAPI GetKeyboardState (PBYTE);
 WINUSERAPI int WINAPI GetKeyboardType (int);
+
+#define GetKeyNameText __AW_SUFFIXED__(GetKeyNameText)
 WINUSERAPI int WINAPI GetKeyNameTextA (LONG, LPSTR, int);
 WINUSERAPI int WINAPI GetKeyNameTextW (LONG, LPWSTR, int);
+
 WINUSERAPI SHORT WINAPI GetKeyState (int);
 WINUSERAPI HWND WINAPI GetLastActivePopup (HWND);
 WINUSERAPI HMENU WINAPI GetMenu (HWND);
@@ -4042,14 +4218,22 @@ WINUSERAPI DWORD WINAPI GetMenuContextHelpId (HMENU);
 WINUSERAPI UINT WINAPI GetMenuDefaultItem (HMENU, UINT, UINT);
 WINUSERAPI int WINAPI GetMenuItemCount (HMENU);
 WINUSERAPI UINT WINAPI GetMenuItemID (HMENU, int);
+
+#define GetMenuItemInfo __AW_SUFFIXED__(GetMenuItemInfo)
 WINUSERAPI BOOL WINAPI GetMenuItemInfoA (HMENU, UINT, BOOL, LPMENUITEMINFOA);
 WINUSERAPI BOOL WINAPI GetMenuItemInfoW (HMENU, UINT, BOOL, LPMENUITEMINFOW);
+
 WINUSERAPI BOOL WINAPI GetMenuItemRect (HWND, HMENU, UINT, LPRECT);
 WINUSERAPI UINT WINAPI GetMenuState (HMENU, UINT, UINT);
+
+#define GetMenuString __AW_SUFFIXED__(GetMenuString)
 WINUSERAPI int WINAPI GetMenuStringA (HMENU, UINT, LPSTR, int, UINT);
 WINUSERAPI int WINAPI GetMenuStringW (HMENU, UINT, LPWSTR, int, UINT);
+
+#define GetMessage __AW_SUFFIXED__(GetMessage)
 WINUSERAPI BOOL WINAPI GetMessageA (LPMSG, HWND, UINT, UINT);
 WINUSERAPI BOOL WINAPI GetMessageW (LPMSG, HWND, UINT, UINT);
+
 WINUSERAPI LONG WINAPI GetMessageExtraInfo (void);
 WINUSERAPI DWORD WINAPI GetMessagePos (void);
 WINUSERAPI LONG WINAPI GetMessageTime (void);
@@ -4060,18 +4244,22 @@ WINUSERAPI int WINAPI GetMouseMovePointsEx (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEP
 
 WINUSERAPI HWND WINAPI GetNextDlgGroupItem (HWND, HWND, BOOL);
 WINUSERAPI HWND WINAPI GetNextDlgTabItem (HWND, HWND, BOOL);
-#define GetNextWindow(h, c) GetWindow (h, c)
 WINUSERAPI HWND WINAPI GetOpenClipboardWindow (void);
 WINUSERAPI HWND WINAPI GetParent (HWND);
 WINUSERAPI int WINAPI GetPriorityClipboardFormat (UINT *, int);
+
+#define GetProp __AW_SUFFIXED__(GetProp)
 WINUSERAPI HANDLE WINAPI GetPropA (HWND, LPCSTR);
 WINUSERAPI HANDLE WINAPI GetPropW (HWND, LPCWSTR);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WINXP
 WINUSERAPI UINT WINAPI GetRawInputBuffer (PRAWINPUT, PUINT, UINT);
 WINUSERAPI UINT WINAPI GetRawInputData (HRAWINPUT, UINT, LPVOID, PUINT, UINT);
+
+#define GetRawInputDeviceInfo __AW_SUFFIXED__(GetRawInputDeviceInfo)
 WINUSERAPI UINT WINAPI GetRawInputDeviceInfoA (HANDLE, UINT, LPVOID, PUINT);
 WINUSERAPI UINT WINAPI GetRawInputDeviceInfoW (HANDLE, UINT, LPVOID, PUINT);
+
 WINUSERAPI UINT WINAPI GetRawInputDeviceList (PRAWINPUTDEVICELIST, PUINT, UINT);
 WINUSERAPI UINT WINAPI GetRegisteredRawInputDevices (PRAWINPUTDEVICE, PUINT, UINT);
 #endif
@@ -4088,43 +4276,64 @@ WINUSERAPI HWND WINAPI GetShellWindow (void);
 WINUSERAPI HMENU WINAPI GetSubMenu (HMENU, int);
 WINUSERAPI DWORD WINAPI GetSysColor (int);
 WINUSERAPI HBRUSH WINAPI GetSysColorBrush (int);
-#define GetSysModalWindow() (NULL)
 WINUSERAPI HMENU WINAPI GetSystemMenu (HWND, BOOL);
 WINUSERAPI int WINAPI GetSystemMetrics (int);
+#define GetSysModalWindow() (NULL)
+
+#define GetTabbedTextExtent __AW_SUFFIXED__(GetTabbedTextExtent)
 WINUSERAPI DWORD WINAPI GetTabbedTextExtentA (HDC, LPCSTR, int, int, LPINT);
 WINUSERAPI DWORD WINAPI GetTabbedTextExtentW (HDC, LPCWSTR, int, int, LPINT);
+
+#define GetWindowLong __AW_SUFFIXED__(GetWindowLong)
 WINUSERAPI LONG WINAPI GetWindowLongA (HWND, int);
 WINUSERAPI LONG WINAPI GetWindowLongW (HWND, int);
 
 #ifdef _WIN64
+#define GetWindowLongPtr __AW_SUFFIXED__(GetWindowLongPtr)
 WINUSERAPI LONG_PTR WINAPI GetWindowLongPtrA (HWND, int);
 WINUSERAPI LONG_PTR WINAPI GetWindowLongPtrW (HWND, int);
 #else
-#define GetWindowLongPtrA GetWindowLongA
-#define GetWindowLongPtrW GetWindowLongW
+#define GetWindowLongPtr   GetWindowLong
+#define GetWindowLongPtrA  GetWindowLongA
+#define GetWindowLongPtrW  GetWindowLongW
 #endif
 
 WINUSERAPI HDESK WINAPI GetThreadDesktop (DWORD);
 WINUSERAPI HWND WINAPI GetTopWindow (HWND);
 WINUSERAPI BOOL WINAPI GetUpdateRect (HWND, LPRECT, BOOL);
 WINUSERAPI int WINAPI GetUpdateRgn (HWND, HRGN, BOOL);
+
+#define GetUserObjectInformation __AW_SUFFIXED__(GetUserObjectInformation)
 WINUSERAPI BOOL WINAPI GetUserObjectInformationA (HANDLE, int, PVOID, DWORD, PDWORD);
 WINUSERAPI BOOL WINAPI GetUserObjectInformationW (HANDLE, int, PVOID, DWORD, PDWORD);
-WINUSERAPI BOOL WINAPI GetUserObjectSecurity (HANDLE, PSECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, PDWORD);
+
+WINUSERAPI BOOL WINAPI GetUserObjectSecurity
+(HANDLE, PSECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, PDWORD);
+
 WINUSERAPI HWND WINAPI GetWindow (HWND, UINT);
+#define GetNextWindow(h, c) GetWindow(h, c)
+
 WINUSERAPI DWORD WINAPI GetWindowContextHelpId (HWND);
 WINUSERAPI HDC WINAPI GetWindowDC (HWND);
 WINUSERAPI BOOL WINAPI GetWindowPlacement (HWND, WINDOWPLACEMENT *);
 WINUSERAPI BOOL WINAPI GetWindowRect (HWND, LPRECT);
 WINUSERAPI int WINAPI GetWindowRgn (HWND, HRGN);
-#define GetWindowTask(hWnd)	((HANDLE)(GetWindowThreadProcessId(hWnd, NULL)))
+WINUSERAPI WORD WINAPI GetWindowWord (HWND, int);
+
+#define GetWindowTask(hWnd) ((HANDLE)(GetWindowThreadProcessId(hWnd, NULL)))
+
+#define GetWindowText __AW_SUFFIXED__(GetWindowText)
 WINUSERAPI int WINAPI GetWindowTextA (HWND, LPSTR, int);
+WINUSERAPI int WINAPI GetWindowTextW (HWND, LPWSTR, int);
+
+#define GetWindowTextLength __AW_SUFFIXED__(GetWindowTextLength)
 WINUSERAPI int WINAPI GetWindowTextLengthA (HWND);
 WINUSERAPI int WINAPI GetWindowTextLengthW (HWND);
-WINUSERAPI int WINAPI GetWindowTextW (HWND, LPWSTR, int);
-WINUSERAPI WORD WINAPI GetWindowWord (HWND, int);
+
+#define GetAltTabInfo __AW_SUFFIXED__(GetAltTabInfo)
 WINUSERAPI BOOL WINAPI GetAltTabInfoA (HWND, int, PALTTABINFO, LPSTR, UINT);
 WINUSERAPI BOOL WINAPI GetAltTabInfoW (HWND, int, PALTTABINFO, LPWSTR, UINT);
+
 WINUSERAPI BOOL WINAPI GetComboBoxInfo (HWND, PCOMBOBOXINFO);
 WINUSERAPI BOOL WINAPI GetCursorInfo (PCURSORINFO);
 
@@ -4141,19 +4350,25 @@ WINUSERAPI BOOL WINAPI GetMenuInfo (HMENU, LPMENUINFO);
 WINUSERAPI BOOL WINAPI GetProcessDefaultLayout (DWORD *);
 #endif
 
-WINUSERAPI BOOL WINAPI GetScrollBarInfo (HWND, LONG, PSCROLLBARINFO);
-
 #if _WIN32_WINDOWS >= _WIN32_WINDOWS_98
 WINUSERAPI BOOL WINAPI GetTitleBarInfo (HWND, PTITLEBARINFO);
 #endif
 
 WINUSERAPI BOOL WINAPI GetWindowInfo (HWND, PWINDOWINFO);
+WINUSERAPI BOOL WINAPI GetScrollBarInfo (HWND, LONG, PSCROLLBARINFO);
+
+#define GetMonitorInfo __AW_SUFFIXED__(GetMonitorInfo)
 WINUSERAPI BOOL WINAPI GetMonitorInfoA (HMONITOR, LPMONITORINFO);
 WINUSERAPI BOOL WINAPI GetMonitorInfoW (HMONITOR, LPMONITORINFO);
+
+#define GetWindowModuleFileName __AW_SUFFIXED__(GetWindowModuleFileName)
 WINUSERAPI UINT WINAPI GetWindowModuleFileNameA (HWND, LPSTR, UINT);
 WINUSERAPI UINT WINAPI GetWindowModuleFileNameW (HWND, LPWSTR, UINT);
+
+#define GrayString __AW_SUFFIXED__(GrayString)
 WINUSERAPI BOOL WINAPI GrayStringA (HDC, HBRUSH, GRAYSTRINGPROC, LPARAM, int, int, int, int, int);
 WINUSERAPI BOOL WINAPI GrayStringW (HDC, HBRUSH, GRAYSTRINGPROC, LPARAM, int, int, int, int, int);
+
 WINUSERAPI BOOL WINAPI HideCaret (HWND);
 WINUSERAPI BOOL WINAPI HiliteMenuItem (HWND, HMENU, UINT, UINT);
 WINUSERAPI BOOL WINAPI InflateRect (LPRECT, int, int);
@@ -4163,28 +4378,43 @@ WINUSERAPI BOOL WINAPI InSendMessage (void);
 WINUSERAPI DWORD WINAPI InSendMessageEx (LPVOID);
 #endif
 
+#define InsertMenu __AW_SUFFIXED__(InsertMenu)
 WINUSERAPI BOOL WINAPI InsertMenuA (HMENU, UINT, UINT, UINT, LPCSTR);
 WINUSERAPI BOOL WINAPI InsertMenuW (HMENU, UINT, UINT, UINT, LPCWSTR);
+
+#define InsertMenuItem __AW_SUFFIXED__(InsertMenuItem)
 WINUSERAPI BOOL WINAPI InsertMenuItemA (HMENU, UINT, BOOL, LPCMENUITEMINFOA);
 WINUSERAPI BOOL WINAPI InsertMenuItemW (HMENU, UINT, BOOL, LPCMENUITEMINFOW);
+
 WINUSERAPI INT WINAPI InternalGetWindowText (HWND, LPWSTR, INT);
 WINUSERAPI BOOL WINAPI IntersectRect (LPRECT, LPCRECT, LPCRECT);
 WINUSERAPI BOOL WINAPI InvalidateRect (HWND, LPCRECT, BOOL);
 WINUSERAPI BOOL WINAPI InvalidateRgn (HWND, HRGN, BOOL);
 WINUSERAPI BOOL WINAPI InvertRect (HDC, LPCRECT);
+
+#define IsCharAlpha __AW_SUFFIXED__(IsCharAlpha)
 WINUSERAPI BOOL WINAPI IsCharAlphaA (CHAR ch);
+WINUSERAPI BOOL WINAPI IsCharAlphaW (WCHAR);
+
+#define IsCharAlphaNumeric __AW_SUFFIXED__(IsCharAlphaNumeric)
 WINUSERAPI BOOL WINAPI IsCharAlphaNumericA (CHAR);
 WINUSERAPI BOOL WINAPI IsCharAlphaNumericW (WCHAR);
-WINUSERAPI BOOL WINAPI IsCharAlphaW (WCHAR);
+
+#define IsCharLower __AW_SUFFIXED__(IsCharLower)
 WINUSERAPI BOOL WINAPI IsCharLowerA (CHAR);
 WINUSERAPI BOOL WINAPI IsCharLowerW (WCHAR);
+
+#define IsCharUpper __AW_SUFFIXED__(IsCharUpper)
 WINUSERAPI BOOL WINAPI IsCharUpperA (CHAR);
 WINUSERAPI BOOL WINAPI IsCharUpperW (WCHAR);
+
 WINUSERAPI BOOL WINAPI IsChild (HWND, HWND);
 WINUSERAPI BOOL WINAPI IsClipboardFormatAvailable (UINT);
+WINUSERAPI UINT WINAPI IsDlgButtonChecked (HWND, int);
+
+#define IsDialogMessage __AW_SUFFIXED__(IsDialogMessage)
 WINUSERAPI BOOL WINAPI IsDialogMessageA (HWND, LPMSG);
 WINUSERAPI BOOL WINAPI IsDialogMessageW (HWND, LPMSG);
-WINUSERAPI UINT WINAPI IsDlgButtonChecked (HWND, int);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WINXP
 WINUSERAPI BOOL WINAPI IsGUIThread (BOOL);
@@ -4209,26 +4439,47 @@ WINUSERAPI BOOL WINAPI IsWinEventHookInstalled (DWORD);
 WINUSERAPI BOOL WINAPI IsZoomed (HWND);
 WINUSERAPI VOID WINAPI keybd_event (BYTE, BYTE, DWORD, DWORD);
 WINUSERAPI BOOL WINAPI KillTimer (HWND, UINT_PTR);
+
+#define LoadAccelerators __AW_SUFFIXED__(LoadAccelerators)
 WINUSERAPI HACCEL WINAPI LoadAcceleratorsA (HINSTANCE, LPCSTR);
 WINUSERAPI HACCEL WINAPI LoadAcceleratorsW (HINSTANCE, LPCWSTR);
+
+#define LoadBitmap __AW_SUFFIXED__(LoadBitmap)
 WINUSERAPI HBITMAP WINAPI LoadBitmapA (HINSTANCE, LPCSTR);
 WINUSERAPI HBITMAP WINAPI LoadBitmapW (HINSTANCE, LPCWSTR);
+
+#define LoadCursor __AW_SUFFIXED__(LoadCursor)
 WINUSERAPI HCURSOR WINAPI LoadCursorA (HINSTANCE, LPCSTR);
+WINUSERAPI HCURSOR WINAPI LoadCursorW (HINSTANCE, LPCWSTR);
+
+#define LoadCursorFromFile __AW_SUFFIXED__(LoadCursorFromFile)
 WINUSERAPI HCURSOR WINAPI LoadCursorFromFileA (LPCSTR);
 WINUSERAPI HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR);
-WINUSERAPI HCURSOR WINAPI LoadCursorW (HINSTANCE, LPCWSTR);
+
+#define LoadIcon __AW_SUFFIXED__(LoadIcon)
 WINUSERAPI HICON WINAPI LoadIconA (HINSTANCE, LPCSTR);
 WINUSERAPI HICON WINAPI LoadIconW (HINSTANCE, LPCWSTR);
+
+#define LoadImage __AW_SUFFIXED__(LoadImage)
 WINUSERAPI HANDLE WINAPI LoadImageA (HINSTANCE, LPCSTR, UINT, int, int, UINT);
 WINUSERAPI HANDLE WINAPI LoadImageW (HINSTANCE, LPCWSTR, UINT, int, int, UINT);
+
+#define LoadKeyboardLayout __AW_SUFFIXED__(LoadKeyboardLayout)
 WINUSERAPI HKL WINAPI LoadKeyboardLayoutA (LPCSTR, UINT);
 WINUSERAPI HKL WINAPI LoadKeyboardLayoutW (LPCWSTR, UINT);
+
+#define LoadMenu __AW_SUFFIXED__(LoadMenu)
 WINUSERAPI HMENU WINAPI LoadMenuA (HINSTANCE, LPCSTR);
+WINUSERAPI HMENU WINAPI LoadMenuW (HINSTANCE, LPCWSTR);
+
+#define LoadMenuIndirect __AW_SUFFIXED__(LoadMenuIndirect)
 WINUSERAPI HMENU WINAPI LoadMenuIndirectA (const MENUTEMPLATE *);
 WINUSERAPI HMENU WINAPI LoadMenuIndirectW (const MENUTEMPLATE *);
-WINUSERAPI HMENU WINAPI LoadMenuW (HINSTANCE, LPCWSTR);
+
+#define LoadString __AW_SUFFIXED__(LoadString)
 WINUSERAPI int WINAPI LoadStringA (HINSTANCE, UINT, LPSTR, int);
 WINUSERAPI int WINAPI LoadStringW (HINSTANCE, UINT, LPWSTR, int);
+
 WINUSERAPI BOOL WINAPI LockWindowUpdate (HWND);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
@@ -4238,19 +4489,32 @@ WINUSERAPI BOOL WINAPI LockWorkStation (void);
 WINUSERAPI int WINAPI LookupIconIdFromDirectory (PBYTE, BOOL);
 WINUSERAPI int WINAPI LookupIconIdFromDirectoryEx (PBYTE, BOOL, int, int, UINT);
 WINUSERAPI BOOL WINAPI MapDialogRect (HWND, LPRECT);
+
+#define MapVirtualKey __AW_SUFFIXED__(MapVirtualKey)
 WINUSERAPI UINT WINAPI MapVirtualKeyA (UINT, UINT);
+WINUSERAPI UINT WINAPI MapVirtualKeyW (UINT, UINT);
+
+#define MapVirtualKeyEx __AW_SUFFIXED__(MapVirtualKeyEx)
 WINUSERAPI UINT WINAPI MapVirtualKeyExA (UINT, UINT, HKL);
 WINUSERAPI UINT WINAPI MapVirtualKeyExW (UINT, UINT, HKL);
-WINUSERAPI UINT WINAPI MapVirtualKeyW (UINT, UINT);
+
 WINUSERAPI int WINAPI MapWindowPoints (HWND, HWND, LPPOINT, UINT);
 WINUSERAPI int WINAPI MenuItemFromPoint (HWND, HMENU, POINT);
 WINUSERAPI BOOL WINAPI MessageBeep (UINT);
+
+#define MessageBox __AW_SUFFIXED__(MessageBox)
 WINUSERAPI int WINAPI MessageBoxA (HWND, LPCSTR, LPCSTR, UINT);
 WINUSERAPI int WINAPI MessageBoxW (HWND, LPCWSTR, LPCWSTR, UINT);
+
+#define MessageBoxEx __AW_SUFFIXED__(MessageBoxEx)
 WINUSERAPI int WINAPI MessageBoxExA (HWND, LPCSTR, LPCSTR, UINT, WORD);
 WINUSERAPI int WINAPI MessageBoxExW (HWND, LPCWSTR, LPCWSTR, UINT, WORD);
+
+#define MessageBoxIndirect __AW_SUFFIXED__(MessageBoxIndirect)
 WINUSERAPI int WINAPI MessageBoxIndirectA (CONST MSGBOXPARAMSA *);
 WINUSERAPI int WINAPI MessageBoxIndirectW (CONST MSGBOXPARAMSW *);
+
+#define ModifyMenu __AW_SUFFIXED__(ModifyMenu)
 WINUSERAPI BOOL WINAPI ModifyMenuA (HMENU, UINT, UINT, UINT, LPCSTR);
 WINUSERAPI BOOL WINAPI ModifyMenuW (HMENU, UINT, UINT, UINT, LPCWSTR);
 
@@ -4270,46 +4534,75 @@ WINUSERAPI void WINAPI NotifyWinEvent (DWORD, HWND, LONG, LONG);
 #endif
 
 WINUSERAPI DWORD WINAPI OemKeyScan (WORD);
+
+#define OemToChar __AW_SUFFIXED__(OemToChar)
 WINUSERAPI BOOL WINAPI OemToCharA (LPCSTR, LPSTR);
+WINUSERAPI BOOL WINAPI OemToCharW (LPCSTR, LPWSTR);
+
+#define OemToCharBuff __AW_SUFFIXED__(OemToCharBuff)
 WINUSERAPI BOOL WINAPI OemToCharBuffA (LPCSTR, LPSTR, DWORD);
 WINUSERAPI BOOL WINAPI OemToCharBuffW (LPCSTR, LPWSTR, DWORD);
-WINUSERAPI BOOL WINAPI OemToCharW (LPCSTR, LPWSTR);
+
 WINUSERAPI BOOL WINAPI OffsetRect (LPRECT, int, int);
 WINUSERAPI BOOL WINAPI OpenClipboard (HWND);
+
+#define OpenDesktop __AW_SUFFIXED__(OpenDesktop)
 WINUSERAPI HDESK WINAPI OpenDesktopA (LPSTR, DWORD, BOOL, DWORD);
 WINUSERAPI HDESK WINAPI OpenDesktopW (LPWSTR, DWORD, BOOL, DWORD);
+
 WINUSERAPI BOOL WINAPI OpenIcon (HWND);
 WINUSERAPI HDESK WINAPI OpenInputDesktop (DWORD, BOOL, DWORD);
+
+#define OpenWindowStation __AW_SUFFIXED__(OpenWindowStation)
 WINUSERAPI HWINSTA WINAPI OpenWindowStationA (LPSTR, BOOL, DWORD);
 WINUSERAPI HWINSTA WINAPI OpenWindowStationW (LPWSTR, BOOL, DWORD);
+
 WINUSERAPI BOOL WINAPI PaintDesktop (HDC);
+
+#define PeekMessage __AW_SUFFIXED__(PeekMessage)
 WINUSERAPI BOOL WINAPI PeekMessageA (LPMSG, HWND, UINT, UINT, UINT);
 WINUSERAPI BOOL WINAPI PeekMessageW (LPMSG, HWND, UINT, UINT, UINT);
-#define PostAppMessageA(t, m, w, l) PostThreadMessageA ((DWORD)t, m, w, l)
-#define PostAppMessageW(t, m, w, l) PostThreadMessageW ((DWORD)t, m, w, l)
+
+#define PostAppMessage __AW_SUFFIXED__(PostAppMessage)
+#define PostAppMessageA(t,m,w,l)  PostThreadMessageA ((DWORD)(t), m, w, l)
+#define PostAppMessageW(t,m,w,l)  PostThreadMessageW ((DWORD)(t), m, w, l)
+
+#define PostMessage __AW_SUFFIXED__(PostMessage)
 WINUSERAPI BOOL WINAPI PostMessageA (HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI BOOL WINAPI PostMessageW (HWND, UINT, WPARAM, LPARAM);
-WINUSERAPI void WINAPI PostQuitMessage (int);
+
+#define PostThreadMessage __AW_SUFFIXED__(PostThreadMessage)
 WINUSERAPI BOOL WINAPI PostThreadMessageA (DWORD, UINT, WPARAM, LPARAM);
 WINUSERAPI BOOL WINAPI PostThreadMessageW (DWORD, UINT, WPARAM, LPARAM);
 
+WINUSERAPI void WINAPI PostQuitMessage (int);
+
 #if _WIN32_WINNT >= _WIN32_WINNT_WINXP
 WINUSERAPI BOOL WINAPI PrintWindow (HWND, HDC, UINT);
 #endif
 
 WINUSERAPI BOOL WINAPI PtInRect (LPCRECT, POINT);
+WINUSERAPI BOOL WINAPI RedrawWindow (HWND, LPCRECT, HRGN, UINT);
 WINUSERAPI HWND WINAPI RealChildWindowFromPoint (HWND, POINT);
+
+#define RealGetWindowClass __AW_SUFFIXED__(RealGetWindowClass)
 WINUSERAPI UINT WINAPI RealGetWindowClassA (HWND, LPSTR, UINT);
 WINUSERAPI UINT WINAPI RealGetWindowClassW (HWND, LPWSTR, UINT);
-WINUSERAPI BOOL WINAPI RedrawWindow (HWND, LPCRECT, HRGN, UINT);
+
+#define RegisterClass __AW_SUFFIXED__(RegisterClass)
 WINUSERAPI ATOM WINAPI RegisterClassA (CONST WNDCLASSA *);
 WINUSERAPI ATOM WINAPI RegisterClassW (CONST WNDCLASSW *);
+
+#define RegisterClassEx __AW_SUFFIXED__(RegisterClassEx)
 WINUSERAPI ATOM WINAPI RegisterClassExA (CONST WNDCLASSEXA *);
 WINUSERAPI ATOM WINAPI RegisterClassExW (CONST WNDCLASSEXW *);
+
+#define RegisterClipboardFormat __AW_SUFFIXED__(RegisterClipboardFormat)
 WINUSERAPI UINT WINAPI RegisterClipboardFormatA (LPCSTR);
 WINUSERAPI UINT WINAPI RegisterClipboardFormatW (LPCWSTR);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
+#define RegisterDeviceNotification __AW_SUFFIXED__(RegisterDeviceNotification)
 WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationA (HANDLE, LPVOID, DWORD);
 WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW (HANDLE, LPVOID, DWORD);
 #endif
@@ -4324,18 +4617,25 @@ WINUSERAPI BOOL WINAPI RegisterHotKey (HWND, int, UINT, UINT);
 WINUSERAPI BOOL WINAPI RegisterRawInputDevices (PCRAWINPUTDEVICE, UINT, UINT);
 #endif
 
+#define RegisterWindowMessage __AW_SUFFIXED__(RegisterWindowMessage)
 WINUSERAPI UINT WINAPI RegisterWindowMessageA (LPCSTR);
 WINUSERAPI UINT WINAPI RegisterWindowMessageW (LPCWSTR);
+
 WINUSERAPI BOOL WINAPI ReleaseCapture (void);
 WINUSERAPI int WINAPI ReleaseDC (HWND, HDC);
 WINUSERAPI BOOL WINAPI RemoveMenu (HMENU, UINT, UINT);
+
+#define RemoveProp __AW_SUFFIXED__(RemoveProp)
 WINUSERAPI HANDLE WINAPI RemovePropA (HWND, LPCSTR);
 WINUSERAPI HANDLE WINAPI RemovePropW (HWND, LPCWSTR);
+
 WINUSERAPI BOOL WINAPI ReplyMessage (LRESULT);
 WINUSERAPI BOOL WINAPI ScreenToClient (HWND, LPPOINT);
 WINUSERAPI BOOL WINAPI ScrollDC (HDC, int, int, LPCRECT, LPCRECT, HRGN, LPRECT);
 WINUSERAPI BOOL WINAPI ScrollWindow (HWND, int, int, LPCRECT, LPCRECT);
 WINUSERAPI int WINAPI ScrollWindowEx (HWND, int, int, LPCRECT, LPCRECT, HRGN, LPRECT, UINT);
+
+#define SendDlgItemMessage __AW_SUFFIXED__(SendDlgItemMessage)
 WINUSERAPI LONG WINAPI SendDlgItemMessageA (HWND, int, UINT, WPARAM, LPARAM);
 WINUSERAPI LONG WINAPI SendDlgItemMessageW (HWND, int, UINT, WPARAM, LPARAM);
 
@@ -4347,27 +4647,39 @@ BOOL WINAPI BlockInput(BOOL);
 #endif
 #endif
 
+#define SendMessage __AW_SUFFIXED__(SendMessage)
 WINUSERAPI LRESULT WINAPI SendMessageA (HWND, UINT, WPARAM, LPARAM);
+WINUSERAPI LRESULT WINAPI SendMessageW (HWND, UINT, WPARAM, LPARAM);
+
+#define SendMessageCallback __AW_SUFFIXED__(SendMessageCallback)
 WINUSERAPI BOOL WINAPI SendMessageCallbackA (HWND, UINT, WPARAM, LPARAM, SENDASYNCPROC, DWORD);
 WINUSERAPI BOOL WINAPI SendMessageCallbackW (HWND, UINT, WPARAM, LPARAM, SENDASYNCPROC, DWORD);
+
+#define SendMessageTimeout __AW_SUFFIXED__(SendMessageTimeout)
 WINUSERAPI LRESULT WINAPI SendMessageTimeoutA (HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR);
 WINUSERAPI LRESULT WINAPI SendMessageTimeoutW (HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR);
-WINUSERAPI LRESULT WINAPI SendMessageW (HWND, UINT, WPARAM, LPARAM);
+
+#define SendNotifyMessage __AW_SUFFIXED__(SendNotifyMessage)
 WINUSERAPI BOOL WINAPI SendNotifyMessageA (HWND, UINT, WPARAM, LPARAM);
 WINUSERAPI BOOL WINAPI SendNotifyMessageW (HWND, UINT, WPARAM, LPARAM);
+
 WINUSERAPI HWND WINAPI SetActiveWindow (HWND);
 WINUSERAPI HWND WINAPI SetCapture (HWND hWnd);
 WINUSERAPI BOOL WINAPI SetCaretBlinkTime (UINT);
 WINUSERAPI BOOL WINAPI SetCaretPos (int, int);
+
+#define SetClassLong __AW_SUFFIXED__(SetClassLong)
 WINUSERAPI DWORD WINAPI SetClassLongA (HWND, int, LONG);
 WINUSERAPI DWORD WINAPI SetClassLongW (HWND, int, LONG);
 
 #ifdef _WIN64
+#define SetClassLongPtr __AW_SUFFIXED__(SetClassLongPtr)
 WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrA (HWND, int, LONG_PTR);
 WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrW (HWND, int, LONG_PTR);
 #else
-#define SetClassLongPtrA SetClassLongA
-#define SetClassLongPtrW SetClassLongW
+#define SetClassLongPtr   SetClassLong
+#define SetClassLongPtrA  SetClassLongA
+#define SetClassLongPtrW  SetClassLongW
 #endif
 
 WINUSERAPI WORD WINAPI SetClassWord (HWND, int, WORD);
@@ -4377,8 +4689,11 @@ WINUSERAPI HCURSOR WINAPI SetCursor (HCURSOR);
 WINUSERAPI BOOL WINAPI SetCursorPos (int, int);
 WINUSERAPI VOID WINAPI SetDebugErrorLevel (DWORD);
 WINUSERAPI BOOL WINAPI SetDlgItemInt (HWND, int, UINT, BOOL);
+
+#define SetDlgItemText __AW_SUFFIXED__(SetDlgItemText)
 WINUSERAPI BOOL WINAPI SetDlgItemTextA (HWND, int, LPCSTR);
 WINUSERAPI BOOL WINAPI SetDlgItemTextW (HWND, int, LPCWSTR);
+
 WINUSERAPI BOOL WINAPI SetDoubleClickTime (UINT);
 WINUSERAPI HWND WINAPI SetFocus (HWND);
 WINUSERAPI BOOL WINAPI SetForegroundWindow (HWND);
@@ -4388,8 +4703,11 @@ WINUSERAPI BOOL WINAPI SetMenuContextHelpId (HMENU, DWORD);
 WINUSERAPI BOOL WINAPI SetMenuDefaultItem (HMENU, UINT, UINT);
 WINUSERAPI BOOL WINAPI SetMenuInfo (HMENU, LPCMENUINFO);
 WINUSERAPI BOOL WINAPI SetMenuItemBitmaps (HMENU, UINT, UINT, HBITMAP, HBITMAP);
+
+#define SetMenuItemInfo __AW_SUFFIXED__(SetMenuItemInfo)
 WINUSERAPI BOOL WINAPI SetMenuItemInfoA (HMENU, UINT, BOOL, LPCMENUITEMINFOA);
 WINUSERAPI BOOL WINAPI SetMenuItemInfoW ( HMENU, UINT, BOOL, LPCMENUITEMINFOW);
+
 WINUSERAPI LPARAM WINAPI SetMessageExtraInfo (LPARAM);
 WINUSERAPI BOOL WINAPI SetMessageQueue (int);
 WINUSERAPI HWND WINAPI SetParent (HWND, HWND);
@@ -4399,47 +4717,68 @@ WINUSERAPI BOOL WINAPI SetProcessDefaultLayout (DWORD);
 #endif	/* >= _WIN32_WINNT_WIN2K */
 
 WINUSERAPI BOOL WINAPI SetProcessWindowStation (HWINSTA);
+
+#define SetProp __AW_SUFFIXED__(SetProp)
 WINUSERAPI BOOL WINAPI SetPropA (HWND, LPCSTR, HANDLE);
 WINUSERAPI BOOL WINAPI SetPropW (HWND, LPCWSTR, HANDLE);
+
 WINUSERAPI BOOL WINAPI SetRect (LPRECT, int, int, int, int);
 WINUSERAPI BOOL WINAPI SetRectEmpty (LPRECT);
 WINUSERAPI int WINAPI SetScrollInfo (HWND, int, LPCSCROLLINFO, BOOL);
 WINUSERAPI int WINAPI SetScrollPos (HWND, int, int, BOOL);
 WINUSERAPI BOOL WINAPI SetScrollRange (HWND, int, int, int, BOOL);
 WINUSERAPI BOOL WINAPI SetSysColors (int, const INT *, const COLORREF *);
+
 #define SetSysModalWindow(h) (NULL)
+
 WINUSERAPI BOOL WINAPI SetSystemCursor (HCURSOR, DWORD);
 WINUSERAPI BOOL WINAPI SetThreadDesktop (HDESK);
 WINUSERAPI UINT WINAPI SetTimer (HWND, UINT_PTR, UINT, TIMERPROC);
+
+#define SetUserObjectInformation __AW_SUFFIXED__(SetUserObjectInformation)
 WINUSERAPI BOOL WINAPI SetUserObjectInformationA (HANDLE, int, PVOID, DWORD);
 WINUSERAPI BOOL WINAPI SetUserObjectInformationW (HANDLE, int, PVOID, DWORD);
-WINUSERAPI BOOL WINAPI SetUserObjectSecurity (HANDLE, PSECURITY_INFORMATION, PSECURITY_DESCRIPTOR);
+
+WINUSERAPI BOOL WINAPI SetUserObjectSecurity
+(HANDLE, PSECURITY_INFORMATION, PSECURITY_DESCRIPTOR);
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI HWINEVENTHOOK WINAPI SetWinEventHook (UINT, UINT, HMODULE, WINEVENTPROC, DWORD, DWORD, UINT);
+WINUSERAPI HWINEVENTHOOK WINAPI SetWinEventHook
+(UINT, UINT, HMODULE, WINEVENTPROC, DWORD, DWORD, UINT);
 #endif
 
 WINUSERAPI BOOL WINAPI SetWindowContextHelpId (HWND, DWORD);
+
+#define SetWindowLong __AW_SUFFIXED__(SetWindowLong)
 WINUSERAPI LONG WINAPI SetWindowLongA (HWND, int, LONG);
 WINUSERAPI LONG WINAPI SetWindowLongW (HWND, int, LONG);
 
 #ifdef _WIN64
+#define SetWindowLongPtr __AW_SUFFIXED__(SetWindowLongPtr)
 WINUSERAPI LONG_PTR WINAPI SetWindowLongPtrA (HWND, int, LONG_PTR);
 WINUSERAPI LONG_PTR WINAPI SetWindowLongPtrW (HWND, int, LONG_PTR);
 #else
-#define SetWindowLongPtrA SetWindowLongA
-#define SetWindowLongPtrW SetWindowLongW
+#define SetWindowLongPtr   SetWindowLong
+#define SetWindowLongPtrA  SetWindowLongA
+#define SetWindowLongPtrW  SetWindowLongW
 #endif
 
 WINUSERAPI BOOL WINAPI SetWindowPlacement (HWND hWnd, const WINDOWPLACEMENT *);
 WINUSERAPI BOOL WINAPI SetWindowPos (HWND, HWND, int, int, int, int, UINT);
 WINUSERAPI int WINAPI SetWindowRgn (HWND, HRGN, BOOL);
+
+#define SetWindowsHook __AW_SUFFIXED__(SetWindowsHook)
 WINUSERAPI HHOOK WINAPI SetWindowsHookA (int, HOOKPROC);
 WINUSERAPI HHOOK WINAPI SetWindowsHookW (int, HOOKPROC);
+
+#define SetWindowsHookEx __AW_SUFFIXED__(SetWindowsHookEx)
 WINUSERAPI HHOOK WINAPI SetWindowsHookExA (int, HOOKPROC, HINSTANCE, DWORD);
 WINUSERAPI HHOOK WINAPI SetWindowsHookExW (int, HOOKPROC, HINSTANCE, DWORD);
+
+#define SetWindowText __AW_SUFFIXED__(SetWindowText)
 WINUSERAPI BOOL WINAPI SetWindowTextA (HWND, LPCSTR);
 WINUSERAPI BOOL WINAPI SetWindowTextW (HWND, LPCWSTR);
+
 WINUSERAPI WORD WINAPI SetWindowWord (HWND, int, WORD);
 WINUSERAPI BOOL WINAPI ShowCaret (HWND);
 WINUSERAPI int WINAPI ShowCursor (BOOL);
@@ -4455,10 +4794,14 @@ WINUSERAPI BOOL WINAPI SwitchDesktop (HDESK);
 WINUSERAPI VOID WINAPI SwitchToThisWindow (HWND, BOOL);
 #endif	/* >= _WIN32_WINNT_WIN2K */
 
+#define SystemParametersInfo __AW_SUFFIXED__(SystemParametersInfo)
 WINUSERAPI BOOL WINAPI SystemParametersInfoA (UINT, UINT, PVOID, UINT);
 WINUSERAPI BOOL WINAPI SystemParametersInfoW (UINT, UINT, PVOID, UINT);
+
+#define TabbedTextOut __AW_SUFFIXED__(TabbedTextOut)
 WINUSERAPI LONG WINAPI TabbedTextOutA (HDC, int, int, LPCSTR, int, int, LPINT, int);
 WINUSERAPI LONG WINAPI TabbedTextOutW (HDC, int, int, LPCWSTR, int, int, LPINT, int);
+
 WINUSERAPI WORD WINAPI TileWindows (HWND, UINT, LPCRECT, UINT, const HWND *);
 WINUSERAPI int WINAPI ToAscii (UINT, UINT, PBYTE, LPWORD, UINT);
 WINUSERAPI int WINAPI ToAsciiEx (UINT, UINT, PBYTE, LPWORD, UINT, HKL);
@@ -4467,8 +4810,11 @@ WINUSERAPI int WINAPI ToUnicodeEx (UINT, UINT, PBYTE, LPWSTR, int, UINT, HKL);
 WINUSERAPI BOOL WINAPI TrackMouseEvent (LPTRACKMOUSEEVENT);
 WINUSERAPI BOOL WINAPI TrackPopupMenu (HMENU, UINT, int, int, int, HWND, LPCRECT);
 WINUSERAPI BOOL WINAPI TrackPopupMenuEx (HMENU, UINT, int, int, HWND, LPTPMPARAMS);
+
+#define TranslateAccelerator __AW_SUFFIXED__(TranslateAccelerator)
 WINUSERAPI int WINAPI TranslateAcceleratorA (HWND, HACCEL, LPMSG);
 WINUSERAPI int WINAPI TranslateAcceleratorW (HWND, HACCEL, LPMSG);
+
 WINUSERAPI BOOL WINAPI TranslateMDISysAccel (HWND, LPMSG);
 WINUSERAPI BOOL WINAPI TranslateMessage (const MSG *);
 WINUSERAPI BOOL WINAPI UnhookWindowsHook (int, HOOKPROC);
@@ -4480,6 +4826,8 @@ WINUSERAPI BOOL WINAPI UnhookWinEvent (HWINEVENTHOOK);
 
 WINUSERAPI BOOL WINAPI UnionRect (LPRECT, LPCRECT, LPCRECT);
 WINUSERAPI BOOL WINAPI UnloadKeyboardLayout (HKL);
+
+#define UnregisterClass __AW_SUFFIXED__(UnregisterClass)
 WINUSERAPI BOOL WINAPI UnregisterClassA (LPCSTR, HINSTANCE);
 WINUSERAPI BOOL WINAPI UnregisterClassW (LPCWSTR, HINSTANCE);
 
@@ -4500,19 +4848,30 @@ WINUSERAPI BOOL WINAPI UserHandleGrantAccess (HANDLE, HANDLE, BOOL);
 
 WINUSERAPI BOOL WINAPI ValidateRect (HWND, LPCRECT);
 WINUSERAPI BOOL WINAPI ValidateRgn (HWND, HRGN);
+
+#define VkKeyScan __AW_SUFFIXED__(VkKeyScan)
 WINUSERAPI SHORT WINAPI VkKeyScanA (CHAR);
+WINUSERAPI SHORT WINAPI VkKeyScanW (WCHAR);
+
+#define VkKeyScanEx __AW_SUFFIXED__(VkKeyScanEx)
 WINUSERAPI SHORT WINAPI VkKeyScanExA (CHAR, HKL);
 WINUSERAPI SHORT WINAPI VkKeyScanExW (WCHAR, HKL);
-WINUSERAPI SHORT WINAPI VkKeyScanW (WCHAR);
+
 WINUSERAPI DWORD WINAPI WaitForInputIdle (HANDLE, DWORD);
 WINUSERAPI BOOL WINAPI WaitMessage (void);
 WINUSERAPI HWND WINAPI WindowFromDC (HDC hDC);
 WINUSERAPI HWND WINAPI WindowFromPoint (POINT);
 WINUSERAPI UINT WINAPI WinExec (LPCSTR, UINT);
+
+#define WinHelp __AW_SUFFIXED__(WinHelp)
 WINUSERAPI BOOL WINAPI WinHelpA (HWND, LPCSTR, UINT, DWORD);
 WINUSERAPI BOOL WINAPI WinHelpW (HWND, LPCWSTR, UINT, DWORD);
+
+#define wsprintf __AW_SUFFIXED__(wsprintf)
 WINUSERAPI int WINAPIV wsprintfA (LPSTR, LPCSTR,...);
 WINUSERAPI int WINAPIV wsprintfW (LPWSTR, LPCWSTR,...);
+
+#define wvsprintf __AW_SUFFIXED__(wvsprintf)
 WINUSERAPI int WINAPI wvsprintfA (LPSTR, LPCSTR, va_list arglist);
 WINUSERAPI int WINAPI wvsprintfW (LPWSTR, LPCWSTR, va_list arglist);
 
@@ -4525,8 +4884,9 @@ WINUSERAPI BOOL WINAPI LockSetForegroundWindow (UINT);
 WINUSERAPI BOOL WINAPI SetLayeredWindowAttributes (HWND, COLORREF, BYTE, DWORD);
 
 #ifndef NOGDI
-WINUSERAPI BOOL WINAPI UpdateLayeredWindow (HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD);
-#endif
+WINUSERAPI BOOL WINAPI UpdateLayeredWindow
+(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD);
+#endif	/* ! NOGDI */
 #endif
 
 #if _WIN32_WINNT >= _WIN32_WINNT_WINXP
@@ -4541,343 +4901,6 @@ BOOL WINAPI RegisterTouchWindow (HWND hWnd, ULONG ulFlags);
 BOOL WINAPI UnregisterTouchWindow (HWND hWnd);
 #endif
 
-#ifdef UNICODE
-#define EDITWORDBREAKPROC	EDITWORDBREAKPROCW
-#define PROPENUMPROC		PROPENUMPROCW
-#define PROPENUMPROCEX		PROPENUMPROCEXW
-#define DEKSTOPENUMPROC 	DEKSTOPENUMPROCW
-#define WINSTAENUMPROC		WINSTAENUMPROCW
-#define PROPENUMPROC		PROPENUMPROCW
-#define PROPENUMPROCEX		PROPENUMPROCEXW
-#define MAKEINTRESOURCE 	MAKEINTRESOURCEW
-
-typedef WNDCLASSW WNDCLASS, *LPWNDCLASS, *PWNDCLASS;
-typedef WNDCLASSEXW WNDCLASSEX, *LPWNDCLASSEX, *PWNDCLASSEX;
-typedef MENUITEMINFOW MENUITEMINFO, *LPMENUITEMINFO;
-typedef LPCMENUITEMINFOW LPCMENUITEMINFO;
-typedef MSGBOXPARAMSW MSGBOXPARAMS, *PMSGBOXPARAMS, *LPMSGBOXPARAMS;
-typedef HIGHCONTRASTW HIGHCONTRAST, *LPHIGHCONTRAST;
-typedef SERIALKEYSW SERIALKEYS, *LPSERIALKEYS;
-typedef SOUNDSENTRYW SOUNDSENTRY, *LPSOUNDSENTRY;
-typedef CREATESTRUCTW CREATESTRUCT, *LPCREATESTRUCT;
-typedef CBT_CREATEWNDW CBT_CREATEWND, *LPCBT_CREATEWND;
-typedef MDICREATESTRUCTW MDICREATESTRUCT, *LPMDICREATESTRUCT;
-typedef MULTIKEYHELPW MULTIKEYHELP, *PMULTIKEYHELP, *LPMULTIKEYHELP;
-typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
-
-#define AppendMenu AppendMenuW
-#define BroadcastSystemMessage BroadcastSystemMessageW
-#define BroadcastSystemMessageEx BroadcastSystemMessageExW
-#define CallMsgFilter CallMsgFilterW
-#define CallWindowProc CallWindowProcW
-#define ChangeMenu ChangeMenuW
-#define CharLower CharLowerW
-#define CharLowerBuff CharLowerBuffW
-#define CharNext CharNextW
-#define CharPrev CharPrevW
-#define CharToOem CharToOemW
-#define CharToOemBuff CharToOemBuffW
-#define CharUpper CharUpperW
-#define CharUpperBuff CharUpperBuffW
-#define CopyAcceleratorTable CopyAcceleratorTableW
-#define CreateAcceleratorTable CreateAcceleratorTableW
-#define CreateDialog CreateDialogW
-#define CreateDialogIndirect CreateDialogIndirectW
-#define CreateDialogIndirectParam CreateDialogIndirectParamW
-#define CreateDialogParam CreateDialogParamW
-#define CreateMDIWindow CreateMDIWindowW
-#define CreateWindow CreateWindowW
-#define CreateWindowEx CreateWindowExW
-#define CreateWindowStation CreateWindowStationW
-#define DefDlgProc DefDlgProcW
-#define DefFrameProc DefFrameProcW
-#define DefMDIChildProc DefMDIChildProcW
-#define DefWindowProc DefWindowProcW
-#define DialogBox DialogBoxW
-#define DialogBoxIndirect DialogBoxIndirectW
-#define DialogBoxIndirectParam DialogBoxIndirectParamW
-#define DialogBoxParam DialogBoxParamW
-#define DispatchMessage DispatchMessageW
-#define DlgDirList DlgDirListW
-#define DlgDirListComboBox DlgDirListComboBoxW
-#define DlgDirSelectComboBoxEx DlgDirSelectComboBoxExW
-#define DlgDirSelectEx DlgDirSelectExW
-#define DrawState DrawStateW
-#define DrawText DrawTextW
-#define DrawTextEx DrawTextExW
-#define EnumDesktops EnumDesktopsW
-#define EnumProps EnumPropsW
-#define EnumPropsEx EnumPropsExW
-#define EnumWindowStations EnumWindowStationsW
-#define FindWindow FindWindowW
-#define FindWindowEx FindWindowExW
-#define GetClassInfo GetClassInfoW
-#define GetClassInfoEx GetClassInfoExW
-#define GetClassLong GetClassLongW
-#define GetClassLongPtr GetClassLongPtrW
-#define GetClassName GetClassNameW
-#define GetClipboardFormatName GetClipboardFormatNameW
-#define GetDlgItemText GetDlgItemTextW
-#define GetKeyboardLayoutName GetKeyboardLayoutNameW
-#define GetKeyNameText GetKeyNameTextW
-#define GetMenuItemInfo GetMenuItemInfoW
-#define GetMenuString GetMenuStringW
-#define GetMessage GetMessageW
-#define GetMonitorInfo GetMonitorInfoW
-#define GetProp GetPropW
-#define GetRawInputDeviceInfo GetRawInputDeviceInfoW
-#define GetTabbedTextExtent GetTabbedTextExtentW
-#define GetUserObjectInformation GetUserObjectInformationW
-#define GetWindowLong GetWindowLongW
-#define GetWindowLongPtr GetWindowLongPtrW
-#define GetWindowText GetWindowTextW
-#define GetWindowTextLength GetWindowTextLengthW
-#define GetAltTabInfo GetAltTabInfoW
-#define GetWindowModuleFileName GetWindowModuleFileNameW
-#define GrayString GrayStringW
-#define InsertMenu InsertMenuW
-#define InsertMenuItem InsertMenuItemW
-#define IsCharAlpha IsCharAlphaW
-#define IsCharAlphaNumeric IsCharAlphaNumericW
-#define IsCharLower IsCharLowerW
-#define IsCharUpper IsCharUpperW
-#define IsDialogMessage IsDialogMessageW
-#define LoadAccelerators LoadAcceleratorsW
-#define LoadBitmap LoadBitmapW
-#define LoadCursor LoadCursorW
-#define LoadCursorFromFile LoadCursorFromFileW
-#define LoadIcon LoadIconW
-#define LoadImage LoadImageW
-#define LoadKeyboardLayout LoadKeyboardLayoutW
-#define LoadMenu LoadMenuW
-#define LoadMenuIndirect LoadMenuIndirectW
-#define LoadString LoadStringW
-#define MapVirtualKey MapVirtualKeyW
-#define MapVirtualKeyEx MapVirtualKeyExW
-#define MessageBox MessageBoxW
-#define MessageBoxEx MessageBoxExW
-#define MessageBoxIndirect MessageBoxIndirectW
-#define ModifyMenu ModifyMenuW
-#define OemToChar OemToCharW
-#define OemToCharBuff OemToCharBuffW
-#define OpenDesktop OpenDesktopW
-#define OpenWindowStation OpenWindowStationW
-#define PeekMessage PeekMessageW
-#define PostAppMessage PostAppMessageW
-#define PostMessage PostMessageW
-#define PostThreadMessage PostThreadMessageW
-#define RealGetWindowClass RealGetWindowClassW
-#define RegisterClass RegisterClassW
-#define RegisterClassEx RegisterClassExW
-#define RegisterClipboardFormat RegisterClipboardFormatW
-#define RegisterDeviceNotification RegisterDeviceNotificationW
-#define RegisterWindowMessage RegisterWindowMessageW
-#define RemoveProp RemovePropW
-#define SendDlgItemMessage SendDlgItemMessageW
-#define SendMessage SendMessageW
-#define SendMessageCallback SendMessageCallbackW
-#define SendMessageTimeout SendMessageTimeoutW
-#define SendNotifyMessage SendNotifyMessageW
-#define SetClassLong SetClassLongW
-#define SetClassLongPtr SetClassLongPtrW
-#define SetDlgItemText SetDlgItemTextW
-#define SetMenuItemInfo SetMenuItemInfoW
-#define SetProp SetPropW
-#define SetUserObjectInformation SetUserObjectInformationW
-#define SetWindowLong SetWindowLongW
-#define SetWindowLongPtr SetWindowLongPtrW
-#define SetWindowsHook SetWindowsHookW
-#define SetWindowsHookEx SetWindowsHookExW
-#define SetWindowText SetWindowTextW
-#define SystemParametersInfo SystemParametersInfoW
-#define TabbedTextOut TabbedTextOutW
-#define TranslateAccelerator TranslateAcceleratorW
-#define UnregisterClass UnregisterClassW
-#define VkKeyScan VkKeyScanW
-#define VkKeyScanEx VkKeyScanExW
-#define WinHelp WinHelpW
-#define wsprintf wsprintfW
-#define wvsprintf wvsprintfW
-
-#ifndef NOGDI
-typedef ICONMETRICSW ICONMETRICS, *LPICONMETRICS;
-typedef NONCLIENTMETRICSW NONCLIENTMETRICS, *LPNONCLIENTMETRICS;
-#define ChangeDisplaySettings ChangeDisplaySettingsW
-#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
-#define CreateDesktop CreateDesktopW
-#define EnumDisplaySettings EnumDisplaySettingsW
-#define EnumDisplaySettingsEx EnumDisplaySettingsExW
-#define EnumDisplayDevices EnumDisplayDevicesW
-#endif	/* NOGDI */
-
-#else	/* UNICODE */
-#define EDITWORDBREAKPROC	EDITWORDBREAKPROCA
-#define PROPENUMPROC		PROPENUMPROCA
-#define PROPENUMPROCEX		PROPENUMPROCEXA
-#define DEKSTOPENUMPROC 	DEKSTOPENUMPROCA
-#define WINSTAENUMPROC		WINSTAENUMPROCA
-#define PROPENUMPROC		PROPENUMPROCA
-#define PROPENUMPROCEX		PROPENUMPROCEXA
-#define MAKEINTRESOURCE 	MAKEINTRESOURCEA
-
-typedef WNDCLASSA WNDCLASS, *LPWNDCLASS, *PWNDCLASS;
-typedef WNDCLASSEXA WNDCLASSEX, *LPWNDCLASSEX, *PWNDCLASSEX;
-typedef MENUITEMINFOA MENUITEMINFO, *LPMENUITEMINFO;
-typedef LPCMENUITEMINFOA LPCMENUITEMINFO;
-typedef MSGBOXPARAMSA MSGBOXPARAMS, *PMSGBOXPARAMS, *LPMSGBOXPARAMS;
-typedef HIGHCONTRASTA HIGHCONTRAST, *LPHIGHCONTRAST;
-typedef SERIALKEYSA SERIALKEYS, *LPSERIALKEYS;
-typedef SOUNDSENTRYA SOUNDSENTRY, *LPSOUNDSENTRY;
-typedef CREATESTRUCTA CREATESTRUCT, *LPCREATESTRUCT;
-typedef CBT_CREATEWNDA CBT_CREATEWND, *LPCBT_CREATEWND;
-typedef MDICREATESTRUCTA MDICREATESTRUCT, *LPMDICREATESTRUCT;
-typedef MULTIKEYHELPA MULTIKEYHELP, *PMULTIKEYHELP, *LPMULTIKEYHELP;
-typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
-#define AppendMenu AppendMenuA
-#define BroadcastSystemMessage BroadcastSystemMessageA
-#define BroadcastSystemMessageEx BroadcastSystemMessageExA
-#define CallMsgFilter CallMsgFilterA
-#define CallWindowProc CallWindowProcA
-#define ChangeMenu ChangeMenuA
-#define CharLower CharLowerA
-#define CharLowerBuff CharLowerBuffA
-#define CharNext CharNextA
-#define CharPrev CharPrevA
-#define CharToOem CharToOemA
-#define CharToOemBuff CharToOemBuffA
-#define CharUpper CharUpperA
-#define CharUpperBuff CharUpperBuffA
-#define CopyAcceleratorTable CopyAcceleratorTableA
-#define CreateAcceleratorTable CreateAcceleratorTableA
-#define CreateDialog CreateDialogA
-#define CreateDialogIndirect CreateDialogIndirectA
-#define CreateDialogIndirectParam CreateDialogIndirectParamA
-#define CreateDialogParam CreateDialogParamA
-#define CreateMDIWindow CreateMDIWindowA
-#define CreateWindow CreateWindowA
-#define CreateWindowEx CreateWindowExA
-#define CreateWindowStation CreateWindowStationA
-#define DefDlgProc DefDlgProcA
-#define DefFrameProc DefFrameProcA
-#define DefMDIChildProc DefMDIChildProcA
-#define DefWindowProc DefWindowProcA
-#define DialogBox DialogBoxA
-#define DialogBoxIndirect DialogBoxIndirectA
-#define DialogBoxIndirectParam DialogBoxIndirectParamA
-#define DialogBoxParam DialogBoxParamA
-#define DispatchMessage DispatchMessageA
-#define DlgDirList DlgDirListA
-#define DlgDirListComboBox DlgDirListComboBoxA
-#define DlgDirSelectComboBoxEx DlgDirSelectComboBoxExA
-#define DlgDirSelectEx DlgDirSelectExA
-#define DrawState DrawStateA
-#define DrawText DrawTextA
-#define DrawTextEx DrawTextExA
-#define EnumDesktops EnumDesktopsA
-#define EnumProps EnumPropsA
-#define EnumPropsEx EnumPropsExA
-#define EnumWindowStations EnumWindowStationsA
-#define FindWindow FindWindowA
-#define FindWindowEx FindWindowExA
-#define GetClassInfo GetClassInfoA
-#define GetClassInfoEx GetClassInfoExA
-#define GetClassLong GetClassLongA
-#define GetClassLongPtr GetClassLongPtrA
-#define GetClassName GetClassNameA
-#define GetClipboardFormatName GetClipboardFormatNameA
-#define GetDlgItemText GetDlgItemTextA
-#define GetKeyboardLayoutName GetKeyboardLayoutNameA
-#define GetKeyNameText GetKeyNameTextA
-#define GetMenuItemInfo GetMenuItemInfoA
-#define GetMenuString GetMenuStringA
-#define GetMessage GetMessageA
-#define GetMonitorInfo GetMonitorInfoA
-#define GetProp GetPropA
-#define GetRawInputDeviceInfo GetRawInputDeviceInfoA
-#define GetTabbedTextExtent GetTabbedTextExtentA
-#define GetUserObjectInformation GetUserObjectInformationA
-#define GetWindowLong GetWindowLongA
-#define GetWindowLongPtr GetWindowLongPtrA
-#define GetWindowText GetWindowTextA
-#define GetWindowTextLength GetWindowTextLengthA
-#define GetAltTabInfo GetAltTabInfoA
-#define GetWindowModuleFileName GetWindowModuleFileNameA
-#define GrayString GrayStringA
-#define InsertMenu InsertMenuA
-#define InsertMenuItem InsertMenuItemA
-#define IsCharAlpha IsCharAlphaA
-#define IsCharAlphaNumeric IsCharAlphaNumericA
-#define IsCharLower IsCharLowerA
-#define IsCharUpper IsCharUpperA
-#define IsDialogMessage IsDialogMessageA
-#define LoadAccelerators LoadAcceleratorsA
-#define LoadBitmap LoadBitmapA
-#define LoadCursor LoadCursorA
-#define LoadIcon LoadIconA
-#define LoadCursorFromFile LoadCursorFromFileA
-#define LoadImage LoadImageA
-#define LoadKeyboardLayout LoadKeyboardLayoutA
-#define LoadMenu LoadMenuA
-#define LoadMenuIndirect LoadMenuIndirectA
-#define LoadString LoadStringA
-#define MapVirtualKey MapVirtualKeyA
-#define MapVirtualKeyEx MapVirtualKeyExA
-#define MessageBox MessageBoxA
-#define MessageBoxEx MessageBoxExA
-#define MessageBoxIndirect MessageBoxIndirectA
-#define ModifyMenu ModifyMenuA
-#define OemToChar OemToCharA
-#define OemToCharBuff OemToCharBuffA
-#define OpenDesktop OpenDesktopA
-#define OpenWindowStation OpenWindowStationA
-#define PeekMessage PeekMessageA
-#define PostAppMessage PostAppMessageA
-#define PostMessage PostMessageA
-#define PostThreadMessage PostThreadMessageA
-#define RealGetWindowClass RealGetWindowClassA
-#define RegisterClass RegisterClassA
-#define RegisterClassEx RegisterClassExA
-#define RegisterClipboardFormat RegisterClipboardFormatA
-#define RegisterDeviceNotification RegisterDeviceNotificationA
-#define RegisterWindowMessage RegisterWindowMessageA
-#define RemoveProp RemovePropA
-#define SendDlgItemMessage SendDlgItemMessageA
-#define SendMessage SendMessageA
-#define SendMessageCallback SendMessageCallbackA
-#define SendMessageTimeout SendMessageTimeoutA
-#define SendNotifyMessage SendNotifyMessageA
-#define SetClassLong SetClassLongA
-#define SetClassLongPtr SetClassLongPtrA
-#define SetDlgItemText SetDlgItemTextA
-#define SetMenuItemInfo SetMenuItemInfoA
-#define SetProp SetPropA
-#define SetUserObjectInformation SetUserObjectInformationA
-#define SetWindowLong SetWindowLongA
-#define SetWindowLongPtr SetWindowLongPtrA
-#define SetWindowsHook SetWindowsHookA
-#define SetWindowsHookEx SetWindowsHookExA
-#define SetWindowText SetWindowTextA
-#define SystemParametersInfo SystemParametersInfoA
-#define TabbedTextOut TabbedTextOutA
-#define TranslateAccelerator TranslateAcceleratorA
-#define UnregisterClass UnregisterClassA
-#define VkKeyScan VkKeyScanA
-#define VkKeyScanEx VkKeyScanExA
-#define WinHelp WinHelpA
-#define wsprintf wsprintfA
-#define wvsprintf wvsprintfA
-
-#ifndef NOGDI
-typedef ICONMETRICSA  ICONMETRICS, *LPICONMETRICS;
-typedef NONCLIENTMETRICSA  NONCLIENTMETRICS, *LPNONCLIENTMETRICS;
-#define ChangeDisplaySettings ChangeDisplaySettingsA
-#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
-#define CreateDesktop CreateDesktopA
-#define EnumDisplaySettings EnumDisplaySettingsA
-#define EnumDisplaySettingsEx EnumDisplaySettingsExA
-#define EnumDisplayDevices EnumDisplayDevicesA
-#endif	/* NOGDI */
-#endif	/* UNICODE */
 #endif	/* RC_INVOKED */
 
 _END_C_DECLS