diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2004-12-29 15:15:19 +0300 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2004-12-29 15:15:19 +0300 |
| commit | 3a39329a25613c8db51a9b816b90767c19da895b (patch) | |
| tree | e43bfcc7d6437dbd1d0c4734cfff65bc57f1368f /winsup/w32api | |
| parent | 5f0fd5997465dda22325e49074f2dc2e19f55ed0 (diff) | |
2004-12-29 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
*include/winuser.h (MNS_*, WM_MENUCOMMAND,
WM_MENUGETOBJECT, WM_MENUDRAG, WM_NCMOUSEHOVER,
WM_NCMOUSELEAVE, WM_UNINITMENUPOPUP,
SPI_GETFOREGROUNDLOCKTIMEOUT,
SPI_SETFOREGROUNDLOCKTIMEOUT): Added definitions.
*include/imm.h (WM_IME_REQUEST): Added definition.
*include/shlobj.h (SLGP_RAWPATH,
SLGP_UNCPRIORITY): Added definition.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/imm.h | 3 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 3 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 16 |
4 files changed, 33 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index af44d6c66..d04766d3d 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,6 +1,17 @@ +2004-12-29 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> + + *include/winuser.h (MNS_*, WM_MENUCOMMAND, + WM_MENUGETOBJECT, WM_MENUDRAG, WM_NCMOUSEHOVER, + WM_NCMOUSELEAVE, WM_UNINITMENUPOPUP, + SPI_GETFOREGROUNDLOCKTIMEOUT, + SPI_SETFOREGROUNDLOCKTIMEOUT): Added definitions. + *include/imm.h (WM_IME_REQUEST): Added definition. + *include/shlobj.h (SLGP_RAWPATH, + SLGP_UNCPRIORITY): Added definition. + 2004-12-28 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> - *include/winuser.f (HSHELL_FLASH): Added definition. + *include/winuser.h (HSHELL_FLASH): Added definition. 2004-12-23 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> diff --git a/winsup/w32api/include/imm.h b/winsup/w32api/include/imm.h index 6ae9cab43..e3cc0d156 100644 --- a/winsup/w32api/include/imm.h +++ b/winsup/w32api/include/imm.h @@ -20,6 +20,9 @@ extern "C" { #define WM_IME_CHAR 0x286 #define WM_IME_KEYDOWN 0x290 #define WM_IME_KEYUP 0x291 +#if (WINVER >= 0x0500) +#define WM_IME_REQUEST 0x0288 +#endif #define IMC_GETCANDIDATEPOS 7 #define IMC_SETCANDIDATEPOS 8 #define IMC_GETCOMPOSITIONFONT 9 diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 6e513ba84..07f4bdae4 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -462,7 +462,8 @@ typedef enum { } SLR_FLAGS; typedef enum { SLGP_SHORTPATH=1, - SLGP_UNCPRIORITY + SLGP_UNCPRIORITY=2, + SLGP_RAWPATH=4 } SLGP_FLAGS; typedef PBYTE LPVIEWSETTINGS; typedef enum { diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 2395a30de..f4db88dee 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -670,6 +670,12 @@ extern "C" { #define MIM_MENUDATA 8 #define MIM_STYLE 16 #define MIM_APPLYTOSUBMENUS 0x80000000L +#define MNS_NOCHECK 0x80000000 +#define MNS_MODELESS 0x40000000 +#define MNS_DRAGDROP 0x20000000 +#define MNS_AUTODISMISS 0x10000000 +#define MNS_NOTIFYBYPOS 0x08000000 +#define MNS_CHECKORBMP 0x04000000 #endif #define MFT_BITMAP 4 #define MFT_MENUBARBREAK 32 @@ -1124,6 +1130,10 @@ extern "C" { #define HSHELL_WINDOWCREATED 1 #define HSHELL_WINDOWDESTROYED 2 #define HSHELL_FLASH 32774 +#if (WINVER >= 0x0500) +#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001 +#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000 +#endif #define SPI_GETACCESSTIMEOUT 60 #define SPI_GETACTIVEWNDTRKTIMEOUT 8194 #define SPI_GETANIMATION 72 @@ -1345,7 +1355,11 @@ extern "C" { #define WM_MDITILE 550 #define WM_MEASUREITEM 44 #if (WINVER >= 0x0500) +#define WM_UNINITMENUPOPUP 0x0125 #define WM_MENURBUTTONUP 290 +#define WM_MENUCOMMAND 0x0126 +#define WM_MENUGETOBJECT 0x0124 +#define WM_MENUDRAG 0x0123 #endif #define WM_MENUCHAR 288 #define WM_MENUSELECT 287 @@ -1367,6 +1381,8 @@ extern "C" { #define WM_NCXBUTTONDOWN 171 #define WM_NCXBUTTONUP 172 #define WM_NCXBUTTONDBLCLK 173 +#define WM_NCMOUSEHOVER 0x02A0 +#define WM_NCMOUSELEAVE 0x02A2 #endif #define WM_NCMOUSEMOVE 160 #define WM_NCPAINT 133 |