cryptnet: Check CRL with verify time in CertDllVerifyRevocation.
[wine] / include / winuser.h
index 9a242c2..9707b2c 100644 (file)
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #ifndef _WINUSER_
 #define _WINUSER_
 
+#if !defined(_USER32_)
+#define WINUSERAPI DECLSPEC_IMPORT
+#else
+#define WINUSERAPI
+#endif
+
 #ifndef RC_INVOKED
 #include <stdarg.h>
 #endif
@@ -40,8 +46,8 @@ 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 BOOL    (CALLBACK *PROPENUMPROCEXA)(HWND,LPSTR,HANDLE,ULONG_PTR);
+typedef BOOL    (CALLBACK *PROPENUMPROCEXW)(HWND,LPWSTR,HANDLE,ULONG_PTR);
 typedef VOID    (CALLBACK *SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT);
 typedef VOID    (CALLBACK *TIMERPROC)(HWND,UINT,UINT_PTR,DWORD);
 typedef VOID    (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,
@@ -98,6 +104,36 @@ typedef struct tagUSEROBJECTFLAGS {
     DWORD dwFlags;
 } USEROBJECTFLAGS, *PUSEROBJECTFLAGS;
 
+typedef struct tagBSMINFO {
+    UINT  cbSize;
+    HDESK hdesk;
+    HWND  hwnd;
+    LUID  luid;
+} BSMINFO, *PBSMINFO;
+
+/* Window stations */
+#define WINSTA_ENUMDESKTOPS         0x0001
+#define WINSTA_READATTRIBUTES       0x0002
+#define WINSTA_ACCESSCLIPBOARD      0x0004
+#define WINSTA_CREATEDESKTOP        0x0008
+#define WINSTA_WRITEATTRIBUTES      0x0010
+#define WINSTA_ACCESSGLOBALATOMS    0x0020
+#define WINSTA_EXITWINDOWS          0x0040
+#define WINSTA_ENUMERATE            0x0100
+#define WINSTA_READSCREEN           0x0200
+#define WINSTA_ALL_ACCESS           0x037f
+
+/* Desktops */
+#define DESKTOP_READOBJECTS         0x0001
+#define DESKTOP_CREATEWINDOW        0x0002
+#define DESKTOP_CREATEMENU          0x0004
+#define DESKTOP_HOOKCONTROL         0x0008
+#define DESKTOP_JOURNALRECORD       0x0010
+#define DESKTOP_JOURNALPLAYBACK     0x0020
+#define DESKTOP_ENUMERATE           0x0040
+#define DESKTOP_WRITEOBJECTS        0x0080
+#define DESKTOP_SWITCHDESKTOP       0x0100
+
 
 /* flags for FILTERKEYS dwFlags field */
 #define FKF_AVAILABLE       0x00000002
@@ -152,6 +188,17 @@ typedef struct tagMOUSEKEYS
     DWORD   dwReserved2;
 } MOUSEKEYS, *LPMOUSEKEYS;
 
+/* struct and defines for GetMouseMovePointsEx */
+#define GMMP_USE_DISPLAY_POINTS 1
+#define GMMP_USE_HIGH_RESOLUTION_POINTS 2
+
+typedef struct tagMOUSEMOVEPOINT {
+    int x;
+    int y;
+    DWORD time;
+    ULONG_PTR dwExtraInfo;
+} MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT;
+
 /* flags for STICKYKEYS dwFlags field */
 #define SKF_AUDIBLEFEEDBACK 0x00000040
 #define SKF_AVAILABLE       0x00000002
@@ -289,7 +336,7 @@ typedef struct tagHIGHCONTRASTW
 DECL_WINELIB_TYPE_AW(HIGHCONTRAST)
 DECL_WINELIB_TYPE_AW(LPHIGHCONTRAST)
 
-typedef struct
+typedef struct tagEVENTMSG
 {
     UINT  message;
     UINT  paramL;
@@ -349,7 +396,7 @@ typedef struct
 
   /* Debug hook structure */
 
-typedef struct
+typedef struct tagDEBUGHOOKINFO
 {
     DWORD       idThread;
     DWORD       idThreadInstaller;
@@ -414,6 +461,101 @@ typedef struct tagINPUT
     } DUMMYUNIONNAME;
 } INPUT, *PINPUT, *LPINPUT;
 
+DECLARE_HANDLE(HRAWINPUT);
+
+typedef struct tagRAWINPUTDEVICELIST
+{
+    HANDLE hDevice;
+    DWORD dwType;
+} RAWINPUTDEVICELIST, *PRAWINPUTDEVICELIST;
+
+typedef struct tagRAWHID {
+    DWORD dwSizeHid;
+    DWORD dwCount;
+    BYTE bRawData;
+} RAWHID, *LPRAWHID;
+
+typedef struct tagRAWKEYBOARD {
+    USHORT MakeCode;
+    USHORT Flags;
+    USHORT Reserved;
+    USHORT VKey;
+    UINT Message;
+    ULONG ExtraInformation;
+} RAWKEYBOARD, *PRAWKEYBOARD, *LPRAWKEYBOARD;
+
+typedef struct tagRAWMOUSE {
+    USHORT usFlags;
+    union {
+        ULONG ulButtons;
+        struct {
+            USHORT usButtonFlags;
+            USHORT usButtonData;
+        } DUMMYSTRUCTNAME;
+    } DUMMYUNIONNAME;
+    ULONG ulRawButtons;
+    LONG  lLastX;
+    LONG  lLastY;
+    ULONG ulExtraInformation;
+} RAWMOUSE, *PRAWMOUSE, *LPRAWMOUSE;
+
+typedef struct tagRAWINPUTHEADER {
+    DWORD dwType;
+    DWORD dwSize;
+    HANDLE hDevice;
+    WPARAM wParam;
+} RAWINPUTHEADER, *PRAWINPUTHEADER;
+
+typedef struct tagRAWINPUT {
+    RAWINPUTHEADER header;
+    union {
+        RAWMOUSE    mouse;
+        RAWKEYBOARD keyboard;
+        RAWHID      hid;
+    } data;
+} RAWINPUT, *PRAWINPUT, *LPRAWINPUT;
+
+typedef struct tagRAWINPUTDEVICE {
+    USHORT usUsagePage;
+    USHORT usUsage;
+    DWORD dwFlags;
+    HWND hwndTarget;
+} RAWINPUTDEVICE, *PRAWINPUTDEVICE, *LPRAWINPUTDEVICE;
+
+typedef struct tagRID_DEVICE_INFO_MOUSE {
+    DWORD dwId;
+    DWORD dwNumberOfButtons;
+    DWORD dwSampleRate;
+    BOOL fHasHorizontalWheel;
+} RID_DEVICE_INFO_MOUSE, *PRID_DEVICE_INFO_MOUSE;
+
+typedef struct tagRID_DEVICE_INFO_KEYBOARD {
+    DWORD dwType;
+    DWORD dwSubType;
+    DWORD dwKeyboardMode;
+    DWORD dwNumberOfFunctionKeys;
+    DWORD dwNumberOfIndicators;
+    DWORD dwNumberOfKeysTotal;
+} RID_DEVICE_INFO_KEYBOARD, *PRID_DEVICE_INFO_KEYBOARD;
+
+typedef struct tagRID_DEVICE_INFO_HID {
+    DWORD dwVendorId;
+    DWORD dwProductId;
+    DWORD dwVersionNumber;
+    USHORT usUsagePage;
+    USHORT usUsage;
+} RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID;
+
+typedef struct tagRID_DEVICE_INFO {
+    DWORD    cbSize;
+    DWORD    dwType;
+    union {
+        RID_DEVICE_INFO_MOUSE     mouse;
+        RID_DEVICE_INFO_KEYBOARD  keyboard;
+        RID_DEVICE_INFO_HID       hid;
+    } DUMMYUNIONNAME;
+} RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO;
+
 
 typedef struct tagGUITHREADINFO
 {
@@ -461,7 +603,7 @@ typedef struct tagNMHDR
     UINT  code;
 } NMHDR, *LPNMHDR;
 
