From 9e80cb966cd615cb5f0c61ce2fd0cc3574548fe6 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Fri, 22 Aug 2003 10:50:54 +0000 Subject: [PATCH] 2003-08-22 Danny Smith * include/winnt.h (IMAGE_SUBSYSTEM_XBOX): Add define. 2003-08-22 Mihai Preda * include/shlobj.h (IPersistFolder::GetClassID): Correct declaration. (CMF_*) Add missing defines. 2003-08-22 Danny Smith * include/winuser.h (DC_BUTTONS): Add define. 2003-08-22 Andrew Greenwood * include/winuser.h (DC_GRADIENT): Add define. 2003-08-22 Martin Fuchs * include/commctrl.h (BTNS_*): Define BTNS_* as successors to the older TBSTYLE_* constants. --- winsup/w32api/ChangeLog | 19 +++++++++++++++++++ winsup/w32api/include/commctrl.h | 14 ++++++++++++++ winsup/w32api/include/shlobj.h | 6 +++++- winsup/w32api/include/winnt.h | 1 + winsup/w32api/include/winuser.h | 10 +++++++++- 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 997f8f98b..368de8d45 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,22 @@ +2003-08-22 Mihai Preda + + * include/shlobj.h (IPersistFolder::GetClassID): + Correct declaration. + (CMF_*) Add missing defines. + +2003-08-22 Danny Smith + + * include/winuser.h (DC_BUTTONS): Add define. + +2003-08-22 Andrew Greenwood + + * include/winuser.h (DC_GRADIENT): Add define. + +2003-08-22 Martin Fuchs + + * include/commctrl.h (BTNS_*): Define BTNS_* as successors to the + older TBSTYLE_* constants. + 2003-08-18 Danny Smith * include/commctrl.h (TB_*) Group defines together. diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index c35e2c6a4..0126e52ea 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -382,6 +382,20 @@ extern "C" { #define TBSTYLE_TRANSPARENT 0x8000 #define TBSTYLE_EX_DRAWDDARROWS 0x00000001 #endif /* _WIN32_IE >= 0x0400 */ +#if (_WIN32_IE >= 0x0500) +#define BTNS_BUTTON TBSTYLE_BUTTON +#define BTNS_SEP TBSTYLE_SEP +#define BTNS_CHECK TBSTYLE_CHECK +#define BTNS_GROUP TBSTYLE_GROUP +#define BTNS_CHECKGROUP TBSTYLE_CHECKGROUP +#define BTNS_DROPDOWN TBSTYLE_DROPDOWN +#define BTNS_AUTOSIZE TBSTYLE_AUTOSIZE +#define BTNS_NOPREFIX TBSTYLE_NOPREFIX +#define BTNS_WHOLEDROPDOWN 0x0080 +#endif /* _WIN32_IE >= 0x0500 */ +#if _WIN32_IE >= 0x0501 +#define BTNS_SHOWTEXT 0x0040 +#endif #define HINST_COMMCTRL ((HINSTANCE)-1) #define IDB_STD_SMALL_COLOR 0 #define IDB_STD_LARGE_COLOR 1 diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index dc0da0e7d..e31244508 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -198,6 +198,10 @@ extern "C" { #define CMF_DEFAULTONLY 1 #define CMF_VERBSONLY 2 #define CMF_EXPLORE 4 +#define CMF_NOVERBS 8 +#define CMF_CANRENAME 16 +#define CMF_NODEFAULT 32 +#define CMF_INCLUDESTATIC 64 #define CMF_RESERVED 0xffff0000 #define GCS_VERBA 0 #define GCS_HELPTEXTA 1 @@ -639,7 +643,7 @@ DECLARE_INTERFACE_(IPersistFolder,IPersist) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetClassID)(THIS_ CLSID) PURE; + STDMETHOD(GetClassID)(THIS_ CLSID*) PURE; STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST) PURE; }; typedef IPersistFolder *LPPERSISTFOLDER; diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 10041b774..5b676507c 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -854,6 +854,7 @@ typedef DWORD FLONG; #define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 #define IMAGE_SUBSYSTEM_OS2_CUI 5 #define IMAGE_SUBSYSTEM_POSIX_CUI 7 +#define IMAGE_SUBSYSTEM_XBOX 14 #define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)) #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 #define IMAGE_DIRECTORY_ENTRY_IMPORT 1 diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index e6ba9b98e..e292e0a4a 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -1,6 +1,6 @@ #ifndef _WINUSER_H #define _WINUSER_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -381,8 +381,16 @@ extern "C" { #define DC_ICON 4 #define DC_TEXT 8 #define DC_INBUTTON 16 +#if (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500) +#define DC_GRADIENT 32 +#endif +#if ( _WIN32_WINNT >= 0x0501) +#define DC_BUTTONS 0x1000 +#endif +/* Where are these documented? */ #define DC_CAPTION (DC_ICON|DC_TEXT|DC_BUTTONS) #define DC_NC (DC_CAPTION|DC_FRAME) + #define BDR_RAISEDOUTER 1 #define BDR_SUNKENOUTER 2 #define BDR_RAISEDINNER 4