-typedef struct
+typedef struct tagDRAWTEXTPARAMS
 {
        UINT    cbSize;
        INT     iTabLength;
@@ -472,13 +614,6 @@ typedef struct
 
 #define WM_USER             0x0400
 
-#define DT_EDITCONTROL      0x00002000
-#define DT_PATH_ELLIPSIS    0x00004000
-#define DT_END_ELLIPSIS     0x00008000
-#define DT_MODIFYSTRING     0x00010000
-#define DT_RTLREADING       0x00020000
-#define DT_WORD_ELLIPSIS    0x00040000
-
 typedef struct
 {
   LPARAM        lParam;
@@ -496,7 +631,7 @@ typedef struct
   HWND        hwnd;
 } CWPRETSTRUCT, *PCWPRETSTRUCT, *LPCWPRETSTRUCT;
 
-typedef struct
+typedef struct tagWINDOWPLACEMENT
 {
     UINT   length;
     UINT   flags;
@@ -513,11 +648,11 @@ typedef struct
 
 /***** Dialogs *****/
 
+#define IS_INTRESOURCE(x)   (((ULONG_PTR)(x) >> 16) == 0)
 #define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i)))
 #define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i)))
 
-#ifdef __WINESRC__
-/* force using a cast when inside Wine */
+#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */
 #define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i)))
 #else
 #define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE)
@@ -545,6 +680,21 @@ typedef struct
 #define RT_ANIICON        MAKEINTRESOURCE(22)
 #define RT_HTML           MAKEINTRESOURCE(23)
 
+#ifndef RC_INVOKED
+#define RT_MANIFEST                                        MAKEINTRESOURCE(24)
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID                 MAKEINTRESOURCE(1)
+#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID                MAKEINTRESOURCE(2)
+#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3)
+#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID              MAKEINTRESOURCE(1)
+#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID              MAKEINTRESOURCE(16)
+#else
+#define RT_MANIFEST                                        24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID                 1
+#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID                2
+#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
+#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID              1
+#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID              16
+#endif
 
   /* cbWndExtra bytes for dialog class */
 #define DLGWINDOWEXTRA      30
@@ -593,6 +743,8 @@ typedef struct
 #define DS_CENTER              0x0800  /* win95 */
 #define DS_CENTERMOUSE         0x1000  /* win95 */
 #define DS_CONTEXTHELP         0x2000  /* win95 */
+#define DS_USEPIXELS           0x8000
+#define DS_SHELLFONT           (DS_SETFONT | DS_FIXEDSYS)
 
 
   /* Dialog messages */
@@ -628,6 +780,7 @@ typedef struct
 #define ODS_COMBOBOXEDIT 0x1000 /* Edit of a combo box */
 
 /* Edit control styles */
+#ifndef NOWINSTYLES
 #define ES_LEFT         0x00000000
 #define ES_CENTER       0x00000001
 #define ES_RIGHT        0x00000002
@@ -643,8 +796,10 @@ typedef struct
 #define ES_READONLY     0x00000800
 #define ES_WANTRETURN   0x00001000
 #define ES_NUMBER       0x00002000
+#endif /* NOWINSTYLES */
 
 /* OEM Resource Ordinal Numbers */
+#ifdef OEMRESOURCE
 #define OBM_TRTYPE          32732
 #define OBM_LFARROWI        32734
 #define OBM_RGARROWI        32735
@@ -711,6 +866,7 @@ typedef struct
 #define OIC_WARNING         OIC_BANG
 #define OIC_ERROR           OIC_HAND
 #define OIC_INFORMATION     OIC_NOTE
+#endif /* OEMRESOURCE */
 
 #ifndef NOCOLOR
 
@@ -751,6 +907,9 @@ typedef struct
 #define COLOR_HOTLIGHT                 26
 #define COLOR_GRADIENTACTIVECAPTION    27
 #define COLOR_GRADIENTINACTIVECAPTION  28
+/* win2k/xp colors */
+#define COLOR_MENUHILIGHT              29
+#define COLOR_MENUBAR                  30
 
   /* WM_CTLCOLOR values */
 #define CTLCOLOR_MSGBOX             0
@@ -761,8 +920,8 @@ typedef struct
 #define CTLCOLOR_SCROLLBAR          5
 #define CTLCOLOR_STATIC             6
 
-COLORREF    WINAPI GetSysColor(INT);
-BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
+WINUSERAPI COLORREF WINAPI GetSysColor(INT);
+WINUSERAPI BOOL     WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 
 #endif /* NOCOLOR */
 
@@ -806,6 +965,8 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define EM_GETLIMITTEXT          0x00d5
 #define EM_POSFROMCHAR           0x00d6
 #define EM_CHARFROMPOS           0x00d7
+#define EM_SETIMESTATUS          0x00d8
+#define EM_GETIMESTATUS          0x00d9
 /* a name change since win95 */
 #define EM_SETLIMITTEXT          EM_LIMITTEXT
 
@@ -919,14 +1080,19 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define SM_CYFOCUSBORDER      84
 #define SM_TABLETPC           86
 #define SM_MEDIACENTER        87
-#define SM_CMETRICS           88
-
-
-/* Messages */
+#define SM_STARTER            88
+#define SM_SERVERR2           89
+#define SM_CMETRICS           90
+#define SM_MOUSEHORIZONTALWHEELPRESENT 91
 
-  /* WM_GETDLGCODE values */
+#define SM_REMOTESESSION        0x1000
+#define SM_SHUTTINGDOWN         0x2000
+#define SM_REMOTECONTROL        0x2001
+#define SM_CARETBLINKINGENABLED 0x2002
 
+#define PMB_ACTIVE      0x00000001
 
+/* Messages */
 #define WM_NULL                 0x0000
 #define WM_CREATE               0x0001
 #define WM_DESTROY              0x0002
@@ -988,8 +1154,8 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_COMPAREITEM          0x0039
 #define WM_TESTING              0x003a
 
-#define WM_OTHERWINDOWCREATED  0x003c
-#define WM_OTHERWINDOWDESTROYED        0x003d
+#define WM_GETOBJECT            0x003d
+
 #define WM_ACTIVATESHELLWINDOW 0x003e
 
 #define WM_COMPACTING          0x0041
@@ -1002,6 +1168,7 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
   /* Win32 4.0 messages */
 #define WM_COPYDATA            0x004a
 #define WM_CANCELJOURNAL       0x004b
+#define WM_KEYF1               0x004d
 #define WM_NOTIFY              0x004e
 #define WM_INPUTLANGCHANGEREQUEST       0x0050
 #define WM_INPUTLANGCHANGE              0x0051
@@ -1045,6 +1212,10 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_NCXBUTTONUP      0x00ac
 #define WM_NCXBUTTONDBLCLK  0x00ad
 
+  /* Raw input */
+#define WM_INPUT_DEVICE_CHANGE 0x00fe
+#define WM_INPUT            0x00ff
+
   /* Keyboard messages */
 #define WM_KEYDOWN          0x0100
 #define WM_KEYUP            0x0101
@@ -1054,8 +1225,9 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_SYSKEYUP         0x0105
 #define WM_SYSCHAR          0x0106
 #define WM_SYSDEADCHAR      0x0107
+#define WM_UNICHAR          0x0109
 #define WM_KEYFIRST         WM_KEYDOWN
-#define WM_KEYLAST          0x0108
+#define WM_KEYLAST          0x0109
 
 /* Win32 4.0 messages for IME */
 #define WM_IME_STARTCOMPOSITION     0x010d
@@ -1067,7 +1239,6 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_COMMAND          0x0111
 #define WM_SYSCOMMAND       0x0112
 #define WM_TIMER           0x0113
-#define WM_SYSTIMER        0x0118
 
   /* scroll messages */
 #define WM_HSCROLL          0x0114
@@ -1091,6 +1262,16 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_UPDATEUISTATE    0x0128
 #define WM_QUERYUISTATE     0x0129
 
+/* UI flags for WM_*UISTATE */
+/* for low-order word of wparam */
+#define UIS_SET                         1
+#define UIS_CLEAR                       2
+#define UIS_INITIALIZE                  3
+/* for hi-order word of wparam */
+#define UISF_HIDEFOCUS                  0x1
+#define UISF_HIDEACCEL                  0x2
+#define UISF_ACTIVE                     0x4
+
 #define WM_LBTRACKPOINT     0x0131
 
   /* Win32 CTLCOLOR messages */
@@ -1102,6 +1283,8 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_CTLCOLORSCROLLBAR 0x0137
 #define WM_CTLCOLORSTATIC    0x0138
 
+#define MN_GETHMENU          0x01E1
+
   /* Mouse messages */
 #define WM_MOUSEMOVE       0x0200
 #define WM_LBUTTONDOWN     0x0201
@@ -1117,9 +1300,13 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_XBUTTONDOWN      0x020B
 #define WM_XBUTTONUP        0x020C
 #define WM_XBUTTONDBLCLK    0x020D
+#define WM_MOUSEHWHEEL      0x020E
+
+#define XBUTTON1            0x0001
+#define XBUTTON2            0x0002
 
 #define WM_MOUSEFIRST       0x0200
-#define WM_MOUSELAST        0x020D
+#define WM_MOUSELAST        0x020E
 
 #define WHEEL_DELTA      120
 #define WHEEL_PAGESCROLL  (UINT_MAX)
@@ -1136,8 +1323,6 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_MOVING          0x0216
 #define WM_POWERBROADCAST   0x0218
 #define WM_DEVICECHANGE     0x0219
-/* Win32 5.1 messages */
-#define WM_THEMECHANGED     0x031A
 
 /* wParam for WM_SIZING message */
 #define WMSZ_LEFT           1
@@ -1149,6 +1334,23 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WMSZ_BOTTOMLEFT     7
 #define WMSZ_BOTTOMRIGHT    8
 
+/* wParam for WM_POWERBROADCAST */
+#define PBT_APMQUERYSUSPEND       0x0000
+#define PBT_APMQUERYSTANDBY       0x0001
+#define PBT_APMQUERYSUSPENDFAILED 0x0002
+#define PBT_APMQUERYSTANDBYFAILED 0x0003
+#define PBT_APMSUSPEND            0x0004
+#define PBT_APMSTANDBY            0x0005
+#define PBT_APMRESUMECRITICAL     0x0006
+#define PBT_APMRESUMESUSPEND      0x0007
+#define PBT_APMRESUMESTANDBY      0x0008
+#define PBT_APMBATTERYLOW         0x0009
+#define PBT_APMPOWERSTATUSCHANGE  0x000A
+#define PBT_APMOEMEVENT           0x000B
+#define PBT_APMRESUMEAUTOMATIC    0x0012
+
+#define PBTF_APMRESUMEFROMFAILURE       0x00000001
+
   /* MDI messages */
 #define WM_MDICREATE       0x0220
 #define WM_MDIDESTROY      0x0221
@@ -1190,6 +1392,16 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define WM_IME_KEYDOWN              0x0290
 #define WM_IME_KEYUP                0x0291
 
+#define WM_NCMOUSEHOVER     0x02A0
+#define WM_MOUSEHOVER       0x02A1
+#define WM_MOUSELEAVE       0x02A3
+#define WM_NCMOUSELEAVE     0x02A2
+
+#define WM_WTSSESSION_CHANGE        0x02B1
+
+#define WM_TABLET_FIRST             0x02c0
+#define WM_TABLET_LAST              0x02df
+
 /* Clipboard command messages */
 #define WM_CUT               0x0300
 #define WM_COPY              0x0301
@@ -1218,18 +1430,36 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 
 #define WM_PRINT             0x0317
 #define WM_PRINTCLIENT       0x0318
+#define WM_APPCOMMAND        0x0319
+#define WM_THEMECHANGED      0x031A
+#define WM_CLIPBOARDUPDATE   0x031D
+
+#define WM_DWMCOMPOSITIONCHANGED 0x031E
+#define WM_DWMNCRENDERINGCHANGED 0x031F
+#define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320
+#define WM_DWMWINDOWMAXIMIZEDCHANGE 0x0321
+
+#define WM_GETTITLEBARINFOEX 0x033F
+
+#define WM_HANDHELDFIRST     0x0358
+#define WM_HANDHELDLAST      0x035F
+
+#define WM_AFXFIRST          0x0360
+#define WM_AFXLAST           0x037F
 
 #define WM_PENWINFIRST      0x0380
 #define WM_PENWINLAST       0x038F
 
-
 #define WM_APP               0x8000
 
+#define UNICODE_NOCHAR       0xFFFF
+
 /* MsgWaitForMultipleObjectsEx flags */
 #define MWMO_WAITALL         0x0001
 #define MWMO_ALERTABLE       0x0002
 #define MWMO_INPUTAVAILABLE  0x0004
 
+/* WM_GETDLGCODE values */
 #define DLGC_WANTARROWS      0x0001
 #define DLGC_WANTTAB         0x0002
 #define DLGC_WANTALLKEYS     0x0004
@@ -1252,6 +1482,16 @@ BOOL        WINAPI SetSysColors(INT,const INT*,const COLORREF*);
 #define IDNO                7
 #define IDCLOSE             8
 #define IDHELP              9
+#define IDTRYAGAIN         10
+#define IDCONTINUE         11
+
+#ifndef IDTIMEOUT
+#define IDTIMEOUT       32000
+#endif
+
+/* Used for EnumDisplaySettingsEx */
+#define ENUM_CURRENT_SETTINGS  ((DWORD) -1)
+#define ENUM_REGISTRY_SETTINGS ((DWORD) -2)
 
 /****** Window classes ******/
 
@@ -1271,7 +1511,7 @@ typedef struct tagCREATESTRUCTA
     DWORD       dwExStyle;
 } CREATESTRUCTA, *LPCREATESTRUCTA;
 
-typedef struct
+typedef struct tagCREATESTRUCTW
 {
     LPVOID      lpCreateParams;
     HINSTANCE hInstance;
@@ -1290,24 +1530,24 @@ typedef struct
 DECL_WINELIB_TYPE_AW(CREATESTRUCT)
 DECL_WINELIB_TYPE_AW(LPCREATESTRUCT)
 
-typedef struct
+typedef struct tagPAINTSTRUCT
 {
     HDC   hdc;
     BOOL  fErase;
     RECT  rcPaint;
     BOOL  fRestore;
     BOOL  fIncUpdate;
-    BYTE    rgbReserved[32];
+    BYTE  rgbReserved[32];
 } PAINTSTRUCT, *PPAINTSTRUCT, *LPPAINTSTRUCT;
 
-typedef struct
+typedef struct tagCLIENTCREATESTRUCT
 {
     HMENU   hWindowMenu;
     UINT    idFirstChild;
 } CLIENTCREATESTRUCT, *LPCLIENTCREATESTRUCT;
 
 
-typedef struct
+typedef struct tagMDICREATESTRUCTA
 {
     LPCSTR       szClass;
     LPCSTR       szTitle;
@@ -1320,7 +1560,7 @@ typedef struct
     LPARAM       lParam;
 } MDICREATESTRUCTA, *LPMDICREATESTRUCTA;
 
-typedef struct
+typedef struct tagMDICREATESTRUCTW
 {
     LPCWSTR      szClass;
     LPCWSTR      szTitle;
@@ -1339,31 +1579,30 @@ DECL_WINELIB_TYPE_AW(LPMDICREATESTRUCT)
 #define MDITILE_VERTICAL     0x0000
 #define MDITILE_HORIZONTAL   0x0001
 #define MDITILE_SKIPDISABLED 0x0002
+#define MDITILE_ZORDER       0x0004
 
 #define MDIS_ALLCHILDSTYLES  0x0001
 
-typedef struct {
+typedef struct tagSTYLESTRUCT {
     DWORD   styleOld;
     DWORD   styleNew;
 } STYLESTRUCT, *LPSTYLESTRUCT;
 
-#define WC_DIALOGA MAKEINTATOMA(0x8002)
-#define WC_DIALOGW MAKEINTATOMW(0x8002)
-#define WC_DIALOG  WINELIB_NAME_AW(WC_DIALOG)
+#define WC_DIALOG  MAKEINTATOM(0x8002)
 
   /* Offsets for GetWindowLong() and GetWindowWord() */
 #define GWL_EXSTYLE         (-20)
 #define GWL_STYLE           (-16)
-#ifndef __WINESRC__
+#if !defined _WIN64 && !defined __WINESRC__
 # define GWL_USERDATA        (-21)
 # define GWL_ID              (-12)
 # define GWL_HWNDPARENT      (-8)
 # define GWL_HINSTANCE       (-6)
 # define GWL_WNDPROC         (-4)
-#endif /* __WINESRC__ */
-#define DWL_MSGRESULT      0
-#define DWL_DLGPROC        4
-#define DWL_USER           8
+# define DWL_MSGRESULT       0
+# define DWL_DLGPROC         4
+# define DWL_USER            8
+#endif /* _WIN64 && __WINESRC__ */
 
   /* Offsets for GetWindowLongPtr() and SetWindowLongPtr() */
 #define GWLP_USERDATA        (-21)
@@ -1389,7 +1628,7 @@ typedef struct {
 #define GA_ROOTOWNER    3
 
   /* WM_GETMINMAXINFO struct */
-typedef struct
+typedef struct tagMINMAXINFO
 {
     POINT   ptReserved;
     POINT   ptMaxSize;
@@ -1533,7 +1772,7 @@ typedef struct
 #define SC_ICON   SC_MINIMIZE
 #define SC_ZOOM   SC_MAXIMIZE
 
-
+#ifndef NOWINSTYLES
 #define CS_VREDRAW          0x00000001
 #define CS_HREDRAW          0x00000002
 #define CS_KEYCVTWINDOW     0x00000004
@@ -1549,6 +1788,7 @@ typedef struct
 #define CS_GLOBALCLASS      0x00004000
 #define CS_IME              0x00010000
 #define CS_DROPSHADOW       0x00020000
+#endif /* NOWINSTYLES */
 
 #define PRF_CHECKVISIBLE    0x00000001L
 #define PRF_NONCLIENT       0x00000002L
@@ -1558,17 +1798,20 @@ typedef struct
 #define PRF_OWNED           0x00000020L
 
   /* Offsets for GetClassLong() and GetClassWord() */
-#define GCL_MENUNAME        (-8)
-#define GCL_HBRBACKGROUND   (-10)
-#define GCL_HCURSOR         (-12)
-#define GCL_HICON           (-14)
-#define GCL_HMODULE         (-16)
+#if !defined _WIN64 && !defined __WINESRC__
+# define GCL_MENUNAME       (-8)
+# define GCL_HBRBACKGROUND  (-10)
+# define GCL_HCURSOR        (-12)
+# define GCL_HICON          (-14)
+# define GCL_HMODULE        (-16)
+# define GCL_WNDPROC        (-24)
+# define GCL_HICONSM        (-34)
+#endif /* _WIN64 && __WINESRC__ */
+
 #define GCL_CBWNDEXTRA      (-18)
 #define GCL_CBCLSEXTRA      (-20)
-#define GCL_WNDPROC         (-24)
 #define GCL_STYLE           (-26)
 #define GCW_ATOM            (-32)
-#define GCL_HICONSM         (-34)
 
 #define GCLP_MENUNAME       (-8)
 #define GCLP_HBRBACKGROUND  (-10)
@@ -1584,6 +1827,7 @@ typedef struct
 #define BSM_NETDRIVER            0x00000002
 #define BSM_INSTALLABLEDRIVERS   0x00000004
 #define BSM_APPLICATIONS         0x00000008
+#define BSM_ALLDESKTOPS          0x00000010
 
 #define BSF_QUERY                0x00000001
 #define BSF_IGNORECURRENTTASK    0x00000002
@@ -1597,6 +1841,7 @@ typedef struct
 #define BSF_RETURNHDESK          0x00000200
 #define BSF_LUID                 0x00000400
 
+#define BROADCAST_QUERY_DENY     0x424D5144
 
 /***** Window hooks *****/
 
@@ -1644,7 +1889,7 @@ typedef struct
 #define MSGF_USER           0x1000
 #define MSGF_DDEMGR         0x8001
 
-typedef struct
+typedef struct tagWNDCLASSA
 {
     UINT      style;
     WNDPROC   lpfnWndProc;
@@ -1658,7 +1903,7 @@ typedef struct
     LPCSTR      lpszClassName;
 } WNDCLASSA, *PWNDCLASSA, *LPWNDCLASSA;
 
-typedef struct
+typedef struct tagWNDCLASSW
 {
     UINT      style;
     WNDPROC   lpfnWndProc;
@@ -1676,26 +1921,26 @@ DECL_WINELIB_TYPE_AW(WNDCLASS)
 DECL_WINELIB_TYPE_AW(PWNDCLASS)
 DECL_WINELIB_TYPE_AW(LPWNDCLASS)
 
-typedef struct {
+typedef struct tagCOPYDATASTRUCT {
     ULONG_PTR dwData;
     DWORD cbData;
     PVOID lpData;
 } COPYDATASTRUCT, *PCOPYDATASTRUCT;
 
-typedef struct {
+typedef struct tagMDINEXTMENU {
     HMENU hmenuIn;
     HMENU hmenuNext;
     HWND  hwndNext;
 } MDINEXTMENU, *PMDINEXTMENU, *LPMDINEXTMENU;
 
-typedef struct
+typedef struct tagMULTIKEYHELPA
 {
     DWORD   mkSize;
     CHAR    mkKeylist;
     CHAR    szKeyphrase[1];
 } MULTIKEYHELPA, *PMULTIKEYHELPA, *LPMULTIKEYHELPA;
 
-typedef struct
+typedef struct tagMULTIKEYHELPW
 {
     DWORD   mkSize;
     WCHAR   mkKeylist;
@@ -1706,7 +1951,7 @@ DECL_WINELIB_TYPE_AW(MULTIKEYHELP)
 DECL_WINELIB_TYPE_AW(PMULTIKEYHELP)
 DECL_WINELIB_TYPE_AW(LPMULTIKEYHELP)
 
-typedef struct {
+typedef struct tagHELPWININFOA {
        int wStructSize;
        int x;
        int y;
@@ -1716,7 +1961,7 @@ typedef struct {
        CHAR rgchMember[2];
 } HELPWININFOA, *PHELPWININFOA, *LPHELPWININFOA;
 
-typedef struct {
+typedef struct tagHELPWININFOW {
        int wStructSize;
        int x;
        int y;
@@ -1754,6 +1999,14 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
 #define HELP_TCARD_OTHER_CALLER 0x0011
 
 
+#define IDH_NO_HELP             28440
+#define IDH_MISSING_CONTEXT     28441
+#define IDH_GENERIC_HELP_BUTTON 28442
+#define IDH_OK                  28443
+#define IDH_CANCEL              28444
+#define IDH_HELP                28445
+
+
      /* ChangeDisplaySettings return codes */
 
 #define DISP_CHANGE_SUCCESSFUL 0
@@ -1763,6 +2016,7 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
 #define DISP_CHANGE_NOTUPDATED (-3)
 #define DISP_CHANGE_BADFLAGS   (-4)
 #define DISP_CHANGE_BADPARAM   (-5)
+#define DISP_CHANGE_BADDUALVIEW (-6)
 
 /* ChangeDisplaySettings.dwFlags */
 #define        CDS_UPDATEREGISTRY      0x00000001
@@ -1770,11 +2024,12 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
 #define        CDS_FULLSCREEN          0x00000004
 #define        CDS_GLOBAL              0x00000008
 #define        CDS_SET_PRIMARY         0x00000010
-#define        CDS_RESET               0x40000000
-#define        CDS_SETRECT             0x20000000
+#define        CDS_VIDEOPARAMETERS     0x00000020
 #define        CDS_NORESET             0x10000000
+#define        CDS_SETRECT             0x20000000
+#define        CDS_RESET               0x40000000
 
-typedef struct
+typedef struct tagWNDCLASSEXA
 {
     UINT      cbSize;
     UINT      style;
@@ -1790,7 +2045,7 @@ typedef struct
     HICON     hIconSm;
 } WNDCLASSEXA, *PWNDCLASSEXA, *LPWNDCLASSEXA;
 
-typedef struct
+typedef struct tagWNDCLASSEXW
 {
     UINT      cbSize;
     UINT      style;
@@ -1820,19 +2075,16 @@ typedef struct tagMSG
     POINT   pt;
 } MSG, *PMSG, *LPMSG;
 
-#define POINTSTOPOINT(pt, pts)                          \
-        { (pt).x = (LONG)(SHORT)LOWORD(*(LONG*)&pts);   \
-          (pt).y = (LONG)(SHORT)HIWORD(*(LONG*)&pts); }
-
+#define POINTSTOPOINT(pt, pts) { (pt).x = (pts).x; (pt).y = (pts).y; }
 #define POINTTOPOINTS(pt)      (MAKELONG((short)((pt).x), (short)((pt).y)))
 
-#define MAKELPARAM(low,high)   ((LPARAM)MAKELONG(low,high))
-#define MAKEWPARAM(low,high)   ((WPARAM)MAKELONG(low,high))
-#define MAKELRESULT(low,high)  ((LRESULT)MAKELONG(low,high))
+#define MAKELPARAM(low,high)   ((LPARAM)(DWORD)MAKELONG(low,high))
+#define MAKEWPARAM(low,high)   ((WPARAM)(DWORD)MAKELONG(low,high))
+#define MAKELRESULT(low,high)  ((LRESULT)(DWORD)MAKELONG(low,high))
 
 /* Cursors / Icons */
 
-typedef struct {
+typedef struct _ICONINFO {
        BOOL            fIcon;
        DWORD           xHotspot;
        DWORD           yHotspot;
@@ -1841,7 +2093,7 @@ typedef struct {
 } ICONINFO, *PICONINFO;
 
 
-typedef struct
+typedef struct tagCURSORINFO
 {
     DWORD cbSize;
     DWORD flags;
@@ -1854,14 +2106,21 @@ typedef struct
 /* this is the 6 byte accel struct used in Win32 when presented to the user */
 typedef struct tagACCEL
 {
+#ifdef WORDS_BIGENDIAN
+    WORD   fVirt;
+    WORD   key;
+    DWORD  cmd;
+#else
     BYTE   fVirt;
     WORD   key;
     WORD   cmd;
+#endif
 } ACCEL, *LPACCEL;
 
 
 /* Flags for TrackPopupMenu */
 #define TPM_LEFTBUTTON    0x0000
+#define TPM_RECURSE       0x0001
 #define TPM_RIGHTBUTTON   0x0002
 #define TPM_LEFTALIGN     0x0000
 #define TPM_CENTERALIGN   0x0004
@@ -1873,8 +2132,14 @@ typedef struct tagACCEL
 #define TPM_VERTICAL      0x0040
 #define TPM_NONOTIFY      0x0080
 #define TPM_RETURNCMD     0x0100
-
-typedef struct
+#define TPM_HORPOSANIMATION 0x0400
+#define TPM_HORNEGANIMATION 0x0800
+#define TPM_VERPOSANIMATION 0x1000
+#define TPM_VERNEGANIMATION 0x2000
+#define TPM_NOANIMATION     0x4000
+#define TPM_LAYOUTRTL       0x8000
+
+typedef struct tagTPMPARAMS
 {
     UINT   cbSize;
     RECT   rcExclude;
@@ -1895,8 +2160,7 @@ typedef struct tagCOMBOBOXINFO
     HWND  hwndList;
 } COMBOBOXINFO, *PCOMBOBOXINFO, *LPCOMBOBOXINFO;
 
-/* FIXME: not sure this one is correct */
-typedef struct {
+typedef struct tagMENUITEMINFOA {
   UINT    cbSize;
   UINT    fMask;
   UINT    fType;
@@ -1911,7 +2175,7 @@ typedef struct {
   HBITMAP hbmpItem;
 } MENUITEMINFOA, *LPMENUITEMINFOA;
 
-typedef struct {
+typedef struct tagMENUITEMINFOW {
   UINT    cbSize;
   UINT    fMask;
   UINT    fType;
@@ -1932,7 +2196,16 @@ typedef const MENUITEMINFOA *LPCMENUITEMINFOA;
 typedef const MENUITEMINFOW *LPCMENUITEMINFOW;
 DECL_WINELIB_TYPE_AW(LPCMENUITEMINFO)
 
-typedef struct {
+typedef struct tagMENUBARINFO {
+  DWORD cbSize;
+  RECT  rcBar;
+  HMENU hMenu;
+  HWND  hwndMenu;
+  BOOL  fBarFocused:1;
+  BOOL  fFocused:1;
+} MENUBARINFO, *PMENUBARINFO, *LPMENUBARINFO;
+
+typedef struct tagMENUINFO {
   DWORD   cbSize;
   DWORD   fMask;
   DWORD   dwStyle;
@@ -1951,6 +2224,13 @@ typedef const MENUINFO *LPCMENUINFO;
 #define MIM_STYLE              0x00000010
 #define MIM_APPLYTOSUBMENUS    0x80000000
 
+#define MNS_NOCHECK             0x80000000
+#define MNS_MODELESS            0x40000000
+#define MNS_DRAGDROP            0x20000000
+#define MNS_AUTODISMISS         0x10000000
+#define MNS_NOTIFYBYPOS         0x08000000
+#define MNS_CHECKORBMP          0x04000000
+
 typedef struct {
   WORD versionNumber;
   WORD offset;
@@ -2014,6 +2294,7 @@ typedef PVOID *LPMENUTEMPLATE;
 #define SB_BOTH             3
 
 /* Scrollbar styles */
+#ifndef NOWINSTYLES
 #define SBS_HORZ                    0x0000L
 #define SBS_VERT                    0x0001L
 #define SBS_TOPALIGN                0x0002L
@@ -2024,6 +2305,7 @@ typedef PVOID *LPMENUTEMPLATE;
 #define SBS_SIZEBOXBOTTOMRIGHTALIGN 0x0004L
 #define SBS_SIZEBOX                 0x0008L
 #define SBS_SIZEGRIP                0x0010L
+#endif /* NOWINSTYLES */
 
 /* EnableScrollBar() flags */
 #define ESB_ENABLE_BOTH     0x0000
@@ -2125,6 +2407,7 @@ typedef PVOID *LPMENUTEMPLATE;
 #define SBM_SETRANGEREDRAW     0x00e6
 #define SBM_SETSCROLLINFO      0x00e9
 #define SBM_GETSCROLLINFO      0x00ea
+#define SBM_GETSCROLLBARINFO   0x00eb
 
 /* Scrollbar info */
 typedef struct tagSCROLLINFO
@@ -2140,6 +2423,19 @@ typedef struct tagSCROLLINFO
 
 typedef const SCROLLINFO *LPCSCROLLINFO;
 
+#define CCHILDREN_SCROLLBAR 5
+
+typedef struct tagSCROLLBARINFO
+{
+    DWORD   cbSize;             /* Size of SCROLLBARINFO struct */
+    RECT    rcScrollBar;        /* Coordinates of the scroll bar */
+    INT     dxyLineButton;      /* Height or width */
+    INT     xyThumbTop;         /* Position of the top or the left */
+    INT     xyThumbBottom;      /* Position of the bottom or the right */
+    INT     reserved;
+    DWORD   rgstate[CCHILDREN_SCROLLBAR+1];
+} SCROLLBARINFO, *PSCROLLBARINFO, *LPSCROLLBARINFO;
+
 /* GetScrollInfo() flags */
 #define SIF_RANGE           0x0001
 #define SIF_PAGE            0x0002
@@ -2149,6 +2445,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define SIF_ALL             (SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS)
 
 /* Listbox styles */
+#ifndef NOWINSTYLES
 #define LBS_NOTIFY               0x0001
 #define LBS_SORT                 0x0002
 #define LBS_NOREDRAW             0x0004
@@ -2166,6 +2463,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define LBS_NOSEL                0x4000
 #define LBS_COMBOBOX             0x8000
 #define LBS_STANDARD  (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER)
+#endif /* NOWINSTYLES */
 
 /* Listbox messages */
 #define LB_ADDSTRING           0x0180
@@ -2210,6 +2508,8 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define LB_SETCOUNT            0x01a7
 #define LB_INITSTORAGE         0x01a8
 #define LB_ITEMFROMPOINT       0x01a9
+#define LB_GETLISTBOXINFO      0x01b2
+#define LB_MSGMAX              0x01b3
 
 /* Listbox notification codes */
 #define LBN_ERRSPACE        (-2)
@@ -2227,6 +2527,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define LB_CTLCODE          0L
 
 /* Combo box styles */
+#ifndef NOWINSTYLES
 #define CBS_SIMPLE            0x0001L
 #define CBS_DROPDOWN          0x0002L
 #define CBS_DROPDOWNLIST      0x0003L
@@ -2241,7 +2542,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 
 #define CBS_UPPERCASE        0x2000L
 #define CBS_LOWERCASE        0x4000L
-
+#endif /* NOWINSTYLES */
 
 /* Combo box messages */
 #define CB_GETEDITSEL            0x0140
@@ -2278,6 +2579,9 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define CB_GETDROPPEDWIDTH       0x015f
 #define CB_SETDROPPEDWIDTH       0x0160
 #define CB_INITSTORAGE           0x0161
+#define CB_MULTIPLEADDSTRING     0x0163
+#define CB_GETCOMBOBOXINFO       0x0164
+#define CB_MSGMAX                0x0165
 
 /* Combo box notification codes */
 #define CBN_ERRSPACE        (-1)
@@ -2303,6 +2607,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define MB_YESNOCANCEL         0x00000003
 #define MB_YESNO               0x00000004
 #define MB_RETRYCANCEL         0x00000005
+#define MB_CANCELTRYCONTINUE   0x00000006
 #define MB_TYPEMASK            0x0000000F
 
 #define MB_ICONHAND            0x00000010
@@ -2343,7 +2648,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define        HELPINFO_MENUITEM       0x0002
 
 /* Structure pointed to by lParam of WM_HELP */
-typedef struct
+typedef struct tagHELPINFO
 {
     UINT       cbSize;         /* Size in bytes of this struct  */
     INT        iContextType;   /* Either HELPINFO_WINDOW or HELPINFO_MENUITEM */
@@ -2355,7 +2660,7 @@ typedef struct
 
 typedef void (CALLBACK *MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
 
-typedef struct
+typedef struct tagMSGBOXPARAMSA
 {
     UINT       cbSize;
     HWND       hwndOwner;
@@ -2369,7 +2674,7 @@ typedef struct
     DWORD      dwLanguageId;
 } MSGBOXPARAMSA, *PMSGBOXPARAMSA, *LPMSGBOXPARAMSA;
 
-typedef struct
+typedef struct tagMSGBOXPARAMSW
 {
     UINT       cbSize;
     HWND       hwndOwner;
@@ -2482,13 +2787,13 @@ DECL_WINELIB_TYPE_AW(LPDLGITEMTEMPLATE)
 
   /* CBT hook structures */
 
-typedef struct
+typedef struct tagCBT_CREATEWNDA
 {
     CREATESTRUCTA *lpcs;
     HWND           hwndInsertAfter;
 } CBT_CREATEWNDA, *LPCBT_CREATEWNDA;
 
-typedef struct
+typedef struct tagCBT_CREATEWNDW
 {
     CREATESTRUCTW *lpcs;
     HWND           hwndInsertAfter;
@@ -2497,7 +2802,7 @@ typedef struct
 DECL_WINELIB_TYPE_AW(CBT_CREATEWND)
 DECL_WINELIB_TYPE_AW(LPCBT_CREATEWND)
 
-typedef struct
+typedef struct tagCBTACTIVATESTRUCT
 {
     BOOL    fMouse;
     HWND    hWndActive;
@@ -2517,6 +2822,8 @@ typedef struct
   /* keybd_event flags */
 #define KEYEVENTF_EXTENDEDKEY        0x0001
 #define KEYEVENTF_KEYUP              0x0002
+#define KEYEVENTF_UNICODE            0x0004
+#define KEYEVENTF_SCANCODE           0x0008
 
   /* mouse_event flags */
 #define MOUSEEVENTF_MOVE        0x0001
@@ -2526,7 +2833,10 @@ typedef struct
 #define MOUSEEVENTF_RIGHTUP     0x0010
 #define MOUSEEVENTF_MIDDLEDOWN  0x0020
 #define MOUSEEVENTF_MIDDLEUP    0x0040
+#define MOUSEEVENTF_XDOWN       0x0080
+#define MOUSEEVENTF_XUP         0x0100
 #define MOUSEEVENTF_WHEEL       0x0800
+#define MOUSEEVENTF_HWHEEL      0x1000
 #define MOUSEEVENTF_ABSOLUTE    0x8000
 
 /* ExitWindows() flags */
@@ -2582,7 +2892,6 @@ typedef struct
 #define MNC_SELECT 3
 
 /* SystemParametersInfo */
-/* defines below are for all win versions */
 #define SPI_GETBEEP               1
 #define SPI_SETBEEP               2
 #define SPI_GETMOUSE              3
@@ -2617,8 +2926,16 @@ typedef struct
 #define SPI_GETFASTTASKSWITCH     35
 #define SPI_SETFASTTASKSWITCH     36
 #define SPI_SETDRAGFULLWINDOWS    37
-#define SPI_GETDRAGFULLWINDOWS   38
-
+#define SPI_GETDRAGFULLWINDOWS    38
+#define SPI_GETNONCLIENTMETRICS   41
+#define SPI_SETNONCLIENTMETRICS   42
+#define SPI_GETMINIMIZEDMETRICS   43
+#define SPI_SETMINIMIZEDMETRICS   44
+#define SPI_GETICONMETRICS        45
+#define SPI_SETICONMETRICS        46
+#define SPI_SETWORKAREA           47
+#define SPI_GETWORKAREA           48
+#define SPI_SETPENWINDOWS         49
 #define SPI_GETFILTERKEYS         50
 #define SPI_SETFILTERKEYS         51
 #define SPI_GETTOGGLEKEYS         52
@@ -2631,25 +2948,10 @@ typedef struct
 #define SPI_SETSTICKYKEYS         59
 #define SPI_GETACCESSTIMEOUT      60
 #define SPI_SETACCESSTIMEOUT      61
-
-#define SPI_GETSOUNDSENTRY        64
-#define SPI_SETSOUNDSENTRY        65
-
-/* defines below are for all win versions WINVER >= 0x0400 */
-#define SPI_SETDRAGFULLWINDOWS    37
-#define SPI_GETDRAGFULLWINDOWS    38
-#define SPI_GETNONCLIENTMETRICS   41
-#define SPI_SETNONCLIENTMETRICS   42
-#define SPI_GETMINIMIZEDMETRICS   43
-#define SPI_SETMINIMIZEDMETRICS   44
-#define SPI_GETICONMETRICS        45
-#define SPI_SETICONMETRICS        46
-#define SPI_SETWORKAREA           47
-#define SPI_GETWORKAREA           48
-#define SPI_SETPENWINDOWS         49
-
 #define SPI_GETSERIALKEYS         62
 #define SPI_SETSERIALKEYS         63
+#define SPI_GETSOUNDSENTRY        64
+#define SPI_SETSOUNDSENTRY        65
 #define SPI_GETHIGHCONTRAST       66
 #define SPI_SETHIGHCONTRAST       67
 #define SPI_GETKEYBOARDPREF       68
@@ -2679,11 +2981,10 @@ typedef struct
 #define SPI_GETWINDOWSEXTENSION   92
 #define SPI_SETMOUSETRAILS        93
 #define SPI_GETMOUSETRAILS        94
+#define SPI_GETSNAPTODEFBUTTON    95
+#define SPI_SETSNAPTODEFBUTTON    96
 #define SPI_SETSCREENSAVERRUNNING 97
 #define SPI_SCREENSAVERRUNNING    SPI_SETSCREENSAVERRUNNING
-
-/* defines below are for all win versions (_WIN32_WINNT >= 0x0400) ||
- *                                        (_WIN32_WINDOWS > 0x0400) */
 #define SPI_GETMOUSEHOVERWIDTH    98
 #define SPI_SETMOUSEHOVERWIDTH    99
 #define SPI_GETMOUSEHOVERHEIGHT   100
@@ -2694,11 +2995,10 @@ typedef struct
 #define SPI_SETWHEELSCROLLLINES   105
 #define SPI_GETMENUSHOWDELAY      106
 #define SPI_SETMENUSHOWDELAY      107
-
+#define SPI_GETWHEELSCROLLCHARS   108
+#define SPI_SETWHEELSCROLLCHARS   109
 #define SPI_GETSHOWIMEUI          110
 #define SPI_SETSHOWIMEUI          111
-
-/* defines below are for all win versions WINVER >= 0x0500 */
 #define SPI_GETMOUSESPEED         112
 #define SPI_SETMOUSESPEED         113
 #define SPI_GETSCREENSAVERRUNNING 114
@@ -2722,20 +3022,16 @@ typedef struct
 #define SPI_SETACTIVEWNDTRKZORDER      0x100D
 #define SPI_GETHOTTRACKING             0x100E
 #define SPI_SETHOTTRACKING             0x100F
+#define SPI_GETMENUFADE                0x1012
+#define SPI_SETMENUFADE                0x1013
 #define SPI_GETSELECTIONFADE           0x1014
 #define SPI_SETSELECTIONFADE           0x1015
-#define SPI_GETDROPSHADOW              0x1024
-#define SPI_SETDROPSHADOW              0x1025
-#define SPI_GETFOREGROUNDLOCKTIMEOUT   0x2000
-#define SPI_SETFOREGROUNDLOCKTIMEOUT   0x2001
-#define SPI_GETACTIVEWNDTRKTIMEOUT     0x2002
-#define SPI_SETACTIVEWNDTRKTIMEOUT     0x2003
-#define SPI_GETFOREGROUNDFLASHCOUNT    0x2004
-#define SPI_SETFOREGROUNDFLASHCOUNT    0x2005
-#define SPI_GETCARETWIDTH              0x2006
-#define SPI_SETCARETWIDTH              0x2007
-
-/* defines below are for all win versions _WIN32_WINNT >= 0x0501 */
+#define SPI_GETTOOLTIPANIMATION        0x1016
+#define SPI_SETTOOLTIPANIMATION        0x1017
+#define SPI_GETTOOLTIPFADE             0x1018
+#define SPI_SETTOOLTIPFADE             0x1019
+#define SPI_GETCURSORSHADOW            0x101A
+#define SPI_SETCURSORSHADOW            0x101B
 #define SPI_GETMOUSESONAR              0x101C
 #define SPI_SETMOUSESONAR              0x101D
 #define SPI_GETMOUSECLICKLOCK          0x101E
@@ -2746,22 +3042,39 @@ typedef struct
 #define SPI_SETFLATMENU                0x1023
 #define SPI_GETDROPSHADOW              0x1024
 #define SPI_SETDROPSHADOW              0x1025
+#define SPI_GETBLOCKSENDINPUTRESETS    0x1026
+#define SPI_SETBLOCKSENDINPUTRESETS    0x1027
+#define SPI_GETUIEFFECTS               0x103E
+#define SPI_SETUIEFFECTS               0x103F
+#define SPI_GETFOREGROUNDLOCKTIMEOUT   0x2000
+#define SPI_SETFOREGROUNDLOCKTIMEOUT   0x2001
+#define SPI_GETACTIVEWNDTRKTIMEOUT     0x2002
+#define SPI_SETACTIVEWNDTRKTIMEOUT     0x2003
+#define SPI_GETFOREGROUNDFLASHCOUNT    0x2004
+#define SPI_SETFOREGROUNDFLASHCOUNT    0x2005
+#define SPI_GETCARETWIDTH              0x2006
+#define SPI_SETCARETWIDTH              0x2007
 #define SPI_GETMOUSECLICKLOCKTIME      0x2008
 #define SPI_SETMOUSECLICKLOCKTIME      0x2009
 #define SPI_GETFONTSMOOTHINGTYPE       0x200A
 #define SPI_SETFONTSMOOTHINGTYPE       0x200B
-
-/* Used by SPI_{GET,SET}FONTSMOOTHINGTYPE */
-#define FE_FONTSMOOTHINGSTANDARD       0x0001
-#define FE_FONTSMOOTHINGCLEARTYPE      0x0002
-#define FE_FONTSMOOTHINGDOCKING        0x8000
-
 #define SPI_GETFONTSMOOTHINGCONTRAST   0x200C
 #define SPI_SETFONTSMOOTHINGCONTRAST   0x200D
 #define SPI_GETFOCUSBORDERWIDTH        0x200E
 #define SPI_SETFOCUSBORDERWIDTH        0x200F
 #define SPI_GETFOCUSBORDERHEIGHT       0x2010
 #define SPI_SETFOCUSBORDERHEIGHT       0x2011
+#define SPI_GETFONTSMOOTHINGORIENTATION 0x2012
+#define SPI_SETFONTSMOOTHINGORIENTATION 0x2013
+
+#define FE_FONTSMOOTHINGSTANDARD       0x0001
+#define FE_FONTSMOOTHINGCLEARTYPE      0x0002
+#define FE_FONTSMOOTHINGDOCKING        0x8000
+
+#define FE_FONTSMOOTHINGORIENTATIONBGR 0x0000
+#define FE_FONTSMOOTHINGORIENTATIONRGB 0x0001
+
+#define SETWALLPAPER_DEFAULT           ((LPWSTR)-1)
 
 /* SystemParametersInfo flags */
 
@@ -2770,7 +3083,7 @@ typedef struct
 #define SPIF_SENDCHANGE                 SPIF_SENDWININICHANGE
 
 #if defined(_WINGDI_) && !defined(NOGDI)
-typedef struct {
+typedef struct tagNONCLIENTMETRICSA {
        UINT            cbSize;
        INT             iBorderWidth;
        INT             iScrollWidth;
@@ -2788,7 +3101,7 @@ typedef struct {
        LOGFONTA        lfMessageFont;
 } NONCLIENTMETRICSA, *PNONCLIENTMETRICSA, *LPNONCLIENTMETRICSA;
 
-typedef struct {
+typedef struct tagNONCLIENTMETRICSW {
        UINT            cbSize;
        INT             iBorderWidth;
        INT             iScrollWidth;
@@ -2829,6 +3142,21 @@ typedef struct tagICONMETRICSW {
 DECL_WINELIB_TYPE_AW(ICONMETRICS)
 DECL_WINELIB_TYPE_AW(PICONMETRICS)
 DECL_WINELIB_TYPE_AW(LPICONMETRICS)
+
+typedef struct tagUPDATELAYEREDWINDOWINFO
+{
+    DWORD                cbSize;
+    HDC                  hdcDst;
+    POINT CONST*         pptDst;
+    SIZE CONST*          psize;
+    HDC                  hdcSrc;
+    POINT CONST*         pptSrc;
+    COLORREF             crKey;
+    BLENDFUNCTION CONST* pblend;
+    DWORD                dwFlags;
+    RECT CONST*          prcDirty;
+} UPDATELAYEREDWINDOWINFO, *PUPDATELAYEREDWINDOWINFO;
+
 #endif /* defined(_WINGDI_) && !defined(NOGDI) */
 
 #define ARW_BOTTOMLEFT              0x0000L
@@ -2853,6 +3181,8 @@ typedef struct tagMINIMIZEDMETRICS {
     int iArrange;
 } MINIMIZEDMETRICS, *PMINIMIZEDMETRICS, *LPMINIMIZEDMETRICS;
 
+#ifndef NOWINSTYLES
+
 /* Window Styles */
 #define WS_OVERLAPPED    0x00000000L
 #define WS_POPUP         0x80000000L
@@ -2889,8 +3219,6 @@ typedef struct tagMINIMIZEDMETRICS {
 #define WS_EX_TOPMOST          0x00000008L
 #define WS_EX_ACCEPTFILES      0x00000010L
 #define WS_EX_TRANSPARENT      0x00000020L
-
-/* New Win95/WinNT4 styles */
 #define WS_EX_MDICHILD         0x00000040L
 #define WS_EX_TOOLWINDOW       0x00000080L
 #define WS_EX_WINDOWEDGE       0x00000100L
@@ -2905,16 +3233,16 @@ typedef struct tagMINIMIZEDMETRICS {
 #define WS_EX_CONTROLPARENT    0x00010000L
 #define WS_EX_STATICEDGE       0x00020000L
 #define WS_EX_APPWINDOW        0x00040000L
+#define WS_EX_LAYERED          0x00080000L
+#define WS_EX_NOINHERITLAYOUT  0x00100000L
+#define WS_EX_LAYOUTRTL        0x00400000L
+#define WS_EX_COMPOSITED       0x02000000L
+#define WS_EX_NOACTIVATE       0x08000000L
 
 #define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE|WS_EX_CLIENTEDGE)
 #define WS_EX_PALETTEWINDOW    (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_TOPMOST)
 
-/* New Win2000 styles */
-#define WS_EX_LAYERED          0x00080000L
-
-/* WINE internal... */
-#define WS_EX_TRAYWINDOW       0x80000000L
-#define WS_EX_MANAGED          0x40000000L /* Window managed by the window system */
+#endif /* NOWINSTYLES */
 
 /* Window scrolling */
 #define SW_SCROLLCHILDREN      0x0001
@@ -2931,9 +3259,13 @@ typedef struct tagMINIMIZEDMETRICS {
 #define CWP_SKIPTRANSPARENT    0x0004
 
   /* PeekMessage() options */
-#define PM_NOREMOVE    0x0000
-#define PM_REMOVE      0x0001
-#define PM_NOYIELD     0x0002
+#define PM_NOREMOVE       0x0000
+#define PM_REMOVE         0x0001
+#define PM_NOYIELD        0x0002
+#define PM_QS_INPUT       (QS_INPUT << 16)
+#define PM_QS_POSTMESSAGE ((QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER) << 16)
+#define PM_QS_PAINT       (QS_PAINT << 16)
+#define PM_QS_SENDMESSAGE (QS_SENDMESSAGE << 16)
 
 /* AnimateWindow() flags */
 #define AW_SLIDE        0x00040000
@@ -2962,11 +3294,21 @@ typedef struct {
     DWORD dwTimeout;
 } FLASHWINFO, *PFLASHWINFO;
 
-/* WM_SHOWWINDOW wParam codes */
+/* WM_SHOWWINDOW lParam codes */
 #define SW_PARENTCLOSING    1
-#define SW_OTHERMAXIMIZED   2
+#define SW_OTHERZOOM        2
 #define SW_PARENTOPENING    3
-#define SW_OTHERRESTORED    4
+#define SW_OTHERUNZOOM      4
+
+/* SetLayeredWindowAttributes() flags */
+#define LWA_COLORKEY        0x00000001
+#define LWA_ALPHA           0x00000002
+
+/* UpdateLayeredWindow() flags */
+#define ULW_COLORKEY        0x00000001
+#define ULW_ALPHA           0x00000002
+#define ULW_OPAQUE          0x00000004
+#define ULW_EX_NORESIZE     0x00000008
 
   /* ShowWindow() codes */
 #define SW_HIDE             0
@@ -3017,6 +3359,11 @@ typedef struct {
 #define SWP_DEFERERASE      0x2000
 #define SWP_ASYNCWINDOWPOS  0x4000
 
+/* undocumented SWP flags - from SDK 3.1 */
+#define SWP_NOCLIENTSIZE    0x0800
+#define SWP_NOCLIENTMOVE    0x1000
+#define SWP_STATECHANGED    0x8000
+
 #define HWND_DESKTOP        ((HWND)0)
 #define HWND_BROADCAST      ((HWND)0xffff)
 
@@ -3104,21 +3451,31 @@ typedef struct {
 #define GMDI_USEDISABLED    0x0001L
 #define GMDI_GOINTOPOPUPS   0x0002L
 
-#define DT_TOP 0
-#define DT_LEFT 0
-#define DT_CENTER 1
-#define DT_RIGHT 2
-#define DT_VCENTER 4
-#define DT_BOTTOM 8
-#define DT_WORDBREAK 16
-#define DT_SINGLELINE 32
-#define DT_EXPANDTABS 64
-#define DT_TABSTOP 128
-#define DT_NOCLIP 256
-#define DT_EXTERNALLEADING 512
-#define DT_CALCRECT 1024
-#define DT_NOPREFIX 2048
-#define DT_INTERNAL 4096
+/* DrawText() flags */
+#define DT_TOP                  0x00000000
+#define DT_LEFT                 0x00000000
+#define DT_CENTER               0x00000001
+#define DT_RIGHT                0x00000002
+#define DT_VCENTER              0x00000004
+#define DT_BOTTOM               0x00000008
+#define DT_WORDBREAK            0x00000010
+#define DT_SINGLELINE           0x00000020
+#define DT_EXPANDTABS           0x00000040
+#define DT_TABSTOP              0x00000080
+#define DT_NOCLIP               0x00000100
+#define DT_EXTERNALLEADING      0x00000200
+#define DT_CALCRECT             0x00000400
+#define DT_NOPREFIX             0x00000800
+#define DT_INTERNAL             0x00001000
+#define DT_EDITCONTROL          0x00002000
+#define DT_PATH_ELLIPSIS        0x00004000
+#define DT_END_ELLIPSIS         0x00008000
+#define DT_MODIFYSTRING         0x00010000
+#define DT_RTLREADING           0x00020000
+#define DT_WORD_ELLIPSIS        0x00040000
+#define DT_NOFULLWIDTHCHARBREAK 0x00080000
+#define DT_HIDEPREFIX           0x00100000
+#define DT_PREFIXONLY           0x00200000
 
 /* DrawCaption()/DrawCaptionTemp() flags */
 #define DC_ACTIVE              0x0001
@@ -3126,6 +3483,8 @@ typedef struct {
 #define DC_ICON                        0x0004
 #define DC_TEXT                        0x0008
 #define DC_INBUTTON            0x0010
+#define DC_GRADIENT             0x0020
+#define DC_BUTTONS              0x1000
 
 /* DrawEdge() flags */
 #define BDR_RAISEDOUTER    0x0001
@@ -3170,6 +3529,7 @@ typedef struct {
 #define DFC_MENU                2
 #define DFC_SCROLL              3
 #define DFC_BUTTON              4
+#define DFC_POPUPMENU           5
 
 /* uState's */
 
@@ -3224,6 +3584,8 @@ typedef struct {
 #define        DSS_DISABLED    0x0020
 #define        DSS_DEFAULT     0x0040  /* Make it bold */
 #define        DSS_MONO        0x0080
+#define        DSS_HIDEPREFIX  0x0200
+#define        DSS_PREFIXONLY  0x0400
 #define        DSS_RIGHT       0x8000
 
 /* UserObjectInformation classes */
@@ -3249,7 +3611,7 @@ typedef struct tagDRAWITEMSTRUCT
 } DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT;
 
 
-typedef struct
+typedef struct tagMEASUREITEMSTRUCT
 {
     UINT      CtlType;
     UINT      CtlID;
@@ -3260,7 +3622,7 @@ typedef struct
 } MEASUREITEMSTRUCT, *PMEASUREITEMSTRUCT, *LPMEASUREITEMSTRUCT;
 
 
-typedef struct
+typedef struct tagDELETEITEMSTRUCT
 {
     UINT     CtlType;
     UINT     CtlID;
@@ -3270,7 +3632,7 @@ typedef struct
 } DELETEITEMSTRUCT, *PDELETEITEMSTRUCT, *LPDELETEITEMSTRUCT;
 
 
-typedef struct
+typedef struct tagCOMPAREITEMSTRUCT
 {
     UINT      CtlType;
     UINT      CtlID;
@@ -3310,10 +3672,23 @@ typedef struct
 #define VK_MENU             0x12
 #define VK_PAUSE            0x13
 #define VK_CAPITAL          0x14
-/*                          0x15-0x19  Reserved for Kanji systems */
+
+#define VK_KANA             0x15
+#define VK_HANGEUL          0x15
+#define VK_HANGUL           0x15
+#define VK_JUNJA            0x17
+#define VK_FINAL            0x18
+#define VK_HANJA            0x19
+#define VK_KANJI            0x19
+
 /*                          0x1A       Undefined */
 #define VK_ESCAPE           0x1B
-/*                          0x1C-0x1F  Reserved for Kanji systems */
+
+#define VK_CONVERT          0x1C
+#define VK_NONCONVERT       0x1D
+#define VK_ACCEPT           0x1E
+#define VK_MODECHANGE       0x1F
+
 #define VK_SPACE            0x20
 #define VK_PRIOR            0x21
 #define VK_NEXT             0x22
@@ -3330,48 +3705,14 @@ typedef struct
 #define VK_INSERT           0x2D
 #define VK_DELETE           0x2E
 #define VK_HELP             0x2F
-#define VK_0                0x30
-#define VK_1                0x31
-#define VK_2                0x32
-#define VK_3                0x33
-#define VK_4                0x34
-#define VK_5                0x35
-#define VK_6                0x36
-#define VK_7                0x37
-#define VK_8                0x38
-#define VK_9                0x39
+/* VK_0 - VK-9              0x30-0x39  Use ASCII instead */
 /*                          0x3A-0x40  Undefined */
-#define VK_A                0x41
-#define VK_B                0x42
-#define VK_C                0x43
-#define VK_D                0x44
-#define VK_E                0x45
-#define VK_F                0x46
-#define VK_G                0x47
-#define VK_H                0x48
-#define VK_I                0x49
-#define VK_J                0x4A
-#define VK_K                0x4B
-#define VK_L                0x4C
-#define VK_M                0x4D
-#define VK_N                0x4E
-#define VK_O                0x4F
-#define VK_P                0x50
-#define VK_Q                0x51
-#define VK_R                0x52
-#define VK_S                0x53
-#define VK_T                0x54
-#define VK_U                0x55
-#define VK_V                0x56
-#define VK_W                0x57
-#define VK_X                0x58
-#define VK_Y                0x59
-#define VK_Z                0x5A
-
+/* VK_A - VK_Z              0x41-0x5A  Use ASCII instead */
 #define VK_LWIN             0x5B
 #define VK_RWIN             0x5C
 #define VK_APPS             0x5D
-/*                          0x5E-0x5F Unassigned */
+/*                          0x5E Unassigned */
+#define VK_SLEEP            0x5F
 #define VK_NUMPAD0          0x60
 #define VK_NUMPAD1          0x61
 #define VK_NUMPAD2          0x62
@@ -3415,7 +3756,13 @@ typedef struct
 /*                          0x88-0x8F  Unassigned */
 #define VK_NUMLOCK          0x90
 #define VK_SCROLL           0x91
-/*                          0x92-0x9F  Unassigned */
+#define VK_OEM_NEC_EQUAL    0x92
+#define VK_OEM_FJ_JISHO     0x92
+#define VK_OEM_FJ_MASSHOU   0x93
+#define VK_OEM_FJ_TOUROKU   0x94
+#define VK_OEM_FJ_LOYA      0x95
+#define VK_OEM_FJ_ROYA      0x96
+/*                          0x97-0x9F  Unassigned */
 /*
  * differencing between right and left shift/control/alt key.
  * Used only by GetAsyncKeyState() and GetKeyState().
@@ -3426,7 +3773,27 @@ typedef struct
 #define VK_RCONTROL         0xA3
 #define VK_LMENU            0xA4
 #define VK_RMENU            0xA5
-/*                          0xA6-0xB9  Unassigned */
+
+#define VK_BROWSER_BACK        0xA6
+#define VK_BROWSER_FORWARD     0xA7
+#define VK_BROWSER_REFRESH     0xA8
+#define VK_BROWSER_STOP        0xA9
+#define VK_BROWSER_SEARCH      0xAA
+#define VK_BROWSER_FAVORITES   0xAB
+#define VK_BROWSER_HOME        0xAC
+#define VK_VOLUME_MUTE         0xAD
+#define VK_VOLUME_DOWN         0xAE
+#define VK_VOLUME_UP           0xAF
+#define VK_MEDIA_NEXT_TRACK    0xB0
+#define VK_MEDIA_PREV_TRACK    0xB1
+#define VK_MEDIA_STOP          0xB2
+#define VK_MEDIA_PLAY_PAUSE    0xB3
+#define VK_LAUNCH_MAIL         0xB4
+#define VK_LAUNCH_MEDIA_SELECT 0xB5
+#define VK_LAUNCH_APP1         0xB6
+#define VK_LAUNCH_APP2         0xB7
+
+/*                          0xB8-0xB9  Unassigned */
 #define VK_OEM_1            0xBA
 #define VK_OEM_PLUS         0xBB
 #define VK_OEM_COMMA        0xBC
@@ -3448,7 +3815,8 @@ typedef struct
 #define VK_PROCESSKEY       0xE5
 
 /*                          0xE6       OEM specific */
-/*                          0xE7-0xE8  Unassigned */
+#define VK_PACKET           0xE7
+/*                          0xE8       Unassigned */
 /*                          0xE9-0xF5  OEM specific */
 
 #define VK_ATTN             0xF6
@@ -3461,6 +3829,13 @@ typedef struct
 #define VK_PA1              0xFD
 #define VK_OEM_CLEAR        0xFE
 
+/* MapVirtualKey translation types */
+#define MAPVK_VK_TO_VSC     0
+#define MAPVK_VSC_TO_VK     1
+#define MAPVK_VK_TO_CHAR    2
+#define MAPVK_VSC_TO_VK_EX  3
+#define MAPVK_VK_TO_VSC_EX  4
+
   /* Key status flags for mouse events */
 #define MK_LBUTTON         0x0001
 #define MK_RBUTTON         0x0002
@@ -3471,12 +3846,6 @@ typedef struct
 #define MK_XBUTTON2         0x0040
 
 
-#define WM_MOUSEHOVER       0x02A1
-#define WM_MOUSELEAVE       0x02A3
-#define WM_NCMOUSEHOVER     0x02A0
-#define WM_NCMOUSELEAVE     0x02A2
-
-
 #define TME_HOVER       0x00000001
 #define TME_LEAVE       0x00000002
 #define TME_NONCLIENT   0x00000010
@@ -3502,7 +3871,9 @@ typedef struct tagTRACKMOUSEEVENT {
 #define QS_PAINT       0x0020
 #define QS_SENDMESSAGE 0x0040
 #define QS_HOTKEY      0x0080
-#define QS_INPUT       (QS_MOUSE | QS_KEY)
+#define QS_ALLPOSTMESSAGE 0x0100
+#define QS_RAWINPUT       0x0400
+#define QS_INPUT       (QS_MOUSE | QS_KEY | QS_RAWINPUT)
 #define QS_ALLEVENTS   (QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY)
 #define QS_ALLINPUT     (QS_ALLEVENTS | QS_SENDMESSAGE)
 
@@ -3531,6 +3902,88 @@ typedef struct tagTRACKMOUSEEVENT {
 #define HSHELL_WINDOWCREATED       1
 #define HSHELL_WINDOWDESTROYED     2
 #define HSHELL_ACTIVATESHELLWINDOW 3
+#define HSHELL_WINDOWACTIVATED     4
+#define HSHELL_GETMINRECT          5
+#define HSHELL_REDRAW              6
+#define HSHELL_TASKMAN             7
+#define HSHELL_LANGUAGE            8
+#define HSHELL_SYSMENU             9
+#define HSHELL_ENDTASK             10
+#define HSHELL_ACCESSIBILITYSTATE  11
+#define HSHELL_APPCOMMAND          12
+#define HSHELL_WINDOWREPLACED      13
+#define HSHELL_WINDOWREPLACING     14
+
+#define HSHELL_HIGHBIT             0x8000
+#define HSHELL_FLASH               (HSHELL_REDRAW|HSHELL_HIGHBIT)
+#define HSHELL_RUDEAPPACTIVATED    (HSHELL_WINDOWACTIVATED|HSHELL_HIGHBIT)
+
+/* App commands */
+#define APPCOMMAND_BROWSER_BACKWARD                  1
+#define APPCOMMAND_BROWSER_FORWARD                   2
+#define APPCOMMAND_BROWSER_REFRESH                   3
+#define APPCOMMAND_BROWSER_STOP                      4
+#define APPCOMMAND_BROWSER_SEARCH                    5
+#define APPCOMMAND_BROWSER_FAVORITES                 6
+#define APPCOMMAND_BROWSER_HOME                      7
+#define APPCOMMAND_VOLUME_MUTE                       8
+#define APPCOMMAND_VOLUME_DOWN                       9
+#define APPCOMMAND_VOLUME_UP                         10
+#define APPCOMMAND_MEDIA_NEXTTRACK                   11
+#define APPCOMMAND_MEDIA_PREVIOUSTRACK               12
+#define APPCOMMAND_MEDIA_STOP                        13
+#define APPCOMMAND_MEDIA_PLAY_PAUSE                  14
+#define APPCOMMAND_LAUNCH_MAIL                       15
+#define APPCOMMAND_LAUNCH_MEDIA_SELECT               16
+#define APPCOMMAND_LAUNCH_APP1                       17
+#define APPCOMMAND_LAUNCH_APP2                       18
+#define APPCOMMAND_BASS_DOWN                         19
+#define APPCOMMAND_BASS_BOOST                        20
+#define APPCOMMAND_BASS_UP                           21
+#define APPCOMMAND_TREBLE_DOWN                       22
+#define APPCOMMAND_TREBLE_UP                         23
+#define APPCOMMAND_MICROPHONE_VOLUME_MUTE            24
+#define APPCOMMAND_MICROPHONE_VOLUME_DOWN            25
+#define APPCOMMAND_MICROPHONE_VOLUME_UP              26
+#define APPCOMMAND_HELP                              27
+#define APPCOMMAND_FIND                              28
+#define APPCOMMAND_NEW                               29
+#define APPCOMMAND_OPEN                              30
+#define APPCOMMAND_CLOSE                             31
+#define APPCOMMAND_SAVE                              32
+#define APPCOMMAND_PRINT                             33
+#define APPCOMMAND_UNDO                              34
+#define APPCOMMAND_REDO                              35
+#define APPCOMMAND_COPY                              36
+#define APPCOMMAND_CUT                               37
+#define APPCOMMAND_PASTE                             38
+#define APPCOMMAND_REPLY_TO_MAIL                     39
+#define APPCOMMAND_FORWARD_MAIL                      40
+#define APPCOMMAND_SEND_MAIL                         41
+#define APPCOMMAND_SPELL_CHECK                       42
+#define APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE 43
+#define APPCOMMAND_MIC_ON_OFF_TOGGLE                 44
+#define APPCOMMAND_CORRECTION_LIST                   45
+#define APPCOMMAND_MEDIA_PLAY                        46
+#define APPCOMMAND_MEDIA_PAUSE                       47
+#define APPCOMMAND_MEDIA_RECORD                      48
+#define APPCOMMAND_MEDIA_FAST_FORWARD                49
+#define APPCOMMAND_MEDIA_REWIND                      50
+#define APPCOMMAND_MEDIA_CHANNEL_UP                  51
+#define APPCOMMAND_MEDIA_CHANNEL_DOWN                52
+#define APPCOMMAND_DELETE                            53
+#define APPCOMMAND_DWM_FLIP3D                        54
+
+#define FAPPCOMMAND_MOUSE 0x8000
+#define FAPPCOMMAND_KEY   0
+#define FAPPCOMMAND_OEM   0x1000
+#define FAPPCOMMAND_MASK  0xF000
+
+#define GET_APPCOMMAND_LPARAM(lParam) ((short)(HIWORD(lParam) & ~FAPPCOMMAND_MASK))
+#define GET_DEVICE_LPARAM(lParam)     ((WORD)(HIWORD(lParam) & FAPPCOMMAND_MASK))
+#define GET_MOUSEORKEY_LPARAM         GET_DEVICE_LPARAM
+#define GET_FLAGS_LPARAM(lParam)      (LOWORD(lParam))
+#define GET_KEYSTATE_LPARAM(lParam)   GET_FLAGS_LPARAM(lParam)
 
 /* Predefined Clipboard Formats */
 #define CF_TEXT              1
@@ -3589,11 +4042,12 @@ typedef struct tagTRACKMOUSEEVENT {
 #define LR_SHARED              0x8000
 
 /* Flags for DrawIconEx.  */
-#define DI_MASK                 1
-#define DI_IMAGE                2
+#define DI_MASK                 0x0001
+#define DI_IMAGE                0x0002
 #define DI_NORMAL               (DI_MASK | DI_IMAGE)
-#define DI_COMPAT               4
-#define DI_DEFAULTSIZE          8
+#define DI_COMPAT               0x0004
+#define DI_DEFAULTSIZE          0x0008
+#define DI_NOMIRROR             0x0010
 
 /* WM_NOTIFYFORMAT commands and return values */
 #define NFR_ANSI           1
@@ -3634,6 +4088,26 @@ typedef struct tagTITLEBARINFO {
     DWORD rgstate[CCHILDREN_TITLEBAR+1];
 } TITLEBARINFO, *PTITLEBARINFO, *LPTITLEBARINFO;
 
+/* used by GetLastInputInfo */
+typedef struct tagLASTINPUTINFO {
+    UINT cbSize;
+    DWORD dwTime;
+} LASTINPUTINFO, *PLASTINPUTINFO;
+
+/* used by GetAltTabInfo */
+typedef struct
+{
+    DWORD cbSize;
+    INT cItems;
+    INT cColumns;
+    INT cRows;
+    INT iColFocus;
+    INT iRowFocus;
+    INT cxItem;
+    INT cyItem;
+    POINT ptStart;
+} ALTTABINFO, *PALTTABINFO, *LPALTTABINFO;
+
 /* SetWinEventHook() flags */
 #define WINEVENT_OUTOFCONTEXT   0x0
 #define WINEVENT_SKIPOWNTHREAD  0x1
@@ -3787,6 +4261,13 @@ typedef struct tagTITLEBARINFO {
 #define STATE_SYSTEM_PROTECTED       0x20000000
 #define STATE_SYSTEM_VALID           0x3FFFFFFF
 
+/* Lock codes for LockSetForegroundWindow */
+#define LSFW_LOCK   1
+#define LSFW_UNLOCK 2
+
+/* Values for AllowSetForegroundWindow */
+#define ASFW_ANY    ((DWORD)-1)
+
 #define     EnumTaskWindows(handle,proc,lparam) \
             EnumThreadWindows(handle,proc,lparam)
 #define     OemToAnsiA OemToCharA
@@ -3803,771 +4284,796 @@ typedef struct tagTITLEBARINFO {
 #define     AnsiToOemBuff WINELIB_NAME_AW(AnsiToOemBuff)
 
 #if defined(_WINGDI_) && !defined(NOGDI)
-LONG        WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD);
-LONG        WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD);
-#define     ChangeDisplaySettings WINELIB_NAME_AW(ChangeDisplaySettings)
-LONG        WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
-LONG        WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
-#define     ChangeDisplaySettingsEx WINELIB_NAME_AW(ChangeDisplaySettingsEx)
-BOOL        WINAPI EnumDisplayDevicesA(LPVOID,DWORD,LPDISPLAY_DEVICEA,DWORD);
-BOOL        WINAPI EnumDisplayDevicesW(LPVOID,DWORD,LPDISPLAY_DEVICEW,DWORD);
-#define     EnumDisplayDevices WINELIB_NAME_AW(EnumDisplayDevices)
-BOOL        WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,LPDEVMODEA);
-BOOL        WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,LPDEVMODEW);
-#define     EnumDisplaySettings WINELIB_NAME_AW(EnumDisplaySettings)
-BOOL        WINAPI EnumDisplaySettingsExA(LPCSTR,DWORD,LPDEVMODEA,DWORD);
-BOOL        WINAPI EnumDisplaySettingsExW(LPCWSTR,DWORD,LPDEVMODEW,DWORD);
-#define     EnumDisplaySettingsEx WINELIB_NAME_AW(EnumDisplaySettingsEx)
+WINUSERAPI LONG        WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD);
+WINUSERAPI LONG        WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD);
+#define                       ChangeDisplaySettings WINELIB_NAME_AW(ChangeDisplaySettings)
+WINUSERAPI LONG        WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
+WINUSERAPI LONG        WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
+#define                       ChangeDisplaySettingsEx WINELIB_NAME_AW(ChangeDisplaySettingsEx)
+WINUSERAPI HDESK       WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+WINUSERAPI HDESK       WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+#define                       CreateDesktop WINELIB_NAME_AW(CreateDesktop)
+WINUSERAPI BOOL        WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD);
+WINUSERAPI BOOL        WINAPI EnumDisplayDevicesW(LPCWSTR,DWORD,LPDISPLAY_DEVICEW,DWORD);
+#define                       EnumDisplayDevices WINELIB_NAME_AW(EnumDisplayDevices)
+WINUSERAPI BOOL        WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,LPDEVMODEA);
+WINUSERAPI BOOL        WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,LPDEVMODEW);
+#define                       EnumDisplaySettings WINELIB_NAME_AW(EnumDisplaySettings)
+WINUSERAPI BOOL        WINAPI EnumDisplaySettingsExA(LPCSTR,DWORD,LPDEVMODEA,DWORD);
+WINUSERAPI BOOL        WINAPI EnumDisplaySettingsExW(LPCWSTR,DWORD,LPDEVMODEW,DWORD);
+#define                       EnumDisplaySettingsEx WINELIB_NAME_AW(EnumDisplaySettingsEx)
+WINUSERAPI BOOL        WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
+WINUSERAPI BOOL        WINAPI UpdateLayeredWindowIndirect(HWND,UPDATELAYEREDWINDOWINFO CONST*);
 #endif /* defined(_WINGDI_) && !defined(NOGDI) */
 
-HKL         WINAPI ActivateKeyboardLayout(HKL,UINT);
-WORD        WINAPI CascadeWindows(HWND, UINT, const LPRECT, UINT, const HWND *);
-INT       WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,INT);
-INT       WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,INT);
-#define     CopyAcceleratorTable WINELIB_NAME_AW(CopyAcceleratorTable)
-HACCEL      WINAPI CreateAcceleratorTableA(LPACCEL,INT);
-HACCEL      WINAPI CreateAcceleratorTableW(LPACCEL,INT);
-#define     CreateAcceleratorTable WINELIB_NAME_AW(CreateAcceleratorTable)
-HICON     WINAPI CreateIconIndirect(PICONINFO);
-BOOL      WINAPI DestroyAcceleratorTable(HACCEL);
-BOOL        WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
-BOOL        WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
-#define     EnumDesktops WINELIB_NAME_AW(EnumDesktops)
-BOOL      WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
-INT       WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
-INT       WINAPI EnumPropsExW(HWND,PROPENUMPROCEXW,LPARAM);
-#define     EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)
-BOOL      WINAPI EnumThreadWindows(DWORD,WNDENUMPROC,LPARAM);
-BOOL      WINAPI ExitWindowsEx(UINT,DWORD);
-BOOL      WINAPI GetIconInfo(HICON,PICONINFO);
-HKL       WINAPI GetKeyboardLayout(DWORD);
-UINT      WINAPI GetKeyboardLayoutList(INT,HKL *);
-BOOL      WINAPI GetComboBoxInfo(HWND,PCOMBOBOXINFO);
-DWORD     WINAPI GetMenuContextHelpId(HMENU);
-UINT      WINAPI GetMenuDefaultItem(HMENU,UINT,UINT);
-BOOL      WINAPI GetMenuInfo(HMENU,LPMENUINFO);
-BOOL      WINAPI GetMenuItemInfoA(HMENU,UINT,BOOL,MENUITEMINFOA*);
-BOOL      WINAPI GetMenuItemInfoW(HMENU,UINT,BOOL,MENUITEMINFOW*);
-#define     GetMenuItemInfo WINELIB_NAME_AW(GetMenuItemInfo)
-BOOL      WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO);
-BOOL      WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO);
-#define     GetMonitorInfo WINELIB_NAME_AW(GetMonitorInfo)
-DWORD       WINAPI GetWindowContextHelpId(HWND);
-DWORD       WINAPI GetWindowThreadProcessId(HWND,LPDWORD);
-BOOL        WINAPI IsWinEventHookInstalled(DWORD);
-BOOL        WINAPI IsWindowUnicode(HWND);
-HKL         WINAPI LoadKeyboardLayoutA(LPCSTR,UINT);
-HKL         WINAPI LoadKeyboardLayoutW(LPCWSTR,UINT);
-#define     LoadKeyboardLayout WINELIB_NAME_AW(LoadKeyboardLayout)
-INT         WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
-INT         WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
-#define     MessageBoxEx WINELIB_NAME_AW(MessageBoxEx)
-HMONITOR    WINAPI MonitorFromPoint(POINT,DWORD);
-HMONITOR    WINAPI MonitorFromRect(LPRECT,DWORD);
-HMONITOR    WINAPI MonitorFromWindow(HWND,DWORD);
-DWORD       WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
-DWORD       WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
-VOID        WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
-BOOL        WINAPI PaintDesktop(HDC);
-BOOL        WINAPI PostThreadMessageA(DWORD,UINT,WPARAM,LPARAM);
-BOOL        WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM);
-#define     PostThreadMessage WINELIB_NAME_AW(PostThreadMessage)
-BOOL        WINAPI RegisterHotKey(HWND,INT,UINT,UINT);
-HDEVNOTIFY  WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD);
-HDEVNOTIFY  WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD);
-#define     RegisterDeviceNotification WINELIB_NAME_AW(RegisterDeviceNotification)
-BOOL        WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
-BOOL        WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
-#define      SendMessageCallback WINELIB_NAME_AW(SendMessageCallback)
-BOOL        WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL        WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM);
-#define     SendNotifyMessage WINELIB_NAME_AW(SendNotifyMessage)
-VOID        WINAPI SetDebugErrorLevel(DWORD);
-VOID        WINAPI SetLastErrorEx(DWORD,DWORD);
-BOOL      WINAPI SetMenuDefaultItem(HMENU,UINT,UINT);
-BOOL      WINAPI SetMenuInfo(HMENU,LPCMENUINFO);
-BOOL      WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
-BOOL      WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
-#define     SetMenuItemInfo WINELIB_NAME_AW(SetMenuItemInfo)
-BOOL      WINAPI SetWindowContextHelpId(HWND,DWORD);
-HWINEVENTHOOK WINAPI SetWinEventHook(DWORD,DWORD,HMODULE,WINEVENTPROC,DWORD,DWORD,DWORD);
-WORD        WINAPI TileWindows (HWND, UINT, const LPRECT,
-                                UINT, const HWND *);
-INT         WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT);
-INT         WINAPI ToUnicodeEx(UINT,UINT,LPBYTE,LPWSTR,int,UINT,HKL);
-BOOL      WINAPI TrackPopupMenuEx(HMENU,UINT,INT,INT,HWND,
-                                    LPTPMPARAMS);
-BOOL        WINAPI UnhookWinEvent(HWINEVENTHOOK);
-BOOL        WINAPI UnloadKeyboardLayout(HKL);
-BOOL        WINAPI UnregisterDeviceNotification(HDEVNOTIFY);
-BOOL        WINAPI UnregisterHotKey(HWND,INT);
-DWORD       WINAPI WaitForInputIdle(HANDLE,DWORD);
-VOID        WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR);
-VOID        WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
-
-/* Declarations for functions that are the same in Win16 and Win32 */
-VOID        WINAPI EndMenu(void);
-DWORD       WINAPI GetDialogBaseUnits(void);
-BOOL        WINAPI GetKeyboardState(LPBYTE);
-DWORD       WINAPI GetMenuCheckMarkDimensions(void);
-LPARAM      WINAPI GetMessageExtraInfo(void);
-DWORD       WINAPI GetMessagePos(void);
-LONG        WINAPI GetMessageTime(void);
-DWORD       WINAPI OemKeyScan(WORD);
-BOOL        WINAPI ReleaseCapture(void);
-BOOL        WINAPI SetKeyboardState(LPBYTE);
-
-/* Declarations for functions that change between Win16 and Win32 */
-
-BOOL        WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
-BOOL        WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD);
-BOOL        WINAPI AnimateWindow(HWND,DWORD,DWORD);
-#define     AnsiLowerA CharLowerA
-#define     AnsiLowerW CharLowerW
-#define     AnsiLower WINELIB_NAME_AW(AnsiLower)
-#define     AnsiLowerBuffA CharLowerBuffA
-#define     AnsiLowerBuffW CharLowerBuffW
-#define     AnsiLowerBuff WINELIB_NAME_AW(AnsiLowerBuff)
-#define     AnsiNextA CharNextA
-#define     AnsiNextW CharNextW
-#define     AnsiNext WINELIB_NAME_AW(AnsiNext)
-#define     AnsiPrevA CharPrevA
-#define     AnsiPrevW CharPrevW
-#define     AnsiPrev WINELIB_NAME_AW(AnsiPrev)
-#define     AnsiUpperA CharUpperA
-#define     AnsiUpperW CharUpperW
-#define     AnsiUpper WINELIB_NAME_AW(AnsiUpper)
-#define     AnsiUpperBuffA CharUpperBuffA
-#define     AnsiUpperBuffW CharUpperBuffW
-#define     AnsiUpperBuff WINELIB_NAME_AW(AnsiUpperBuff)
-BOOL      WINAPI AnyPopup(void);
-BOOL      WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
-BOOL      WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
-#define     AppendMenu WINELIB_NAME_AW(AppendMenu)
-UINT        WINAPI ArrangeIconicWindows(HWND);
-HDWP        WINAPI BeginDeferWindowPos(INT);
-HDC         WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
-BOOL        WINAPI BringWindowToTop(HWND);
-LONG        WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
-LONG        WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
-#define     BroadcastSystemMessage WINELIB_NAME_AW(BroadcastSystemMessage)
-void        WINAPI CalcChildScroll(HWND, INT);
-BOOL        WINAPI CallMsgFilterA(LPMSG,INT);
-BOOL        WINAPI CallMsgFilterW(LPMSG,INT);
-#define     CallMsgFilter WINELIB_NAME_AW(CallMsgFilter)
-LRESULT     WINAPI CallNextHookEx(HHOOK,INT,WPARAM,LPARAM);
-LRESULT     WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
-#define     CallWindowProc WINELIB_NAME_AW(CallWindowProc)
-BOOL      WINAPI ChangeClipboardChain(HWND,HWND);
-BOOL      WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
-BOOL      WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
-#define     ChangeMenu WINELIB_NAME_AW(ChangeMenu)
-LPSTR       WINAPI CharLowerA(LPSTR);
-LPWSTR      WINAPI CharLowerW(LPWSTR);
-#define     CharLower WINELIB_NAME_AW(CharLower)
-DWORD       WINAPI CharLowerBuffA(LPSTR,DWORD);
-DWORD       WINAPI CharLowerBuffW(LPWSTR,DWORD);
-#define     CharLowerBuff WINELIB_NAME_AW(CharLowerBuff)
-LPSTR       WINAPI CharNextA(LPCSTR);
-LPWSTR      WINAPI CharNextW(LPCWSTR);
-#define     CharNext WINELIB_NAME_AW(CharNext)
-LPSTR       WINAPI CharNextExA(WORD,LPCSTR,DWORD);
+WINUSERAPI HKL         WINAPI ActivateKeyboardLayout(HKL,UINT);
+WINUSERAPI BOOL        WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
+WINUSERAPI BOOL        WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD);
+WINUSERAPI BOOL        WINAPI AllowSetForegroundWindow(DWORD);
+WINUSERAPI BOOL        WINAPI AnimateWindow(HWND,DWORD,DWORD);
+#define                       AnsiLowerA CharLowerA
+#define                       AnsiLowerW CharLowerW
+#define                       AnsiLower WINELIB_NAME_AW(AnsiLower)
+#define                       AnsiLowerBuffA CharLowerBuffA
+#define                       AnsiLowerBuffW CharLowerBuffW
+#define                       AnsiLowerBuff WINELIB_NAME_AW(AnsiLowerBuff)
+#define                       AnsiNextA CharNextA
+#define                       AnsiNextW CharNextW
+#define                       AnsiNext WINELIB_NAME_AW(AnsiNext)
+#define                       AnsiPrevA CharPrevA
+#define                       AnsiPrevW CharPrevW
+#define                       AnsiPrev WINELIB_NAME_AW(AnsiPrev)
+#define                       AnsiUpperA CharUpperA
+#define                       AnsiUpperW CharUpperW
+#define                       AnsiUpper WINELIB_NAME_AW(AnsiUpper)
+#define                       AnsiUpperBuffA CharUpperBuffA
+#define                       AnsiUpperBuffW CharUpperBuffW
+#define                       AnsiUpperBuff WINELIB_NAME_AW(AnsiUpperBuff)
+WINUSERAPI BOOL        WINAPI AnyPopup(void);
+WINUSERAPI BOOL        WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
+WINUSERAPI BOOL        WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
+#define                       AppendMenu WINELIB_NAME_AW(AppendMenu)
+WINUSERAPI UINT        WINAPI ArrangeIconicWindows(HWND);
+WINUSERAPI BOOL        WINAPI AttachThreadInput(DWORD,DWORD,BOOL);
+WINUSERAPI HDWP        WINAPI BeginDeferWindowPos(INT);
+WINUSERAPI HDC         WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
+WINUSERAPI BOOL        WINAPI BringWindowToTop(HWND);
+WINUSERAPI LONG        WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
+WINUSERAPI LONG        WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
+#define                       BroadcastSystemMessage WINELIB_NAME_AW(BroadcastSystemMessage)
+WINUSERAPI LONG        WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
+WINUSERAPI LONG        WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
+#define                       BroadcastSystemMessageEx WINELIB_NAME_AW(BroadcastSystemMessageEx)
+WINUSERAPI void        WINAPI CalcChildScroll(HWND, INT);
+WINUSERAPI BOOL        WINAPI CallMsgFilterA(LPMSG,INT);
+WINUSERAPI BOOL        WINAPI CallMsgFilterW(LPMSG,INT);
+#define                       CallMsgFilter WINELIB_NAME_AW(CallMsgFilter)
+WINUSERAPI LRESULT     WINAPI CallNextHookEx(HHOOK,INT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
+#define                       CallWindowProc WINELIB_NAME_AW(CallWindowProc)
+WINUSERAPI WORD        WINAPI CascadeWindows(HWND, UINT, const RECT *, UINT, const HWND *);
+WINUSERAPI BOOL        WINAPI ChangeClipboardChain(HWND,HWND);
+WINUSERAPI BOOL        WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
+WINUSERAPI BOOL        WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
+#define                       ChangeMenu WINELIB_NAME_AW(ChangeMenu)
+WINUSERAPI LPSTR       WINAPI CharLowerA(LPSTR);
+WINUSERAPI LPWSTR      WINAPI CharLowerW(LPWSTR);
+#define                       CharLower WINELIB_NAME_AW(CharLower)
+WINUSERAPI DWORD       WINAPI CharLowerBuffA(LPSTR,DWORD);
+WINUSERAPI DWORD       WINAPI CharLowerBuffW(LPWSTR,DWORD);
+#define                       CharLowerBuff WINELIB_NAME_AW(CharLowerBuff)
+WINUSERAPI LPSTR       WINAPI CharNextA(LPCSTR);
+WINUSERAPI LPWSTR      WINAPI CharNextW(LPCWSTR);
+#define                       CharNext WINELIB_NAME_AW(CharNext)
+WINUSERAPI LPSTR       WINAPI CharNextExA(WORD,LPCSTR,DWORD);
 /* no CharNextExW (doesn't make sense) */
-LPSTR       WINAPI CharPrevA(LPCSTR,LPCSTR);
-LPWSTR      WINAPI CharPrevW(LPCWSTR,LPCWSTR);
-#define     CharPrev WINELIB_NAME_AW(CharPrev)
-LPSTR       WINAPI CharPrevExA(WORD,LPCSTR,LPCSTR,DWORD);
+WINUSERAPI LPSTR       WINAPI CharPrevA(LPCSTR,LPCSTR);
+WINUSERAPI LPWSTR      WINAPI CharPrevW(LPCWSTR,LPCWSTR);
+#define                       CharPrev WINELIB_NAME_AW(CharPrev)
+WINUSERAPI LPSTR       WINAPI CharPrevExA(WORD,LPCSTR,LPCSTR,DWORD);
 /* no CharPrevExW (doesn't make sense) */
-LPSTR       WINAPI CharUpperA(LPSTR);
-LPWSTR      WINAPI CharUpperW(LPWSTR);
-#define     CharUpper WINELIB_NAME_AW(CharUpper)
-DWORD       WINAPI CharUpperBuffA(LPSTR,DWORD);
-DWORD       WINAPI CharUpperBuffW(LPWSTR,DWORD);
-#define     CharUpperBuff WINELIB_NAME_AW(CharUpperBuff)
-BOOL      WINAPI CharToOemA(LPCSTR,LPSTR);
-BOOL      WINAPI CharToOemW(LPCWSTR,LPSTR);
-#define     CharToOem WINELIB_NAME_AW(CharToOem)
-BOOL      WINAPI CharToOemBuffA(LPCSTR,LPSTR,DWORD);
-BOOL      WINAPI CharToOemBuffW(LPCWSTR,LPSTR,DWORD);
-#define     CharToOemBuff WINELIB_NAME_AW(CharToOemBuff)
-BOOL      WINAPI CheckDlgButton(HWND,INT,UINT);
-DWORD       WINAPI CheckMenuItem(HMENU,UINT,UINT);
-BOOL      WINAPI CheckMenuRadioItem(HMENU,UINT,UINT,UINT,UINT);
-BOOL      WINAPI CheckRadioButton(HWND,UINT,UINT,UINT);
-HWND      WINAPI ChildWindowFromPoint(HWND,POINT);
-HWND      WINAPI ChildWindowFromPointEx(HWND,POINT,UINT);
-BOOL      WINAPI ClientToScreen(HWND,LPPOINT);
-BOOL      WINAPI ClipCursor(const RECT*);
-BOOL      WINAPI CloseClipboard(void);
-BOOL      WINAPI CloseDesktop(HDESK);
-BOOL      WINAPI CloseWindow(HWND);
-BOOL      WINAPI CloseWindowStation(HWINSTA);
-#define     CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur)))
-HICON     WINAPI CopyIcon(HICON);
-HICON     WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT);
-BOOL      WINAPI CopyRect(RECT*,const RECT*);
-INT       WINAPI CountClipboardFormats(void);
-BOOL      WINAPI CreateCaret(HWND,HBITMAP,INT,INT);
-HCURSOR   WINAPI CreateCursor(HINSTANCE,INT,INT,INT,INT,LPCVOID,LPCVOID);
-#define     CreateDialogA(inst,ptr,hwnd,dlg) \
-           CreateDialogParamA(inst,ptr,hwnd,dlg,0)
-#define     CreateDialogW(inst,ptr,hwnd,dlg) \
-           CreateDialogParamW(inst,ptr,hwnd,dlg,0)
-#define     CreateDialog WINELIB_NAME_AW(CreateDialog)
-#define     CreateDialogIndirectA(inst,ptr,hwnd,dlg) \
-           CreateDialogIndirectParamA(inst,ptr,hwnd,dlg,0)
-#define     CreateDialogIndirectW(inst,ptr,hwnd,dlg) \
-           CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
-#define     CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
-HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,
-                                                DLGPROC,LPARAM);
-HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,
-                                                DLGPROC,LPARAM);
-#define     CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
-HWND      WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
-HWND      WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
-#define     CreateDialogParam WINELIB_NAME_AW(CreateDialogParam)
-HICON     WINAPI CreateIcon(HINSTANCE,INT,INT,BYTE,BYTE,LPCVOID,LPCVOID);
-HICON     WINAPI CreateIconFromResource(LPBYTE,UINT,BOOL,DWORD);
-HICON     WINAPI CreateIconFromResourceEx(LPBYTE,UINT,BOOL,DWORD,INT,INT,UINT);
-HMENU     WINAPI CreateMenu(void);
-HMENU     WINAPI CreatePopupMenu(void);
-#define     CreateWindowA(className,titleName,style,x,y,width,height,\
-                            parent,menu,instance,param) \
-            CreateWindowExA(0,className,titleName,style,x,y,width,height,\
-                              parent,menu,instance,param)
-#define     CreateWindowW(className,titleName,style,x,y,width,height,\
-                            parent,menu,instance,param) \
-            CreateWindowExW(0,className,titleName,style,x,y,width,height,\
-                              parent,menu,instance,param)
-#define     CreateWindow WINELIB_NAME_AW(CreateWindow)
-HWND      WINAPI CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,INT,INT,
-                                INT,INT,HWND,HMENU,HINSTANCE,LPVOID);
-HWND      WINAPI CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,INT,INT,
-                                INT,INT,HWND,HMENU,HINSTANCE,LPVOID);
-#define     CreateWindowEx WINELIB_NAME_AW(CreateWindowEx)
-HWINSTA     WINAPI CreateWindowStationA(LPSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-HWINSTA     WINAPI CreateWindowStationW(LPWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-#define     CreateWindowStation WINELIB_NAME_AW(CreateWindowStation)
-HWND      WINAPI CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,INT,INT,
-                                INT,INT,HWND,HINSTANCE,LPARAM);
-HWND      WINAPI CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,INT,INT,
-                                INT,INT,HWND,HINSTANCE,LPARAM);
-#define     CreateMDIWindow WINELIB_NAME_AW(CreateMDIWindow)
-LRESULT     WINAPI DefDlgProcA(HWND,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI DefDlgProcW(HWND,UINT,WPARAM,LPARAM);
-#define     DefDlgProc WINELIB_NAME_AW(DefDlgProc)
-HDWP      WINAPI DeferWindowPos(HDWP,HWND,HWND,INT,INT,INT,INT,UINT);
-LRESULT     WINAPI DefFrameProcA(HWND,HWND,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI DefFrameProcW(HWND,HWND,UINT,WPARAM,LPARAM);
-#define     DefFrameProc WINELIB_NAME_AW(DefFrameProc)
-#define     DefHookProc(code,wparam,lparam,phhook) \
-            CallNextHookEx(*(phhook),code,wparam,lparam)
-LRESULT     WINAPI DefMDIChildProcA(HWND,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI DefMDIChildProcW(HWND,UINT,WPARAM,LPARAM);
-#define     DefMDIChildProc WINELIB_NAME_AW(DefMDIChildProc)
-LRESULT     WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM);
-#define     DefWindowProc WINELIB_NAME_AW(DefWindowProc)
-BOOL      WINAPI DeleteMenu(HMENU,UINT,UINT);
-BOOL      WINAPI DestroyCaret(void);
-BOOL      WINAPI DestroyCursor(HCURSOR);
-BOOL      WINAPI DestroyIcon(HICON);
-BOOL      WINAPI DestroyMenu(HMENU);
-BOOL      WINAPI DestroyWindow(HWND);
-#define     DialogBoxA(inst,template,owner,func) \
-            DialogBoxParamA(inst,template,owner,func,0)
-#define     DialogBoxW(inst,template,owner,func) \
-            DialogBoxParamW(inst,template,owner,func,0)
-#define     DialogBox WINELIB_NAME_AW(DialogBox)
-#define     DialogBoxIndirectA(inst,template,owner,func) \
-            DialogBoxIndirectParamA(inst,template,owner,func,0)
-#define     DialogBoxIndirectW(inst,template,owner,func) \
-            DialogBoxIndirectParamW(inst,template,owner,func,0)
-#define     DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
-INT_PTR   WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
-INT_PTR   WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
-#define     DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
-INT_PTR   WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
-INT_PTR   WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
-#define     DialogBoxParam WINELIB_NAME_AW(DialogBoxParam)
-LONG        WINAPI DispatchMessageA(const MSG*);
-LONG        WINAPI DispatchMessageW(const MSG*);
-#define     DispatchMessage WINELIB_NAME_AW(DispatchMessage)
-INT       WINAPI DlgDirListA(HWND,LPSTR,INT,INT,UINT);
-INT       WINAPI DlgDirListW(HWND,LPWSTR,INT,INT,UINT);
-#define     DlgDirList WINELIB_NAME_AW(DlgDirList)
-INT       WINAPI DlgDirListComboBoxA(HWND,LPSTR,INT,INT,UINT);
-INT       WINAPI DlgDirListComboBoxW(HWND,LPWSTR,INT,INT,UINT);
-#define     DlgDirListComboBox WINELIB_NAME_AW(DlgDirListComboBox)
-BOOL      WINAPI DlgDirSelectComboBoxExA(HWND,LPSTR,INT,INT);
-BOOL      WINAPI DlgDirSelectComboBoxExW(HWND,LPWSTR,INT,INT);
-#define     DlgDirSelectComboBoxEx WINELIB_NAME_AW(DlgDirSelectComboBoxEx)
-BOOL      WINAPI DlgDirSelectExA(HWND,LPSTR,INT,INT);
-BOOL      WINAPI DlgDirSelectExW(HWND,LPWSTR,INT,INT);
-#define     DlgDirSelectEx WINELIB_NAME_AW(DlgDirSelectEx)
-BOOL      WINAPI DragDetect(HWND,POINT);
-DWORD     WINAPI DragObject(HWND,HWND,UINT,ULONG_PTR,HCURSOR);
-BOOL      WINAPI DrawAnimatedRects(HWND,int,const RECT*,const RECT*);
-BOOL      WINAPI DrawCaption(HWND,HDC,const RECT*,UINT);
-BOOL      WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
-BOOL      WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT);
-#define     DrawCaptionTemp WINELIB_NAME_AW(DrawCaptionTemp)
-BOOL        WINAPI DrawEdge(HDC,LPRECT,UINT,UINT);
-BOOL        WINAPI DrawFocusRect(HDC,const RECT*);
-BOOL        WINAPI DrawFrameControl(HDC,LPRECT,UINT,UINT);
-BOOL        WINAPI DrawIcon(HDC,INT,INT,HICON);
-BOOL        WINAPI DrawIconEx(HDC,INT,INT,HICON,INT,INT,UINT,HBRUSH,UINT);
-BOOL        WINAPI DrawMenuBar(HWND);
-BOOL        WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
-BOOL        WINAPI DrawStateW(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,INT,INT,INT,INT,UINT);
-#define     DrawState WINELIB_NAME_AW(DrawState)
-INT         WINAPI DrawTextA(HDC,LPCSTR,INT,LPRECT,UINT);
-INT         WINAPI DrawTextW(HDC,LPCWSTR,INT,LPRECT,UINT);
-#define     DrawText WINELIB_NAME_AW(DrawText)
-INT         WINAPI DrawTextExA(HDC,LPSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
-INT         WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
-#define     DrawTextEx WINELIB_NAME_AW(DrawTextEx)
-BOOL        WINAPI EmptyClipboard(void);
-UINT        WINAPI EnableMenuItem(HMENU,UINT,UINT);
-BOOL        WINAPI EnableScrollBar(HWND,INT,UINT);
-BOOL        WINAPI EnableWindow(HWND,BOOL);
-BOOL        WINAPI EndDeferWindowPos(HDWP);
-BOOL        WINAPI EndDialog(HWND,INT_PTR);
-BOOL        WINAPI EndPaint(HWND,const PAINTSTRUCT*);
-BOOL        WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM);
-UINT        WINAPI EnumClipboardFormats(UINT);
-INT         WINAPI EnumPropsA(HWND,PROPENUMPROCA);
-INT         WINAPI EnumPropsW(HWND,PROPENUMPROCW);
-#define     EnumProps WINELIB_NAME_AW(EnumProps)
-BOOL      WINAPI EnumWindows(WNDENUMPROC,LPARAM);
-BOOL        WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM);
-BOOL        WINAPI EnumWindowStationsW(WINSTAENUMPROCW,LPARAM);
-#define     EnumWindowStations WINELIB_NAME_AW(EnumWindowStations)
-BOOL      WINAPI EqualRect(const RECT*,const RECT*);
-INT       WINAPI ExcludeUpdateRgn(HDC,HWND);
-#define     ExitWindows(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff)
-INT       WINAPI FillRect(HDC,const RECT*,HBRUSH);
-HWND      WINAPI FindWindowA(LPCSTR,LPCSTR);
-HWND      WINAPI FindWindowW(LPCWSTR,LPCWSTR);
-#define     FindWindow WINELIB_NAME_AW(FindWindow)
-HWND      WINAPI FindWindowExA(HWND,HWND,LPCSTR,LPCSTR);
-HWND      WINAPI FindWindowExW(HWND,HWND,LPCWSTR,LPCWSTR);
-#define     FindWindowEx WINELIB_NAME_AW(FindWindowEx)
-BOOL        WINAPI FlashWindow(HWND,BOOL);
-BOOL        WINAPI FlashWindowEx(PFLASHWINFO);
-INT         WINAPI FrameRect(HDC,const RECT*,HBRUSH);
-HWND        WINAPI GetActiveWindow(void);
-HWND        WINAPI GetAncestor(HWND,UINT);
-DWORD       WINAPI GetAppCompatFlags(HTASK);
-SHORT       WINAPI GetAsyncKeyState(INT);
-HWND        WINAPI GetCapture(void);
-UINT        WINAPI GetCaretBlinkTime(void);
-BOOL        WINAPI GetCaretPos(LPPOINT);
-BOOL        WINAPI GetClassInfoA(HINSTANCE,LPCSTR,WNDCLASSA *);
-BOOL        WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,WNDCLASSW *);
-#define     GetClassInfo WINELIB_NAME_AW(GetClassInfo)
-BOOL      WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,WNDCLASSEXA *);
-BOOL      WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,WNDCLASSEXW *);
-#define     GetClassInfoEx WINELIB_NAME_AW(GetClassInfoEx)
-LONG        WINAPI GetClassLongA(HWND,INT);
-LONG        WINAPI GetClassLongW(HWND,INT);
-#define     GetClassLong WINELIB_NAME_AW(GetClassLong)
-#define     GetClassLongPtrA GetClassLongA
-#define     GetClassLongPtrW GetClassLongW
-#define     GetClassLongPtr WINELIB_NAME_AW(GetClassLongPtr)
-INT         WINAPI GetClassNameA(HWND,LPSTR,INT);
-INT         WINAPI GetClassNameW(HWND,LPWSTR,INT);
-#define     GetClassName WINELIB_NAME_AW(GetClassName)
-WORD        WINAPI GetClassWord(HWND,INT);
-BOOL        WINAPI GetClientRect(HWND,LPRECT);
-HANDLE      WINAPI GetClipboardData(UINT);
-INT         WINAPI GetClipboardFormatNameA(UINT,LPSTR,INT);
-INT         WINAPI GetClipboardFormatNameW(UINT,LPWSTR,INT);
-#define     GetClipboardFormatName WINELIB_NAME_AW(GetClipboardFormatName)
-HWND        WINAPI GetClipboardOwner(void);
-HWND        WINAPI GetClipboardViewer(void);
-BOOL        WINAPI GetClipCursor(LPRECT);
-HCURSOR     WINAPI GetCursor(void);
-BOOL        WINAPI GetCursorInfo(PCURSORINFO);
-BOOL        WINAPI GetCursorPos(LPPOINT);
-HDC         WINAPI GetDC(HWND);
-HDC         WINAPI GetDCEx(HWND,HRGN,DWORD);
-HWND        WINAPI GetDesktopWindow(void);
-INT         WINAPI GetDlgCtrlID(HWND);
-HWND        WINAPI GetDlgItem(HWND,INT);
-UINT        WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);
-INT         WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT);
-INT         WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT);
-#define     GetDlgItemText WINELIB_NAME_AW(GetDlgItemText)
-UINT        WINAPI GetDoubleClickTime(void);
-HWND        WINAPI GetFocus(void);
-HWND        WINAPI GetForegroundWindow(void);
-BOOL        WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*);
-BOOL        WINAPI GetInputState(void);
-UINT        WINAPI GetInternalWindowPos(HWND,LPRECT,LPPOINT);
-UINT        WINAPI GetKBCodePage(void);
-INT         WINAPI GetKeyboardType(INT);
-INT         WINAPI GetKeyNameTextA(LONG,LPSTR,INT);
-INT         WINAPI GetKeyNameTextW(LONG,LPWSTR,INT);
-#define     GetKeyNameText WINELIB_NAME_AW(GetKeyNameText)
-BOOL        WINAPI GetKeyboardLayoutNameA(LPSTR);
-BOOL        WINAPI GetKeyboardLayoutNameW(LPWSTR);
-#define     GetKeyboardLayoutName WINELIB_NAME_AW(GetKeyboardLayoutName)
-SHORT       WINAPI GetKeyState(INT);
-HWND      WINAPI GetLastActivePopup(HWND);
-HMENU     WINAPI GetMenu(HWND);
-INT       WINAPI GetMenuItemCount(HMENU);
-UINT      WINAPI GetMenuItemID(HMENU,INT);
-BOOL      WINAPI GetMenuItemRect(HWND,HMENU,UINT,LPRECT);
-UINT      WINAPI GetMenuState(HMENU,UINT,UINT);
-INT       WINAPI GetMenuStringA(HMENU,UINT,LPSTR,INT,UINT);
-INT       WINAPI GetMenuStringW(HMENU,UINT,LPWSTR,INT,UINT);
-#define     GetMenuString WINELIB_NAME_AW(GetMenuString)
-BOOL      WINAPI GetMessageA(LPMSG,HWND,UINT,UINT);
-BOOL      WINAPI GetMessageW(LPMSG,HWND,UINT,UINT);
-#define     GetMessage WINELIB_NAME_AW(GetMessage)
-HWND      WINAPI GetNextDlgGroupItem(HWND,HWND,BOOL);
-HWND      WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
-#define     GetNextWindow GetWindow
-HWND      WINAPI GetOpenClipboardWindow(void);
-HWND      WINAPI GetParent(HWND);
-INT       WINAPI GetPriorityClipboardFormat(UINT*,INT);
-BOOL      WINAPI GetProcessDefaultLayout(DWORD*);
-HANDLE    WINAPI GetPropA(HWND,LPCSTR);
-HANDLE    WINAPI GetPropW(HWND,LPCWSTR);
-#define     GetProp WINELIB_NAME_AW(GetProp)
-DWORD       WINAPI GetQueueStatus(UINT);
-BOOL      WINAPI GetScrollInfo(HWND,INT,LPSCROLLINFO);
-INT       WINAPI GetScrollPos(HWND,INT);
-BOOL      WINAPI GetScrollRange(HWND,INT,LPINT,LPINT);
-HWND      WINAPI GetShellWindow(void);
-HMENU     WINAPI GetSubMenu(HMENU,INT);
-HBRUSH    WINAPI GetSysColorBrush(INT);
-#define     GetSysModalWindow() ((HWND)0)
-HMENU     WINAPI GetSystemMenu(HWND,BOOL);
-INT       WINAPI GetSystemMetrics(INT);
-DWORD       WINAPI GetTabbedTextExtentA(HDC,LPCSTR,INT,INT,const INT*);
-DWORD       WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT*);
-#define     GetTabbedTextExtent WINELIB_NAME_AW(GetTabbedTextExtent)
-BOOL        WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
-HWND      WINAPI GetTopWindow(HWND);
-BOOL      WINAPI GetUpdateRect(HWND,LPRECT,BOOL);
-INT       WINAPI GetUpdateRgn(HWND,HRGN,BOOL);
-BOOL        WINAPI GetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD,LPDWORD);
-BOOL        WINAPI GetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD,LPDWORD);
-#define     GetUserObjectInformation WINELIB_NAME_AW(GetUserObjectInformation)
-HWND        WINAPI GetWindow(HWND,UINT);
-HDC         WINAPI GetWindowDC(HWND);
-BOOL        WINAPI GetWindowInfo(HWND, PWINDOWINFO);
-LONG        WINAPI GetWindowLongA(HWND,INT);
-LONG        WINAPI GetWindowLongW(HWND,INT);
-#define     GetWindowLong WINELIB_NAME_AW(GetWindowLong)
+WINUSERAPI LPSTR       WINAPI CharUpperA(LPSTR);
+WINUSERAPI LPWSTR      WINAPI CharUpperW(LPWSTR);
+#define                       CharUpper WINELIB_NAME_AW(CharUpper)
+WINUSERAPI DWORD       WINAPI CharUpperBuffA(LPSTR,DWORD);
+WINUSERAPI DWORD       WINAPI CharUpperBuffW(LPWSTR,DWORD);
+#define                       CharUpperBuff WINELIB_NAME_AW(CharUpperBuff)
+WINUSERAPI BOOL        WINAPI CharToOemA(LPCSTR,LPSTR);
+WINUSERAPI BOOL        WINAPI CharToOemW(LPCWSTR,LPSTR);
+#define                       CharToOem WINELIB_NAME_AW(CharToOem)
+WINUSERAPI BOOL        WINAPI CharToOemBuffA(LPCSTR,LPSTR,DWORD);
+WINUSERAPI BOOL        WINAPI CharToOemBuffW(LPCWSTR,LPSTR,DWORD);
+#define                       CharToOemBuff WINELIB_NAME_AW(CharToOemBuff)
+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(const RECT*);
+WINUSERAPI BOOL        WINAPI CloseClipboard(void);
+WINUSERAPI BOOL        WINAPI CloseDesktop(HDESK);
+WINUSERAPI BOOL        WINAPI CloseWindow(HWND);
+WINUSERAPI BOOL        WINAPI CloseWindowStation(HWINSTA);
+WINUSERAPI INT         WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,INT);
+WINUSERAPI INT         WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,INT);
+#define                       CopyAcceleratorTable WINELIB_NAME_AW(CopyAcceleratorTable)
+#define                       CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur)))
+WINUSERAPI HICON       WINAPI CopyIcon(HICON);
+WINUSERAPI HANDLE      WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT);
+WINUSERAPI BOOL        WINAPI CopyRect(RECT*,const RECT*);
+WINUSERAPI INT         WINAPI CountClipboardFormats(void);
+WINUSERAPI HACCEL      WINAPI CreateAcceleratorTableA(LPACCEL,INT);
+WINUSERAPI HACCEL      WINAPI CreateAcceleratorTableW(LPACCEL,INT);
+#define                       CreateAcceleratorTable WINELIB_NAME_AW(CreateAcceleratorTable)
+WINUSERAPI HICON       WINAPI CreateIconIndirect(PICONINFO);
+WINUSERAPI BOOL        WINAPI CreateCaret(HWND,HBITMAP,INT,INT);
+WINUSERAPI HCURSOR     WINAPI CreateCursor(HINSTANCE,INT,INT,INT,INT,LPCVOID,LPCVOID);
+#define                       CreateDialogA(inst,ptr,hwnd,dlg) CreateDialogParamA(inst,ptr,hwnd,dlg,0)
+#define                       CreateDialogW(inst,ptr,hwnd,dlg) CreateDialogParamW(inst,ptr,hwnd,dlg,0)
+#define                       CreateDialog WINELIB_NAME_AW(CreateDialog)
+#define                       CreateDialogIndirectA(inst,ptr,hwnd,dlg) CreateDialogIndirectParamA(inst,ptr,hwnd,dlg,0)
+#define                       CreateDialogIndirectW(inst,ptr,hwnd,dlg) CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
+#define                       CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
+WINUSERAPI HWND        WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
+WINUSERAPI HWND        WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
+#define                       CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
+WINUSERAPI HWND        WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
+WINUSERAPI HWND        WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
+#define                       CreateDialogParam WINELIB_NAME_AW(CreateDialogParam)
+WINUSERAPI HICON       WINAPI CreateIcon(HINSTANCE,INT,INT,BYTE,BYTE,LPCVOID,LPCVOID);
+WINUSERAPI HICON       WINAPI CreateIconFromResource(LPBYTE,UINT,BOOL,DWORD);
+WINUSERAPI HICON       WINAPI CreateIconFromResourceEx(LPBYTE,UINT,BOOL,DWORD,INT,INT,UINT);
+WINUSERAPI HMENU       WINAPI CreateMenu(void);
+WINUSERAPI HMENU       WINAPI CreatePopupMenu(void);
+#define                       CreateWindowA(className,titleName,style,x,y,width,height,parent,menu,instance,param) CreateWindowExA(0,className,titleName,style,x,y,width,height,parent,menu,instance,param)
+#define                       CreateWindowW(className,titleName,style,x,y,width,height,parent,menu,instance,param) CreateWindowExW(0,className,titleName,style,x,y,width,height,parent,menu,instance,param)
+#define                       CreateWindow WINELIB_NAME_AW(CreateWindow)
+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                       CreateWindowEx WINELIB_NAME_AW(CreateWindowEx)
+WINUSERAPI HWINSTA     WINAPI CreateWindowStationA(LPCSTR,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+WINUSERAPI HWINSTA     WINAPI CreateWindowStationW(LPCWSTR,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+#define                       CreateWindowStation WINELIB_NAME_AW(CreateWindowStation)
+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);
+#define                       CreateMDIWindow WINELIB_NAME_AW(CreateMDIWindow)
+WINUSERAPI LRESULT     WINAPI DefDlgProcA(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI DefDlgProcW(HWND,UINT,WPARAM,LPARAM);
+#define                       DefDlgProc WINELIB_NAME_AW(DefDlgProc)
+WINUSERAPI HDWP        WINAPI DeferWindowPos(HDWP,HWND,HWND,INT,INT,INT,INT,UINT);
+WINUSERAPI LRESULT     WINAPI DefFrameProcA(HWND,HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI DefFrameProcW(HWND,HWND,UINT,WPARAM,LPARAM);
+#define                       DefFrameProc WINELIB_NAME_AW(DefFrameProc)
+#define                       DefHookProc(code,wparam,lparam,phhook) CallNextHookEx(*(phhook),code,wparam,lparam)
+WINUSERAPI LRESULT     WINAPI DefMDIChildProcA(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI DefMDIChildProcW(HWND,UINT,WPARAM,LPARAM);
+#define                       DefMDIChildProc WINELIB_NAME_AW(DefMDIChildProc)
+WINUSERAPI LRESULT     WINAPI DefRawInputProc(PRAWINPUT*,INT,UINT);
+WINUSERAPI LRESULT     WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM);
+#define                       DefWindowProc WINELIB_NAME_AW(DefWindowProc)
+WINUSERAPI BOOL        WINAPI DeleteMenu(HMENU,UINT,UINT);
+WINUSERAPI BOOL        WINAPI DestroyAcceleratorTable(HACCEL);
+WINUSERAPI BOOL        WINAPI DestroyCaret(void);
+WINUSERAPI BOOL        WINAPI DestroyCursor(HCURSOR);
+WINUSERAPI BOOL        WINAPI DestroyIcon(HICON);
+WINUSERAPI BOOL        WINAPI DestroyMenu(HMENU);
+WINUSERAPI BOOL        WINAPI DestroyWindow(HWND);
+#define                       DialogBoxA(inst,template,owner,func) DialogBoxParamA(inst,template,owner,func,0)
+#define                       DialogBoxW(inst,template,owner,func) DialogBoxParamW(inst,template,owner,func,0)
+#define                       DialogBox WINELIB_NAME_AW(DialogBox)
+#define                       DialogBoxIndirectA(inst,template,owner,func) DialogBoxIndirectParamA(inst,template,owner,func,0)
+#define                       DialogBoxIndirectW(inst,template,owner,func) DialogBoxIndirectParamW(inst,template,owner,func,0)
+#define                       DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
+WINUSERAPI INT_PTR     WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
+WINUSERAPI INT_PTR     WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
+#define                       DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
+WINUSERAPI INT_PTR     WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
+WINUSERAPI INT_PTR     WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
+#define                       DialogBoxParam WINELIB_NAME_AW(DialogBoxParam)
+WINUSERAPI LRESULT     WINAPI DispatchMessageA(const MSG*);
+WINUSERAPI LRESULT     WINAPI DispatchMessageW(const MSG*);
+#define                       DispatchMessage WINELIB_NAME_AW(DispatchMessage)
+WINUSERAPI INT         WINAPI DlgDirListA(HWND,LPSTR,INT,INT,UINT);
+WINUSERAPI INT         WINAPI DlgDirListW(HWND,LPWSTR,INT,INT,UINT);
+#define                       DlgDirList WINELIB_NAME_AW(DlgDirList)
+WINUSERAPI INT         WINAPI DlgDirListComboBoxA(HWND,LPSTR,INT,INT,UINT);
+WINUSERAPI INT         WINAPI DlgDirListComboBoxW(HWND,LPWSTR,INT,INT,UINT);
+#define                       DlgDirListComboBox WINELIB_NAME_AW(DlgDirListComboBox)
+WINUSERAPI BOOL        WINAPI DlgDirSelectComboBoxExA(HWND,LPSTR,INT,INT);
+WINUSERAPI BOOL        WINAPI DlgDirSelectComboBoxExW(HWND,LPWSTR,INT,INT);
+#define                       DlgDirSelectComboBoxEx WINELIB_NAME_AW(DlgDirSelectComboBoxEx)
+WINUSERAPI BOOL        WINAPI DlgDirSelectExA(HWND,LPSTR,INT,INT);
+WINUSERAPI BOOL        WINAPI DlgDirSelectExW(HWND,LPWSTR,INT,INT);
+#define                       DlgDirSelectEx WINELIB_NAME_AW(DlgDirSelectEx)
+WINUSERAPI BOOL        WINAPI DragDetect(HWND,POINT);
+WINUSERAPI DWORD       WINAPI DragObject(HWND,HWND,UINT,ULONG_PTR,HCURSOR);
+WINUSERAPI BOOL        WINAPI DrawAnimatedRects(HWND,int,const RECT*,const RECT*);
+WINUSERAPI BOOL        WINAPI DrawCaption(HWND,HDC,const RECT*,UINT);
+WINUSERAPI BOOL        WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT);
+WINUSERAPI BOOL        WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT);
+#define                       DrawCaptionTemp WINELIB_NAME_AW(DrawCaptionTemp)
+WINUSERAPI BOOL        WINAPI DrawEdge(HDC,LPRECT,UINT,UINT);
+WINUSERAPI BOOL        WINAPI DrawFocusRect(HDC,const RECT*);
+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);
+#define                       DrawState WINELIB_NAME_AW(DrawState)
+WINUSERAPI INT         WINAPI DrawTextA(HDC,LPCSTR,INT,LPRECT,UINT);
+WINUSERAPI INT         WINAPI DrawTextW(HDC,LPCWSTR,INT,LPRECT,UINT);
+#define                       DrawText WINELIB_NAME_AW(DrawText)
+WINUSERAPI INT         WINAPI DrawTextExA(HDC,LPSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
+WINUSERAPI INT         WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
+#define                       DrawTextEx WINELIB_NAME_AW(DrawTextEx)
+WINUSERAPI BOOL        WINAPI EmptyClipboard(void);
+WINUSERAPI BOOL        WINAPI EnableMenuItem(HMENU,UINT,UINT);
+WINUSERAPI BOOL        WINAPI EnableScrollBar(HWND,UINT,UINT);
+WINUSERAPI BOOL        WINAPI EnableWindow(HWND,BOOL);
+WINUSERAPI BOOL        WINAPI EndDeferWindowPos(HDWP);
+WINUSERAPI BOOL        WINAPI EndDialog(HWND,INT_PTR);
+WINUSERAPI BOOL        WINAPI EndMenu(void);
+WINUSERAPI BOOL        WINAPI EndPaint(HWND,const PAINTSTRUCT*);
+WINUSERAPI BOOL        WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM);
+WINUSERAPI UINT        WINAPI EnumClipboardFormats(UINT);
+WINUSERAPI BOOL        WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
+WINUSERAPI BOOL        WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
+#define                       EnumDesktops WINELIB_NAME_AW(EnumDesktops)
+WINUSERAPI BOOL        WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM);
+WINUSERAPI BOOL        WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
+WINUSERAPI INT         WINAPI EnumPropsA(HWND,PROPENUMPROCA);
+WINUSERAPI INT         WINAPI EnumPropsW(HWND,PROPENUMPROCW);
+#define                       EnumProps WINELIB_NAME_AW(EnumProps)
+WINUSERAPI INT         WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
+WINUSERAPI INT         WINAPI EnumPropsExW(HWND,PROPENUMPROCEXW,LPARAM);
+#define                       EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)
+WINUSERAPI BOOL        WINAPI EnumThreadWindows(DWORD,WNDENUMPROC,LPARAM);
+WINUSERAPI BOOL        WINAPI EnumWindows(WNDENUMPROC,LPARAM);
+WINUSERAPI BOOL        WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM);
+WINUSERAPI BOOL        WINAPI EnumWindowStationsW(WINSTAENUMPROCW,LPARAM);
+#define                       EnumWindowStations WINELIB_NAME_AW(EnumWindowStations)
+WINUSERAPI BOOL        WINAPI EqualRect(const RECT*,const RECT*);
+WINUSERAPI INT         WINAPI ExcludeUpdateRgn(HDC,HWND);
+#define                       ExitWindows(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff)
+WINUSERAPI BOOL        WINAPI ExitWindowsEx(UINT,DWORD);
+WINUSERAPI INT         WINAPI FillRect(HDC,const RECT*,HBRUSH);
+WINUSERAPI HWND        WINAPI FindWindowA(LPCSTR,LPCSTR);
+WINUSERAPI HWND        WINAPI FindWindowW(LPCWSTR,LPCWSTR);
+#define                       FindWindow WINELIB_NAME_AW(FindWindow)
+WINUSERAPI HWND        WINAPI FindWindowExA(HWND,HWND,LPCSTR,LPCSTR);
+WINUSERAPI HWND        WINAPI FindWindowExW(HWND,HWND,LPCWSTR,LPCWSTR);
+#define                       FindWindowEx WINELIB_NAME_AW(FindWindowEx)
+WINUSERAPI BOOL        WINAPI FlashWindow(HWND,BOOL);
+WINUSERAPI BOOL        WINAPI FlashWindowEx(PFLASHWINFO);
+WINUSERAPI INT         WINAPI FrameRect(HDC,const RECT*,HBRUSH);
+WINUSERAPI HWND        WINAPI GetActiveWindow(void);
+WINUSERAPI BOOL        WINAPI GetAltTabInfoA(HWND,INT,PALTTABINFO,LPSTR,UINT);
+WINUSERAPI BOOL        WINAPI GetAltTabInfoW(HWND,INT,PALTTABINFO,LPWSTR,UINT);
+#define                       GetAltTabInfo WINELIB_NAME_AW(GetAltTabInfo)
+WINUSERAPI HWND        WINAPI GetAncestor(HWND,UINT);
+WINUSERAPI DWORD       WINAPI GetAppCompatFlags(HTASK);
+WINUSERAPI SHORT       WINAPI GetAsyncKeyState(INT);
+WINUSERAPI HWND        WINAPI GetCapture(void);
+WINUSERAPI UINT        WINAPI GetCaretBlinkTime(void);
+WINUSERAPI BOOL        WINAPI GetCaretPos(LPPOINT);
+WINUSERAPI BOOL        WINAPI GetClassInfoA(HINSTANCE,LPCSTR,WNDCLASSA *);
+WINUSERAPI BOOL        WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,WNDCLASSW *);
+#define                       GetClassInfo WINELIB_NAME_AW(GetClassInfo)
+WINUSERAPI BOOL        WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,WNDCLASSEXA *);
+WINUSERAPI BOOL        WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,WNDCLASSEXW *);
+#define                       GetClassInfoEx WINELIB_NAME_AW(GetClassInfoEx)
+WINUSERAPI DWORD       WINAPI GetClassLongA(HWND,INT);
+WINUSERAPI DWORD       WINAPI GetClassLongW(HWND,INT);
+#define                       GetClassLong WINELIB_NAME_AW(GetClassLong)
+#ifdef _WIN64
+WINUSERAPI ULONG_PTR   WINAPI GetClassLongPtrA(HWND,INT);
+WINUSERAPI ULONG_PTR   WINAPI GetClassLongPtrW(HWND,INT);
+#else
+#define                       GetClassLongPtrA GetClassLongA
+#define                       GetClassLongPtrW GetClassLongW
+#endif
+#define                       GetClassLongPtr WINELIB_NAME_AW(GetClassLongPtr)
+WINUSERAPI INT         WINAPI GetClassNameA(HWND,LPSTR,INT);
+WINUSERAPI INT         WINAPI GetClassNameW(HWND,LPWSTR,INT);
+#define                       GetClassName WINELIB_NAME_AW(GetClassName)
+WINUSERAPI WORD        WINAPI GetClassWord(HWND,INT);
+WINUSERAPI BOOL        WINAPI GetClientRect(HWND,LPRECT);
+WINUSERAPI HANDLE      WINAPI GetClipboardData(UINT);
+WINUSERAPI INT         WINAPI GetClipboardFormatNameA(UINT,LPSTR,INT);
+WINUSERAPI INT         WINAPI GetClipboardFormatNameW(UINT,LPWSTR,INT);
+#define                       GetClipboardFormatName WINELIB_NAME_AW(GetClipboardFormatName)
+WINUSERAPI HWND        WINAPI GetClipboardOwner(void);
+WINUSERAPI DWORD       WINAPI GetClipboardSequenceNumber(VOID);
+WINUSERAPI HWND        WINAPI GetClipboardViewer(void);
+WINUSERAPI BOOL        WINAPI GetClipCursor(LPRECT);
+WINUSERAPI BOOL        WINAPI GetComboBoxInfo(HWND,PCOMBOBOXINFO);
+WINUSERAPI HCURSOR     WINAPI GetCursor(void);
+WINUSERAPI BOOL        WINAPI GetCursorInfo(PCURSORINFO);
+WINUSERAPI BOOL        WINAPI GetCursorPos(LPPOINT);
+WINUSERAPI HDC         WINAPI GetDC(HWND);
+WINUSERAPI HDC         WINAPI GetDCEx(HWND,HRGN,DWORD);
+WINUSERAPI HWND        WINAPI GetDesktopWindow(void);
+WINUSERAPI DWORD       WINAPI GetDialogBaseUnits(void);
+WINUSERAPI INT         WINAPI GetDlgCtrlID(HWND);
+WINUSERAPI HWND        WINAPI GetDlgItem(HWND,INT);
+WINUSERAPI UINT        WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);
+WINUSERAPI UINT        WINAPI GetDlgItemTextA(HWND,INT,LPSTR,INT);
+WINUSERAPI UINT        WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT);
+#define                       GetDlgItemText WINELIB_NAME_AW(GetDlgItemText)
+WINUSERAPI UINT        WINAPI GetDoubleClickTime(void);
+WINUSERAPI HWND        WINAPI GetFocus(void);
+WINUSERAPI HWND        WINAPI GetForegroundWindow(void);
+WINUSERAPI BOOL        WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*);
+WINUSERAPI BOOL        WINAPI GetIconInfo(HICON,PICONINFO);
+WINUSERAPI BOOL        WINAPI GetInputState(void);
+WINUSERAPI UINT        WINAPI GetInternalWindowPos(HWND,LPRECT,LPPOINT);
+WINUSERAPI UINT        WINAPI GetKBCodePage(void);
+WINUSERAPI HKL         WINAPI GetKeyboardLayout(DWORD);
+WINUSERAPI UINT        WINAPI GetKeyboardLayoutList(INT,HKL *);
+WINUSERAPI BOOL        WINAPI GetKeyboardState(LPBYTE);
+WINUSERAPI INT         WINAPI GetKeyboardType(INT);
+WINUSERAPI INT         WINAPI GetKeyNameTextA(LONG,LPSTR,INT);
+WINUSERAPI INT         WINAPI GetKeyNameTextW(LONG,LPWSTR,INT);
+#define                       GetKeyNameText WINELIB_NAME_AW(GetKeyNameText)
+WINUSERAPI BOOL        WINAPI GetKeyboardLayoutNameA(LPSTR);
+WINUSERAPI BOOL        WINAPI GetKeyboardLayoutNameW(LPWSTR);
+#define                       GetKeyboardLayoutName WINELIB_NAME_AW(GetKeyboardLayoutName)
+WINUSERAPI SHORT       WINAPI GetKeyState(INT);
+WINUSERAPI HWND        WINAPI GetLastActivePopup(HWND);
+WINUSERAPI BOOL        WINAPI GetLastInputInfo(PLASTINPUTINFO);
+WINUSERAPI UINT        WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT);
+WINUSERAPI UINT        WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT);
+WINUSERAPI UINT        WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT);
+WINUSERAPI UINT        WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT);
+#define                       GetRawInputDeviceInfo WINELIB_NAME_AW(GetRawInputDeviceInfo)
+WINUSERAPI UINT        WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST,PUINT,UINT);
+WINUSERAPI BOOL        WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*);
+WINUSERAPI HMENU       WINAPI GetMenu(HWND);
+WINUSERAPI BOOL        WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);
+WINUSERAPI DWORD       WINAPI GetMenuCheckMarkDimensions(void);
+WINUSERAPI DWORD       WINAPI GetMenuContextHelpId(HMENU);
+WINUSERAPI UINT        WINAPI GetMenuDefaultItem(HMENU,UINT,UINT);
+WINUSERAPI BOOL        WINAPI GetMenuInfo(HMENU,LPMENUINFO);
+WINUSERAPI INT         WINAPI GetMenuItemCount(HMENU);
+WINUSERAPI UINT        WINAPI GetMenuItemID(HMENU,INT);
+WINUSERAPI BOOL        WINAPI GetMenuItemInfoA(HMENU,UINT,BOOL,MENUITEMINFOA*);
+WINUSERAPI BOOL        WINAPI GetMenuItemInfoW(HMENU,UINT,BOOL,MENUITEMINFOW*);
+#define                       GetMenuItemInfo WINELIB_NAME_AW(GetMenuItemInfo)
+WINUSERAPI BOOL        WINAPI GetMenuItemRect(HWND,HMENU,UINT,LPRECT);
+WINUSERAPI UINT        WINAPI GetMenuState(HMENU,UINT,UINT);
+WINUSERAPI INT         WINAPI GetMenuStringA(HMENU,UINT,LPSTR,INT,UINT);
+WINUSERAPI INT         WINAPI GetMenuStringW(HMENU,UINT,LPWSTR,INT,UINT);
+#define                       GetMenuString WINELIB_NAME_AW(GetMenuString)
+WINUSERAPI BOOL        WINAPI GetMessageA(LPMSG,HWND,UINT,UINT);
+WINUSERAPI BOOL        WINAPI GetMessageW(LPMSG,HWND,UINT,UINT);
+#define                       GetMessage WINELIB_NAME_AW(GetMessage)
+WINUSERAPI LPARAM      WINAPI GetMessageExtraInfo(void);
+WINUSERAPI DWORD       WINAPI GetMessagePos(void);
+WINUSERAPI LONG        WINAPI GetMessageTime(void);
+WINUSERAPI BOOL        WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO);
+WINUSERAPI BOOL        WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO);
+#define                       GetMonitorInfo WINELIB_NAME_AW(GetMonitorInfo)
+WINUSERAPI HWND        WINAPI GetNextDlgGroupItem(HWND,HWND,BOOL);
+WINUSERAPI HWND        WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
+#define                       GetNextWindow GetWindow
+WINUSERAPI HWND        WINAPI GetOpenClipboardWindow(void);
+WINUSERAPI HWND        WINAPI GetParent(HWND);
+WINUSERAPI INT         WINAPI GetPriorityClipboardFormat(UINT*,INT);
+WINUSERAPI BOOL        WINAPI GetProcessDefaultLayout(DWORD*);
+WINUSERAPI HANDLE      WINAPI GetPropA(HWND,LPCSTR);
+WINUSERAPI HANDLE      WINAPI GetPropW(HWND,LPCWSTR);
+#define                       GetProp WINELIB_NAME_AW(GetProp)
+WINUSERAPI DWORD       WINAPI GetQueueStatus(UINT);
+WINUSERAPI BOOL        WINAPI GetScrollInfo(HWND,INT,LPSCROLLINFO);
+WINUSERAPI BOOL        WINAPI GetScrollBarInfo(HWND,LONG,LPSCROLLBARINFO);
+WINUSERAPI INT         WINAPI GetScrollPos(HWND,INT);
+WINUSERAPI BOOL        WINAPI GetScrollRange(HWND,INT,LPINT,LPINT);
+WINUSERAPI HWND        WINAPI GetShellWindow(void);
+WINUSERAPI HMENU       WINAPI GetSubMenu(HMENU,INT);
+WINUSERAPI HBRUSH      WINAPI GetSysColorBrush(INT);
+#define                       GetSysModalWindow() ((HWND)0)
+WINUSERAPI HMENU       WINAPI GetSystemMenu(HWND,BOOL);
+WINUSERAPI INT         WINAPI GetSystemMetrics(INT);
+WINUSERAPI DWORD       WINAPI GetTabbedTextExtentA(HDC,LPCSTR,INT,INT,const INT*);
+WINUSERAPI DWORD       WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT*);
+#define                       GetTabbedTextExtent WINELIB_NAME_AW(GetTabbedTextExtent)
+WINUSERAPI BOOL        WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
+WINUSERAPI HDESK       WINAPI GetThreadDesktop(DWORD);
+WINUSERAPI HWND        WINAPI GetTopWindow(HWND);
+WINUSERAPI BOOL        WINAPI GetUpdateRect(HWND,LPRECT,BOOL);
+WINUSERAPI INT         WINAPI GetUpdateRgn(HWND,HRGN,BOOL);
+WINUSERAPI BOOL        WINAPI GetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD,LPDWORD);
+WINUSERAPI BOOL        WINAPI GetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD,LPDWORD);
+#define                       GetUserObjectInformation WINELIB_NAME_AW(GetUserObjectInformation)
+WINUSERAPI BOOL        WINAPI GetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
+WINUSERAPI HWND        WINAPI GetWindow(HWND,UINT);
+WINUSERAPI DWORD       WINAPI GetWindowContextHelpId(HWND);
+WINUSERAPI HDC         WINAPI GetWindowDC(HWND);
+WINUSERAPI BOOL        WINAPI GetWindowInfo(HWND, PWINDOWINFO);
+WINUSERAPI LONG        WINAPI GetWindowLongA(HWND,INT);
+WINUSERAPI LONG        WINAPI GetWindowLongW(HWND,INT);
+#define                       GetWindowLong WINELIB_NAME_AW(GetWindowLong)
+#ifdef _WIN64
+WINUSERAPI LONG_PTR    WINAPI GetWindowLongPtrA(HWND,INT);
+WINUSERAPI LONG_PTR    WINAPI GetWindowLongPtrW(HWND,INT);
+#else
+#define                       GetWindowLongPtrA GetWindowLongA
+#define                       GetWindowLongPtrW GetWindowLongW
+#endif
+#define                       GetWindowLongPtr WINELIB_NAME_AW(GetWindowLongPtr)
+WINUSERAPI UINT        WINAPI GetWindowModuleFileNameA(HWND,LPSTR,UINT);
+WINUSERAPI UINT        WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT);
+#define                       GetWindowModuleFileName WINELIB_NAME_AW(GetWindowModuleFileName)
+WINUSERAPI BOOL        WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
+WINUSERAPI BOOL        WINAPI GetWindowRect(HWND,LPRECT);
+WINUSERAPI INT         WINAPI GetWindowRgn(HWND,HRGN);
+WINUSERAPI HWINSTA     WINAPI GetProcessWindowStation(void);
+#define                       GetWindowTask(hwnd) ((HTASK)GetWindowThreadProcessId(hwnd,NULL))
+WINUSERAPI INT         WINAPI GetWindowTextA(HWND,LPSTR,INT);
+WINUSERAPI INT         WINAPI GetWindowTextW(HWND,LPWSTR,INT);
+#define                       GetWindowText WINELIB_NAME_AW(GetWindowText)
+WINUSERAPI INT         WINAPI GetWindowTextLengthA(HWND);
+WINUSERAPI INT         WINAPI GetWindowTextLengthW(HWND);
+#define                       GetWindowTextLength WINELIB_NAME_AW(GetWindowTextLength)
+WINUSERAPI DWORD       WINAPI GetWindowThreadProcessId(HWND,LPDWORD);
+WINUSERAPI WORD        WINAPI GetWindowWord(HWND,INT);
+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);
+#define                       GrayString WINELIB_NAME_AW(GrayString)
+WINUSERAPI BOOL        WINAPI HideCaret(HWND);
+WINUSERAPI BOOL        WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT);
+WINUSERAPI BOOL        WINAPI InflateRect(LPRECT,INT,INT);
+WINUSERAPI BOOL        WINAPI InSendMessage(void);
+WINUSERAPI DWORD       WINAPI InSendMessageEx(LPVOID);
+WINUSERAPI BOOL        WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+WINUSERAPI BOOL        WINAPI InsertMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
+#define                       InsertMenu WINELIB_NAME_AW(InsertMenu)
+WINUSERAPI BOOL        WINAPI InsertMenuItemA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
+WINUSERAPI BOOL        WINAPI InsertMenuItemW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
+#define                       InsertMenuItem WINELIB_NAME_AW(InsertMenuItem)
+WINUSERAPI INT         WINAPI InternalGetWindowText(HWND,LPWSTR,INT);
+WINUSERAPI BOOL        WINAPI IntersectRect(LPRECT,const RECT*,const RECT*);
+WINUSERAPI BOOL        WINAPI InvalidateRect(HWND,const RECT*,BOOL);
+WINUSERAPI BOOL        WINAPI InvalidateRgn(HWND,HRGN,BOOL);
+WINUSERAPI BOOL        WINAPI InvertRect(HDC,const RECT*);
+WINUSERAPI BOOL        WINAPI IsCharAlphaA(CHAR);
+WINUSERAPI BOOL        WINAPI IsCharAlphaW(WCHAR);
+#define                       IsCharAlpha WINELIB_NAME_AW(IsCharAlpha)
+WINUSERAPI BOOL        WINAPI IsCharAlphaNumericA(CHAR);
+WINUSERAPI BOOL        WINAPI IsCharAlphaNumericW(WCHAR);
+#define                       IsCharAlphaNumeric WINELIB_NAME_AW(IsCharAlphaNumeric)
+WINUSERAPI BOOL        WINAPI IsCharLowerA(CHAR);
+WINUSERAPI BOOL        WINAPI IsCharLowerW(WCHAR);
+#define                       IsCharLower WINELIB_NAME_AW(IsCharLower)
+WINUSERAPI BOOL        WINAPI IsCharUpperA(CHAR);
+WINUSERAPI BOOL        WINAPI IsCharUpperW(WCHAR);
+#define                       IsCharUpper WINELIB_NAME_AW(IsCharUpper)
+WINUSERAPI BOOL        WINAPI IsChild(HWND,HWND);
+WINUSERAPI BOOL        WINAPI IsClipboardFormatAvailable(UINT);
+WINUSERAPI BOOL        WINAPI IsDialogMessageA(HWND,LPMSG);
+WINUSERAPI BOOL        WINAPI IsDialogMessageW(HWND,LPMSG);
+#define                       IsDialogMessage WINELIB_NAME_AW(IsDialogMessage)
+WINUSERAPI UINT        WINAPI IsDlgButtonChecked(HWND,int);
+WINUSERAPI BOOL        WINAPI IsHungAppWindow(HWND);
+WINUSERAPI BOOL        WINAPI IsIconic(HWND);
+WINUSERAPI BOOL        WINAPI IsMenu(HMENU);
+WINUSERAPI BOOL        WINAPI IsRectEmpty(const RECT*);
+WINUSERAPI BOOL        WINAPI IsWinEventHookInstalled(DWORD);
+WINUSERAPI BOOL        WINAPI IsWindow(HWND);
+WINUSERAPI BOOL        WINAPI IsWindowEnabled(HWND);
+WINUSERAPI BOOL        WINAPI IsWindowUnicode(HWND);
+WINUSERAPI BOOL        WINAPI IsWindowVisible(HWND);
+WINUSERAPI BOOL        WINAPI IsZoomed(HWND);
+WINUSERAPI BOOL        WINAPI KillSystemTimer(HWND,UINT_PTR);
+WINUSERAPI BOOL        WINAPI KillTimer(HWND,UINT_PTR);
+WINUSERAPI HACCEL      WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
+WINUSERAPI HACCEL      WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
+#define                       LoadAccelerators WINELIB_NAME_AW(LoadAccelerators)
+WINUSERAPI HBITMAP     WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
+WINUSERAPI HBITMAP     WINAPI LoadBitmapW(HINSTANCE,LPCWSTR);
+#define                       LoadBitmap WINELIB_NAME_AW(LoadBitmap)
+WINUSERAPI HCURSOR     WINAPI LoadCursorA(HINSTANCE,LPCSTR);
+WINUSERAPI HCURSOR     WINAPI LoadCursorW(HINSTANCE,LPCWSTR);
+#define                       LoadCursor WINELIB_NAME_AW(LoadCursor)
+WINUSERAPI HCURSOR     WINAPI LoadCursorFromFileA(LPCSTR);
+WINUSERAPI HCURSOR     WINAPI LoadCursorFromFileW(LPCWSTR);
+#define                       LoadCursorFromFile WINELIB_NAME_AW(LoadCursorFromFile)
+WINUSERAPI HICON       WINAPI LoadIconA(HINSTANCE,LPCSTR);
+WINUSERAPI HICON       WINAPI LoadIconW(HINSTANCE,LPCWSTR);
+#define                       LoadIcon WINELIB_NAME_AW(LoadIcon)
+WINUSERAPI HANDLE      WINAPI LoadImageA(HINSTANCE,LPCSTR,UINT,INT,INT,UINT);
+WINUSERAPI HANDLE      WINAPI LoadImageW(HINSTANCE,LPCWSTR,UINT,INT,INT,UINT);
+#define                       LoadImage WINELIB_NAME_AW(LoadImage)
+WINUSERAPI HKL         WINAPI LoadKeyboardLayoutA(LPCSTR,UINT);
+WINUSERAPI HKL         WINAPI LoadKeyboardLayoutW(LPCWSTR,UINT);
+#define                       LoadKeyboardLayout WINELIB_NAME_AW(LoadKeyboardLayout)
+WINUSERAPI HMENU       WINAPI LoadMenuA(HINSTANCE,LPCSTR);
+WINUSERAPI HMENU       WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
+#define                       LoadMenu WINELIB_NAME_AW(LoadMenu)
+WINUSERAPI HMENU       WINAPI LoadMenuIndirectA(LPCVOID);
+WINUSERAPI HMENU       WINAPI LoadMenuIndirectW(LPCVOID);
+#define                       LoadMenuIndirect WINELIB_NAME_AW(LoadMenuIndirect)
+WINUSERAPI INT         WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,INT);
+WINUSERAPI INT         WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,INT);
+#define                       LoadString WINELIB_NAME_AW(LoadString)
+WINUSERAPI BOOL        WINAPI LockSetForegroundWindow(UINT);
+WINUSERAPI BOOL        WINAPI LockWindowUpdate(HWND);
+WINUSERAPI INT         WINAPI LookupIconIdFromDirectory(LPBYTE,BOOL);
+WINUSERAPI INT         WINAPI LookupIconIdFromDirectoryEx(LPBYTE,BOOL,INT,INT,UINT);
+WINUSERAPI UINT        WINAPI MapVirtualKeyA(UINT,UINT);
+WINUSERAPI UINT        WINAPI MapVirtualKeyW(UINT,UINT);
+#define                       MapVirtualKey WINELIB_NAME_AW(MapVirtualKey)
+WINUSERAPI UINT        WINAPI MapVirtualKeyExA(UINT,UINT,HKL);
+WINUSERAPI UINT        WINAPI MapVirtualKeyExW(UINT,UINT,HKL);
+#define                       MapVirtualKeyEx WINELIB_NAME_AW(MapVirtualKeyEx)
+WINUSERAPI BOOL        WINAPI MapDialogRect(HWND,LPRECT);
+WINUSERAPI INT         WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT);
+WINUSERAPI INT         WINAPI MenuItemFromPoint(HWND,HMENU,POINT);
+WINUSERAPI BOOL        WINAPI MessageBeep(UINT);
+WINUSERAPI INT         WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
+WINUSERAPI INT         WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
+#define                       MessageBox WINELIB_NAME_AW(MessageBox)
+WINUSERAPI INT         WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
+WINUSERAPI INT         WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
+#define                       MessageBoxEx WINELIB_NAME_AW(MessageBoxEx)
+WINUSERAPI INT         WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
+WINUSERAPI INT         WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
+#define                       MessageBoxIndirect WINELIB_NAME_AW(MessageBoxIndirect)
+WINUSERAPI BOOL        WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
+WINUSERAPI BOOL        WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
+#define                       ModifyMenu WINELIB_NAME_AW(ModifyMenu)
+WINUSERAPI HMONITOR    WINAPI MonitorFromPoint(POINT,DWORD);
+WINUSERAPI HMONITOR    WINAPI MonitorFromRect(LPRECT,DWORD);
+WINUSERAPI HMONITOR    WINAPI MonitorFromWindow(HWND,DWORD);
+WINUSERAPI BOOL        WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL);
+WINUSERAPI DWORD       WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
+WINUSERAPI DWORD       WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
+WINUSERAPI VOID        WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
+WINUSERAPI DWORD       WINAPI OemKeyScan(WORD);
+WINUSERAPI BOOL        WINAPI OemToCharA(LPCSTR,LPSTR);
+WINUSERAPI BOOL        WINAPI OemToCharW(LPCSTR,LPWSTR);
+#define                       OemToChar WINELIB_NAME_AW(OemToChar)
+WINUSERAPI BOOL        WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
+WINUSERAPI BOOL        WINAPI OemToCharBuffW(LPCSTR,LPWSTR,DWORD);
+#define                       OemToCharBuff WINELIB_NAME_AW(OemToCharBuff)
+WINUSERAPI BOOL        WINAPI OffsetRect(LPRECT,INT,INT);
+WINUSERAPI BOOL        WINAPI OpenClipboard(HWND);
+WINUSERAPI HDESK       WINAPI OpenDesktopA(LPCSTR,DWORD,BOOL,ACCESS_MASK);
+WINUSERAPI HDESK       WINAPI OpenDesktopW(LPCWSTR,DWORD,BOOL,ACCESS_MASK);
+#define                       OpenDesktop WINELIB_NAME_AW(OpenDesktop)
+WINUSERAPI BOOL        WINAPI OpenIcon(HWND);
+WINUSERAPI HDESK       WINAPI OpenInputDesktop(DWORD,BOOL,ACCESS_MASK);
+WINUSERAPI HWINSTA     WINAPI OpenWindowStationA(LPCSTR,BOOL,ACCESS_MASK);
+WINUSERAPI HWINSTA     WINAPI OpenWindowStationW(LPCWSTR,BOOL,ACCESS_MASK);
+#define                       OpenWindowStation WINELIB_NAME_AW(OpenWindowStation)
+WINUSERAPI BOOL        WINAPI PaintDesktop(HDC);
+WINUSERAPI BOOL        WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT);
+WINUSERAPI BOOL        WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT);
+#define                       PeekMessage WINELIB_NAME_AW(PeekMessage)
+#define                       PostAppMessageA(thread,msg,wparam,lparam) PostThreadMessageA((DWORD)(thread),msg,wparam,lparam)
+#define                       PostAppMessageW(thread,msg,wparam,lparam) PostThreadMessageW((DWORD)(thread),msg,wparam,lparam)
+#define                       PostAppMessage WINELIB_NAME_AW(PostAppMessage)
+WINUSERAPI BOOL        WINAPI PostMessageA(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI BOOL        WINAPI PostMessageW(HWND,UINT,WPARAM,LPARAM);
+#define                       PostMessage WINELIB_NAME_AW(PostMessage)
+WINUSERAPI void        WINAPI PostQuitMessage(INT);
+WINUSERAPI BOOL        WINAPI PostThreadMessageA(DWORD,UINT,WPARAM,LPARAM);
+WINUSERAPI BOOL        WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM);
+#define                       PostThreadMessage WINELIB_NAME_AW(PostThreadMessage)
+WINUSERAPI UINT        WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
+WINUSERAPI UINT        WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
+WINUSERAPI UINT        WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
+WINUSERAPI UINT        WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
+WINUSERAPI BOOL        WINAPI PtInRect(const RECT*,POINT);
+WINUSERAPI HWND        WINAPI RealChildWindowFromPoint(HWND,POINT);
+WINUSERAPI UINT        WINAPI RealGetWindowClassA(HWND,LPSTR,UINT);
+WINUSERAPI UINT        WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT);
+#define                       RealGetWindowClass WINELIB_NAME_AW(RealGetWindowClass)
+WINUSERAPI BOOL        WINAPI RedrawWindow(HWND,const RECT*,HRGN,UINT);
+WINUSERAPI ATOM        WINAPI RegisterClassA(const WNDCLASSA *);
+WINUSERAPI ATOM        WINAPI RegisterClassW(const WNDCLASSW *);
+#define                       RegisterClass WINELIB_NAME_AW(RegisterClass)
+WINUSERAPI ATOM        WINAPI RegisterClassExA(const WNDCLASSEXA *);
+WINUSERAPI ATOM        WINAPI RegisterClassExW(const WNDCLASSEXW *);
+#define                       RegisterClassEx WINELIB_NAME_AW(RegisterClassEx)
+WINUSERAPI UINT        WINAPI RegisterClipboardFormatA(LPCSTR);
+WINUSERAPI UINT        WINAPI RegisterClipboardFormatW(LPCWSTR);
+#define                       RegisterClipboardFormat WINELIB_NAME_AW(RegisterClipboardFormat)
+WINUSERAPI HDEVNOTIFY  WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD);
+WINUSERAPI HDEVNOTIFY  WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD);
+#define                       RegisterDeviceNotification WINELIB_NAME_AW(RegisterDeviceNotification)
+WINUSERAPI BOOL        WINAPI RegisterHotKey(HWND,INT,UINT,UINT);
+WINUSERAPI BOOL        WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT);
+WINUSERAPI UINT        WINAPI RegisterWindowMessageA(LPCSTR);
+WINUSERAPI UINT        WINAPI RegisterWindowMessageW(LPCWSTR);
+#define                       RegisterWindowMessage WINELIB_NAME_AW(RegisterWindowMessage)
+WINUSERAPI BOOL        WINAPI ReleaseCapture(void);
+WINUSERAPI INT         WINAPI ReleaseDC(HWND,HDC);
+WINUSERAPI BOOL        WINAPI RemoveMenu(HMENU,UINT,UINT);
+WINUSERAPI HANDLE      WINAPI RemovePropA(HWND,LPCSTR);
+WINUSERAPI HANDLE      WINAPI RemovePropW(HWND,LPCWSTR);
+#define                       RemoveProp WINELIB_NAME_AW(RemoveProp)
+WINUSERAPI BOOL        WINAPI ReplyMessage(LRESULT);
+WINUSERAPI BOOL        WINAPI ScreenToClient(HWND,LPPOINT);
+WINUSERAPI VOID        WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI BOOL        WINAPI ScrollDC(HDC,INT,INT,const RECT*,const RECT*,HRGN,LPRECT);
+WINUSERAPI BOOL        WINAPI ScrollWindow(HWND,INT,INT,const RECT*,const RECT*);
+WINUSERAPI INT         WINAPI ScrollWindowEx(HWND,INT,INT,const RECT*,const RECT*,HRGN,LPRECT,UINT);
+WINUSERAPI LRESULT     WINAPI SendDlgItemMessageA(HWND,INT,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI SendDlgItemMessageW(HWND,INT,UINT,WPARAM,LPARAM);
+#define                       SendDlgItemMessage WINELIB_NAME_AW(SendDlgItemMessage)
+WINUSERAPI UINT        WINAPI SendInput(UINT,LPINPUT,int);
+WINUSERAPI LRESULT     WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI LRESULT     WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM);
+#define                       SendMessage WINELIB_NAME_AW(SendMessage)
+WINUSERAPI BOOL        WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
+WINUSERAPI BOOL        WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
+#define                       SendMessageCallback WINELIB_NAME_AW(SendMessageCallback)
+WINUSERAPI LRESULT     WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
+WINUSERAPI LRESULT     WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
+#define                       SendMessageTimeout WINELIB_NAME_AW(SendMessageTimeout)
+WINUSERAPI BOOL        WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM);
+WINUSERAPI BOOL        WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM);
+#define                       SendNotifyMessage WINELIB_NAME_AW(SendNotifyMessage)
+WINUSERAPI HWND        WINAPI SetActiveWindow(HWND);
+WINUSERAPI HWND        WINAPI SetCapture(HWND);
+WINUSERAPI BOOL        WINAPI SetCaretBlinkTime(UINT);
+WINUSERAPI BOOL        WINAPI SetCaretPos(INT,INT);
+WINUSERAPI DWORD       WINAPI SetClassLongA(HWND,INT,LONG);
+WINUSERAPI DWORD       WINAPI SetClassLongW(HWND,INT,LONG);
+#define                       SetClassLong WINELIB_NAME_AW(SetClassLong)
 #ifdef _WIN64
-LONG_PTR    WINAPI GetWindowLongPtrA(HWND,INT);
-LONG_PTR    WINAPI GetWindowLongPtrW(HWND,INT);
+WINUSERAPI ULONG_PTR   WINAPI SetClassLongPtrA(HWND,INT,LONG_PTR);
+WINUSERAPI ULONG_PTR   WINAPI SetClassLongPtrW(HWND,INT,LONG_PTR);
 #else
-#define     GetWindowLongPtrA GetWindowLongA
-#define     GetWindowLongPtrW GetWindowLongW
+#define                       SetClassLongPtrA SetClassLongA
+#define                       SetClassLongPtrW SetClassLongW
 #endif
-#define     GetWindowLongPtr WINELIB_NAME_AW(GetWindowLongPtr)
-UINT        WINAPI GetWindowModuleFileNameA(HWND,LPSTR,UINT);
-UINT        WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT);
-#define     GetWindowModuleFileName WINELIB_NAME_AW(GetWindowModuleFileName)
-BOOL        WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
-BOOL        WINAPI GetWindowRect(HWND,LPRECT);
-INT         WINAPI GetWindowRgn(HWND,HRGN);
-HWINSTA     WINAPI GetProcessWindowStation(void);
-#define     GetWindowTask(hwnd) ((HTASK)GetWindowThreadProcessId(hwnd,NULL))
-INT         WINAPI GetWindowTextA(HWND,LPSTR,INT);
-INT         WINAPI GetWindowTextW(HWND,LPWSTR,INT);
-#define     GetWindowText WINELIB_NAME_AW(GetWindowText)
-INT         WINAPI GetWindowTextLengthA(HWND);
-INT         WINAPI GetWindowTextLengthW(HWND);
-#define     GetWindowTextLength WINELIB_NAME_AW(GetWindowTextLength)
-WORD        WINAPI GetWindowWord(HWND,INT);
-BOOL        WINAPI GrayStringA(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,INT,INT,INT,INT,INT);
-BOOL        WINAPI GrayStringW(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,INT,INT,INT,INT,INT);
-#define     GrayString WINELIB_NAME_AW(GrayString)
-BOOL        WINAPI HideCaret(HWND);
-BOOL        WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT);
-BOOL        WINAPI InflateRect(LPRECT,INT,INT);
-BOOL        WINAPI InSendMessage(void);
-DWORD       WINAPI InSendMessageEx(LPVOID);
-BOOL        WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
-BOOL        WINAPI InsertMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
-#define     InsertMenu WINELIB_NAME_AW(InsertMenu)
-BOOL        WINAPI InsertMenuItemA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
-BOOL        WINAPI InsertMenuItemW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
-#define     InsertMenuItem WINELIB_NAME_AW(InsertMenuItem)
-INT         WINAPI InternalGetWindowText(HWND,LPWSTR,INT);
-BOOL        WINAPI IntersectRect(LPRECT,const RECT*,const RECT*);
-BOOL        WINAPI InvalidateRect(HWND,const RECT*,BOOL);
-BOOL        WINAPI InvalidateRgn(HWND,HRGN,BOOL);
-BOOL        WINAPI InvertRect(HDC,const RECT*);
-BOOL        WINAPI IsCharAlphaA(CHAR);
-BOOL        WINAPI IsCharAlphaW(WCHAR);
-#define     IsCharAlpha WINELIB_NAME_AW(IsCharAlpha)
-BOOL      WINAPI IsCharAlphaNumericA(CHAR);
-BOOL      WINAPI IsCharAlphaNumericW(WCHAR);
-#define     IsCharAlphaNumeric WINELIB_NAME_AW(IsCharAlphaNumeric)
-BOOL      WINAPI IsCharLowerA(CHAR);
-BOOL      WINAPI IsCharLowerW(WCHAR);
-#define     IsCharLower WINELIB_NAME_AW(IsCharLower)
-BOOL      WINAPI IsCharUpperA(CHAR);
-BOOL      WINAPI IsCharUpperW(WCHAR);
-#define     IsCharUpper WINELIB_NAME_AW(IsCharUpper)
-BOOL      WINAPI IsChild(HWND,HWND);
-BOOL      WINAPI IsClipboardFormatAvailable(UINT);
-BOOL      WINAPI IsDialogMessageA(HWND,LPMSG);
-BOOL      WINAPI IsDialogMessageW(HWND,LPMSG);
-#define     IsDialogMessage WINELIB_NAME_AW(IsDialogMessage)
-UINT      WINAPI IsDlgButtonChecked(HWND,UINT);
-BOOL      WINAPI IsIconic(HWND);
-BOOL      WINAPI IsMenu(HMENU);
-BOOL      WINAPI IsRectEmpty(const RECT*);
-BOOL      WINAPI IsWindow(HWND);
-BOOL      WINAPI IsWindowEnabled(HWND);
-BOOL      WINAPI IsWindowVisible(HWND);
-BOOL      WINAPI IsZoomed(HWND);
-BOOL      WINAPI KillSystemTimer(HWND,UINT_PTR);
-BOOL      WINAPI KillTimer(HWND,UINT_PTR);
-HACCEL    WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
-HACCEL    WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
-#define     LoadAccelerators WINELIB_NAME_AW(LoadAccelerators)
-HBITMAP     WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
-HBITMAP     WINAPI LoadBitmapW(HINSTANCE,LPCWSTR);
-#define     LoadBitmap WINELIB_NAME_AW(LoadBitmap)
-HCURSOR   WINAPI LoadCursorA(HINSTANCE,LPCSTR);
-HCURSOR   WINAPI LoadCursorW(HINSTANCE,LPCWSTR);
-#define     LoadCursor WINELIB_NAME_AW(LoadCursor)
-HCURSOR   WINAPI LoadCursorFromFileA(LPCSTR);
-HCURSOR   WINAPI LoadCursorFromFileW(LPCWSTR);
-#define     LoadCursorFromFile WINELIB_NAME_AW(LoadCursorFromFile)
-HICON     WINAPI LoadIconA(HINSTANCE,LPCSTR);
-HICON     WINAPI LoadIconW(HINSTANCE,LPCWSTR);
-#define     LoadIcon WINELIB_NAME_AW(LoadIcon)
-HANDLE    WINAPI LoadImageA(HINSTANCE,LPCSTR,UINT,INT,INT,UINT);
-HANDLE    WINAPI LoadImageW(HINSTANCE,LPCWSTR,UINT,INT,INT,UINT);
-#define     LoadImage WINELIB_NAME_AW(LoadImage)
-HMENU     WINAPI LoadMenuA(HINSTANCE,LPCSTR);
-HMENU     WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
-#define     LoadMenu WINELIB_NAME_AW(LoadMenu)
-HMENU     WINAPI LoadMenuIndirectA(LPCVOID);
-HMENU     WINAPI LoadMenuIndirectW(LPCVOID);
-#define     LoadMenuIndirect WINELIB_NAME_AW(LoadMenuIndirect)
-INT       WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,INT);
-INT       WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,INT);
-#define     LoadString WINELIB_NAME_AW(LoadString)
-BOOL      WINAPI LockWindowUpdate(HWND);
-INT       WINAPI LookupIconIdFromDirectory(LPBYTE,BOOL);
-INT       WINAPI LookupIconIdFromDirectoryEx(LPBYTE,BOOL,INT,INT,UINT);
-UINT      WINAPI MapVirtualKeyA(UINT,UINT);
-UINT      WINAPI MapVirtualKeyW(UINT,UINT);
-#define     MapVirtualKey WINELIB_NAME_AW(MapVirtualKey)
-UINT        WINAPI MapVirtualKeyExA(UINT,UINT,HKL);
-UINT        WINAPI MapVirtualKeyExW(UINT,UINT,HKL);
-#define     MapVirtualKeyEx WINELIB_NAME_AW(MapVirtualKeyEx)
-BOOL        WINAPI MapDialogRect(HWND,LPRECT);
-INT         WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT);
-INT         WINAPI MenuItemFromPoint(HWND,HMENU,POINT);
-BOOL        WINAPI MessageBeep(UINT);
-INT         WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
-INT         WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
-#define     MessageBox WINELIB_NAME_AW(MessageBox)
-INT       WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
-INT       WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
-#define     MessageBoxIndirect WINELIB_NAME_AW(MessageBoxIndirect)
-BOOL      WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
-BOOL      WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
-#define     ModifyMenu WINELIB_NAME_AW(ModifyMenu)
-BOOL      WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL);
-BOOL      WINAPI OemToCharA(LPCSTR,LPSTR);
-BOOL      WINAPI OemToCharW(LPCSTR,LPWSTR);
-#define     OemToChar WINELIB_NAME_AW(OemToChar)
-BOOL      WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
-BOOL      WINAPI OemToCharBuffW(LPCSTR,LPWSTR,DWORD);
-#define     OemToCharBuff WINELIB_NAME_AW(OemToCharBuff)
-BOOL      WINAPI OffsetRect(LPRECT,INT,INT);
-BOOL      WINAPI OpenClipboard(HWND);
-BOOL      WINAPI OpenIcon(HWND);
-HWINSTA     WINAPI OpenWindowStationA(LPSTR,BOOL,ACCESS_MASK);
-HWINSTA     WINAPI OpenWindowStationW(LPWSTR,BOOL,ACCESS_MASK);
-#define     OpenWindowStation WINELIB_NAME_AW(OpenWindowStation)
-BOOL      WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT);
-BOOL      WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT);
-#define     PeekMessage WINELIB_NAME_AW(PeekMessage)
-#define     PostAppMessageA(thread,msg,wparam,lparam) \
-            PostThreadMessageA((DWORD)(thread),msg,wparam,lparam)
-#define     PostAppMessageW(thread,msg,wparam,lparam) \
-            PostThreadMessageW((DWORD)(thread),msg,wparam,lparam)
-#define     PostAppMessage WINELIB_NAME_AW(PostAppMessage)
-BOOL      WINAPI PostMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL      WINAPI PostMessageW(HWND,UINT,WPARAM,LPARAM);
-#define     PostMessage WINELIB_NAME_AW(PostMessage)
-void        WINAPI PostQuitMessage(INT);
-UINT        WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
-UINT        WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
-UINT        WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
-UINT        WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
-BOOL        WINAPI PtInRect(const RECT*,POINT);
-UINT        WINAPI RealGetWindowClassA(HWND,LPSTR,UINT);
-UINT        WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT);
-#define     RealGetWindowClass WINELIB_NAME_AW(RealGetWindowClass)
-BOOL        WINAPI RedrawWindow(HWND,const RECT*,HRGN,UINT);
-ATOM        WINAPI RegisterClassA(const WNDCLASSA *);
-ATOM        WINAPI RegisterClassW(const WNDCLASSW *);
-#define     RegisterClass WINELIB_NAME_AW(RegisterClass)
-ATOM        WINAPI RegisterClassExA(const WNDCLASSEXA *);
-ATOM        WINAPI RegisterClassExW(const WNDCLASSEXW *);
-#define     RegisterClassEx WINELIB_NAME_AW(RegisterClassEx)
-UINT      WINAPI RegisterClipboardFormatA(LPCSTR);
-UINT      WINAPI RegisterClipboardFormatW(LPCWSTR);
-#define     RegisterClipboardFormat WINELIB_NAME_AW(RegisterClipboardFormat)
-WORD        WINAPI RegisterWindowMessageA(LPCSTR);
-WORD        WINAPI RegisterWindowMessageW(LPCWSTR);
-#define     RegisterWindowMessage WINELIB_NAME_AW(RegisterWindowMessage)
-INT       WINAPI ReleaseDC(HWND,HDC);
-BOOL      WINAPI RemoveMenu(HMENU,UINT,UINT);
-HANDLE    WINAPI RemovePropA(HWND,LPCSTR);
-HANDLE    WINAPI RemovePropW(HWND,LPCWSTR);
-#define     RemoveProp WINELIB_NAME_AW(RemoveProp)
-BOOL        WINAPI ReplyMessage(LRESULT);
-BOOL        WINAPI ScreenToClient(HWND,LPPOINT);
-VOID        WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM);
-BOOL        WINAPI ScrollDC(HDC,INT,INT,const RECT*,const RECT*,HRGN,LPRECT);
-BOOL        WINAPI ScrollWindow(HWND,INT,INT,const RECT*,const RECT*);
-INT         WINAPI ScrollWindowEx(HWND,INT,INT,const RECT*,const RECT*,HRGN,LPRECT,UINT);
-LRESULT     WINAPI SendDlgItemMessageA(HWND,INT,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI SendDlgItemMessageW(HWND,INT,UINT,WPARAM,LPARAM);
-#define     SendDlgItemMessage WINELIB_NAME_AW(SendDlgItemMessage)
-UINT        WINAPI SendInput(UINT,LPINPUT,int);
-LRESULT     WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
-LRESULT     WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM);
-#define     SendMessage WINELIB_NAME_AW(SendMessage)
-LRESULT     WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
-LRESULT     WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD_PTR);
-#define     SendMessageTimeout WINELIB_NAME_AW(SendMessageTimeout)
-HWND        WINAPI SetActiveWindow(HWND);
-HWND        WINAPI SetCapture(HWND);
-BOOL        WINAPI SetCaretBlinkTime(UINT);
-BOOL        WINAPI SetCaretPos(INT,INT);
-LONG        WINAPI SetClassLongA(HWND,INT,LONG);
-LONG        WINAPI SetClassLongW(HWND,INT,LONG);
-#define     SetClassLong WINELIB_NAME_AW(SetClassLong)
-WORD        WINAPI SetClassWord(HWND,INT,WORD);
-HANDLE    WINAPI SetClipboardData(UINT,HANDLE);
-HWND      WINAPI SetClipboardViewer(HWND);
-HCURSOR   WINAPI SetCursor(HCURSOR);
-BOOL      WINAPI SetCursorPos(INT,INT);
-BOOL      WINAPI SetDeskWallPaper(LPCSTR);
-BOOL      WINAPI SetDlgItemInt(HWND,INT,UINT,BOOL);
-BOOL      WINAPI SetDlgItemTextA(HWND,INT,LPCSTR);
-BOOL      WINAPI SetDlgItemTextW(HWND,INT,LPCWSTR);
-#define     SetDlgItemText WINELIB_NAME_AW(SetDlgItemText)
-BOOL      WINAPI SetDoubleClickTime(UINT);
-HWND      WINAPI SetFocus(HWND);
-BOOL      WINAPI SetForegroundWindow(HWND);
-void        WINAPI SetInternalWindowPos(HWND,UINT,LPRECT,LPPOINT);
-BOOL        WINAPI SetMenu(HWND,HMENU);
-BOOL        WINAPI SetMenuContextHelpId(HMENU,DWORD);
-BOOL        WINAPI SetMenuItemBitmaps(HMENU,UINT,UINT,HBITMAP,HBITMAP);
-LPARAM      WINAPI SetMessageExtraInfo(LPARAM);
-BOOL        WINAPI SetMessageQueue(INT);
-BOOL        WINAPI SetProcessDefaultLayout(DWORD);
-BOOL        WINAPI SetProcessWindowStation(HWINSTA);
-HWND        WINAPI SetParent(HWND,HWND);
-BOOL        WINAPI SetPropA(HWND,LPCSTR,HANDLE);
-BOOL        WINAPI SetPropW(HWND,LPCWSTR,HANDLE);
-#define     SetProp WINELIB_NAME_AW(SetProp)
-BOOL      WINAPI SetRect(LPRECT,INT,INT,INT,INT);
-BOOL      WINAPI SetRectEmpty(LPRECT);
-INT       WINAPI SetScrollInfo(HWND,INT,const SCROLLINFO*,BOOL);
-INT       WINAPI SetScrollPos(HWND,INT,INT,BOOL);
-BOOL      WINAPI SetScrollRange(HWND,INT,INT,INT,BOOL);
-#define     SetSysModalWindow(hwnd) ((HWND)0)
-BOOL      WINAPI SetSystemCursor(HCURSOR,DWORD);
-BOOL      WINAPI SetSystemMenu(HWND,HMENU);
-UINT_PTR  WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
-UINT_PTR  WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
-BOOL        WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-LONG        WINAPI SetWindowLongA(HWND,INT,LONG);
-LONG        WINAPI SetWindowLongW(HWND,INT,LONG);
-#define     SetWindowLong WINELIB_NAME_AW(SetWindowLong)
+#define                       SetClassLongPtr WINELIB_NAME_AW(SetClassLongPtr)
+WINUSERAPI WORD        WINAPI SetClassWord(HWND,INT,WORD);
+WINUSERAPI HANDLE      WINAPI SetClipboardData(UINT,HANDLE);
+WINUSERAPI HWND        WINAPI SetClipboardViewer(HWND);
+WINUSERAPI HCURSOR     WINAPI SetCursor(HCURSOR);
+WINUSERAPI BOOL        WINAPI SetCursorPos(INT,INT);
+WINUSERAPI VOID        WINAPI SetDebugErrorLevel(DWORD);
+WINUSERAPI BOOL        WINAPI SetDeskWallPaper(LPCSTR);
+WINUSERAPI BOOL        WINAPI SetDlgItemInt(HWND,INT,UINT,BOOL);
+WINUSERAPI BOOL        WINAPI SetDlgItemTextA(HWND,INT,LPCSTR);
+WINUSERAPI BOOL        WINAPI SetDlgItemTextW(HWND,INT,LPCWSTR);
+#define                       SetDlgItemText WINELIB_NAME_AW(SetDlgItemText)
+WINUSERAPI BOOL        WINAPI SetDoubleClickTime(UINT);
+WINUSERAPI HWND        WINAPI SetFocus(HWND);
+WINUSERAPI BOOL        WINAPI SetForegroundWindow(HWND);
+WINUSERAPI void        WINAPI SetInternalWindowPos(HWND,UINT,LPRECT,LPPOINT);
+WINUSERAPI BOOL        WINAPI SetKeyboardState(LPBYTE);
+WINUSERAPI VOID        WINAPI SetLastErrorEx(DWORD,DWORD);
+WINUSERAPI BOOL        WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
+WINUSERAPI BOOL        WINAPI SetMenu(HWND,HMENU);
+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);
+WINUSERAPI BOOL        WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,const MENUITEMINFOA*);
+WINUSERAPI BOOL        WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINFOW*);
+#define                       SetMenuItemInfo WINELIB_NAME_AW(SetMenuItemInfo)
+WINUSERAPI LPARAM      WINAPI SetMessageExtraInfo(LPARAM);
+WINUSERAPI BOOL        WINAPI SetMessageQueue(INT);
+WINUSERAPI BOOL        WINAPI SetProcessDefaultLayout(DWORD);
+WINUSERAPI BOOL        WINAPI SetProcessWindowStation(HWINSTA);
+WINUSERAPI HWND        WINAPI SetParent(HWND,HWND);
+WINUSERAPI BOOL        WINAPI SetPropA(HWND,LPCSTR,HANDLE);
+WINUSERAPI BOOL        WINAPI SetPropW(HWND,LPCWSTR,HANDLE);
+#define                       SetProp WINELIB_NAME_AW(SetProp)
+WINUSERAPI BOOL        WINAPI SetRect(LPRECT,INT,INT,INT,INT);
+WINUSERAPI BOOL        WINAPI SetRectEmpty(LPRECT);
+WINUSERAPI INT         WINAPI SetScrollInfo(HWND,INT,const SCROLLINFO*,BOOL);
+WINUSERAPI INT         WINAPI SetScrollPos(HWND,INT,INT,BOOL);
+WINUSERAPI BOOL        WINAPI SetScrollRange(HWND,INT,INT,INT,BOOL);
+#define                       SetSysModalWindow(hwnd) ((HWND)0)
+WINUSERAPI BOOL        WINAPI SetSystemCursor(HCURSOR,DWORD);
+WINUSERAPI BOOL        WINAPI SetSystemMenu(HWND,HMENU);
+WINUSERAPI UINT_PTR    WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
+WINUSERAPI BOOL        WINAPI SetThreadDesktop(HDESK);
+WINUSERAPI UINT_PTR    WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
+WINUSERAPI BOOL        WINAPI SetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD);
+WINUSERAPI BOOL        WINAPI SetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD);
+#define                       SetUserObjectInformation WINELIB_NAME_AW(SetUserObjectInformation)
+WINUSERAPI BOOL        WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
+WINUSERAPI BOOL        WINAPI SetWindowContextHelpId(HWND,DWORD);
+WINUSERAPI LONG        WINAPI SetWindowLongA(HWND,INT,LONG);
+WINUSERAPI LONG        WINAPI SetWindowLongW(HWND,INT,LONG);
+#define                       SetWindowLong WINELIB_NAME_AW(SetWindowLong)
 #ifdef _WIN64
-LONG_PTR    WINAPI SetWindowLongPtrA(HWND,INT,LONG_PTR);
-LONG_PTR    WINAPI SetWindowLongPtrW(HWND,INT,LONG_PTR);
+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                       SetWindowLongPtrA SetWindowLongA
+#define                       SetWindowLongPtrW SetWindowLongW
 #endif
-#define     SetWindowLongPtr WINELIB_NAME_AW(SetWindowLongPtr)
-BOOL        WINAPI SetWindowPlacement(HWND,const WINDOWPLACEMENT*);
-HHOOK       WINAPI SetWindowsHookA(INT,HOOKPROC);
-HHOOK       WINAPI SetWindowsHookW(INT,HOOKPROC);
-#define     SetWindowsHook WINELIB_NAME_AW(SetWindowsHook)
-HHOOK       WINAPI SetWindowsHookExA(INT,HOOKPROC,HINSTANCE,DWORD);
-HHOOK       WINAPI SetWindowsHookExW(INT,HOOKPROC,HINSTANCE,DWORD);
-#define     SetWindowsHookEx WINELIB_NAME_AW(SetWindowsHookEx)
-BOOL      WINAPI SetWindowPos(HWND,HWND,INT,INT,INT,INT,UINT);
-INT       WINAPI SetWindowRgn(HWND,HRGN,BOOL);
-BOOL      WINAPI SetWindowTextA(HWND,LPCSTR);
-BOOL      WINAPI SetWindowTextW(HWND,LPCWSTR);
-#define     SetWindowText WINELIB_NAME_AW(SetWindowText)
-WORD        WINAPI SetWindowWord(HWND,INT,WORD);
-BOOL      WINAPI ShowCaret(HWND);
-INT       WINAPI ShowCursor(BOOL);
-BOOL      WINAPI ShowScrollBar(HWND,INT,BOOL);
-BOOL      WINAPI ShowOwnedPopups(HWND,BOOL);
-BOOL      WINAPI ShowWindow(HWND,INT);
-BOOL      WINAPI ShowWindowAsync(HWND,INT);
-BOOL      WINAPI SubtractRect(LPRECT,const RECT*,const RECT*);
-BOOL      WINAPI SwapMouseButton(BOOL);
-VOID        WINAPI SwitchToThisWindow(HWND,BOOL);
-BOOL      WINAPI SystemParametersInfoA(UINT,UINT,LPVOID,UINT);
-BOOL      WINAPI SystemParametersInfoW(UINT,UINT,LPVOID,UINT);
-#define     SystemParametersInfo WINELIB_NAME_AW(SystemParametersInfo)
-LONG        WINAPI TabbedTextOutA(HDC,INT,INT,LPCSTR,INT,INT,const INT*,INT);
-LONG        WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT);
-#define     TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
-INT         WINAPI ToAscii(UINT,UINT,LPBYTE,LPWORD,UINT);
-INT         WINAPI ToAsciiEx(UINT,UINT,LPBYTE,LPWORD,UINT,HKL);
-BOOL        WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
-BOOL        WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
-INT         WINAPI TranslateAcceleratorA(HWND,HACCEL,LPMSG);
-INT         WINAPI TranslateAcceleratorW(HWND,HACCEL,LPMSG);
-#define     TranslateAccelerator WINELIB_NAME_AW(TranslateAccelerator)
-BOOL        WINAPI TranslateMDISysAccel(HWND,LPMSG);
-BOOL        WINAPI TranslateMessage(const MSG*);
-BOOL        WINAPI UnhookWindowsHook(INT,HOOKPROC);
-BOOL        WINAPI UnhookWindowsHookEx(HHOOK);
-BOOL        WINAPI UnionRect(LPRECT,const RECT*,const RECT*);
-BOOL        WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
-BOOL        WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
-#define     UnregisterClass WINELIB_NAME_AW(UnregisterClass)
-BOOL        WINAPI UpdateWindow(HWND);
-UINT        WINAPI UserRealizePalette(HDC);
-BOOL        WINAPI ValidateRect(HWND,const RECT*);
-BOOL        WINAPI ValidateRgn(HWND,HRGN);
-SHORT       WINAPI VkKeyScanA(CHAR);
-SHORT       WINAPI VkKeyScanW(WCHAR);
-#define     VkKeyScan WINELIB_NAME_AW(VkKeyScan)
-WORD        WINAPI VkKeyScanExA(CHAR, HKL);
-WORD        WINAPI VkKeyScanExW(WCHAR, HKL);
-#define     VkKeyScanEx WINELIB_NAME_AW(VkKeyScanEx)
-BOOL        WINAPI WaitMessage(void);
-HWND      WINAPI WindowFromDC(HDC);
-HWND      WINAPI WindowFromPoint(POINT);
-BOOL      WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR);
-BOOL      WINAPI WinHelpW(HWND,LPCWSTR,UINT,ULONG_PTR);
-#define     WinHelp WINELIB_NAME_AW(WinHelp)
-INT       WINAPIV wsprintfA(LPSTR,LPCSTR,...);
-INT       WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
-#define     wsprintf WINELIB_NAME_AW(wsprintf)
-INT       WINAPI wvsprintfA(LPSTR,LPCSTR,va_list);
-INT       WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list);
-#define     wvsprintf WINELIB_NAME_AW(wvsprintf)
+#define                       SetWindowLongPtr WINELIB_NAME_AW(SetWindowLongPtr)
+WINUSERAPI BOOL        WINAPI SetWindowPlacement(HWND,const WINDOWPLACEMENT*);
+WINUSERAPI HHOOK       WINAPI SetWindowsHookA(INT,HOOKPROC);
+WINUSERAPI HHOOK       WINAPI SetWindowsHookW(INT,HOOKPROC);
+#define                       SetWindowsHook WINELIB_NAME_AW(SetWindowsHook)
+WINUSERAPI HHOOK       WINAPI SetWindowsHookExA(INT,HOOKPROC,HINSTANCE,DWORD);
+WINUSERAPI HHOOK       WINAPI SetWindowsHookExW(INT,HOOKPROC,HINSTANCE,DWORD);
+#define                       SetWindowsHookEx WINELIB_NAME_AW(SetWindowsHookEx)
+WINUSERAPI BOOL        WINAPI SetWindowPos(HWND,HWND,INT,INT,INT,INT,UINT);
+WINUSERAPI INT         WINAPI SetWindowRgn(HWND,HRGN,BOOL);
+WINUSERAPI BOOL        WINAPI SetWindowTextA(HWND,LPCSTR);
+WINUSERAPI BOOL        WINAPI SetWindowTextW(HWND,LPCWSTR);
+#define                       SetWindowText WINELIB_NAME_AW(SetWindowText)
+WINUSERAPI WORD        WINAPI SetWindowWord(HWND,INT,WORD);
+WINUSERAPI HWINEVENTHOOK WINAPI SetWinEventHook(DWORD,DWORD,HMODULE,WINEVENTPROC,DWORD,DWORD,DWORD);
+WINUSERAPI BOOL        WINAPI ShowCaret(HWND);
+WINUSERAPI INT         WINAPI ShowCursor(BOOL);
+WINUSERAPI BOOL        WINAPI ShowScrollBar(HWND,INT,BOOL);
+WINUSERAPI BOOL        WINAPI ShowOwnedPopups(HWND,BOOL);
+WINUSERAPI BOOL        WINAPI ShowWindow(HWND,INT);
+WINUSERAPI BOOL        WINAPI ShowWindowAsync(HWND,INT);
+WINUSERAPI BOOL        WINAPI SubtractRect(LPRECT,const RECT*,const RECT*);
+WINUSERAPI BOOL        WINAPI SwapMouseButton(BOOL);
+WINUSERAPI BOOL        WINAPI SwitchDesktop(HDESK);
+WINUSERAPI VOID        WINAPI SwitchToThisWindow(HWND,BOOL);
+WINUSERAPI BOOL        WINAPI SystemParametersInfoA(UINT,UINT,LPVOID,UINT);
+WINUSERAPI BOOL        WINAPI SystemParametersInfoW(UINT,UINT,LPVOID,UINT);
+#define                       SystemParametersInfo WINELIB_NAME_AW(SystemParametersInfo)
+WINUSERAPI LONG        WINAPI TabbedTextOutA(HDC,INT,INT,LPCSTR,INT,INT,const INT*,INT);
+WINUSERAPI LONG        WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT);
+#define                       TabbedTextOut WINELIB_NAME_AW(TabbedTextOut)
+WINUSERAPI WORD        WINAPI TileWindows (HWND,UINT,const RECT *,UINT,const HWND *);
+WINUSERAPI INT         WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT);
+WINUSERAPI INT         WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL);
+WINUSERAPI INT         WINAPI ToUnicode(UINT,UINT,const BYTE *,LPWSTR,int,UINT);
+WINUSERAPI INT         WINAPI ToUnicodeEx(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL);
+WINUSERAPI BOOL        WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
+WINUSERAPI BOOL        WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*);
+WINUSERAPI BOOL        WINAPI TrackPopupMenuEx(HMENU,UINT,INT,INT,HWND,LPTPMPARAMS);
+WINUSERAPI INT         WINAPI TranslateAcceleratorA(HWND,HACCEL,LPMSG);
+WINUSERAPI INT         WINAPI TranslateAcceleratorW(HWND,HACCEL,LPMSG);
+#define                       TranslateAccelerator WINELIB_NAME_AW(TranslateAccelerator)
+WINUSERAPI BOOL        WINAPI TranslateMDISysAccel(HWND,LPMSG);
+WINUSERAPI BOOL        WINAPI TranslateMessage(const MSG*);
+WINUSERAPI BOOL        WINAPI UnhookWinEvent(HWINEVENTHOOK);
+WINUSERAPI BOOL        WINAPI UnhookWindowsHook(INT,HOOKPROC);
+WINUSERAPI BOOL        WINAPI UnhookWindowsHookEx(HHOOK);
+WINUSERAPI BOOL        WINAPI UnloadKeyboardLayout(HKL);
+WINUSERAPI BOOL        WINAPI UnionRect(LPRECT,const RECT*,const RECT*);
+WINUSERAPI BOOL        WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
+WINUSERAPI BOOL        WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
+#define                       UnregisterClass WINELIB_NAME_AW(UnregisterClass)
+WINUSERAPI BOOL        WINAPI UnregisterDeviceNotification(HDEVNOTIFY);
+WINUSERAPI BOOL        WINAPI UnregisterHotKey(HWND,INT);
+WINUSERAPI BOOL        WINAPI UpdateWindow(HWND);
+WINUSERAPI UINT        WINAPI UserRealizePalette(HDC);
+WINUSERAPI BOOL        WINAPI ValidateRect(HWND,const RECT*);
+WINUSERAPI BOOL        WINAPI ValidateRgn(HWND,HRGN);
+WINUSERAPI SHORT       WINAPI VkKeyScanA(CHAR);
+WINUSERAPI SHORT       WINAPI VkKeyScanW(WCHAR);
+#define                       VkKeyScan WINELIB_NAME_AW(VkKeyScan)
+WINUSERAPI WORD        WINAPI VkKeyScanExA(CHAR, HKL);
+WINUSERAPI WORD        WINAPI VkKeyScanExW(WCHAR, HKL);
+#define                       VkKeyScanEx WINELIB_NAME_AW(VkKeyScanEx)
+WINUSERAPI DWORD       WINAPI WaitForInputIdle(HANDLE,DWORD);
+WINUSERAPI BOOL        WINAPI WaitMessage(void);
+WINUSERAPI HWND        WINAPI WindowFromDC(HDC);
+WINUSERAPI HWND        WINAPI WindowFromPoint(POINT);
+WINUSERAPI BOOL        WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR);
+WINUSERAPI BOOL        WINAPI WinHelpW(HWND,LPCWSTR,UINT,ULONG_PTR);
+#define                       WinHelp WINELIB_NAME_AW(WinHelp)
+WINUSERAPI VOID        WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR);
+WINUSERAPI VOID        WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
+WINUSERAPI INT        WINAPIV wsprintfA(LPSTR,LPCSTR,...);
+WINUSERAPI INT        WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
+#define                       wsprintf WINELIB_NAME_AW(wsprintf)
+WINUSERAPI INT         WINAPI wvsprintfA(LPSTR,LPCSTR,__ms_va_list);
+WINUSERAPI INT         WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list);
+#define                       wvsprintf WINELIB_NAME_AW(wvsprintf)
 
 /* Undocumented functions */