Hi,
these patches are adding winapi-family check, and additional Win7/Win8
APIs. Ok for apply?
Regards,
Kai
diff --git a/mingw-w64-headers/include/commctrl.rh
b/mingw-w64-headers/include/commctrl.rh
index e71a922..9ac40a0 100644
--- a/mingw-w64-headers/include/commctrl.rh
+++ b/mingw-w64-headers/include/commctrl.rh
@@ -1,8 +1,8 @@
/**
- * This file has no copyright assigned and is placed in the Public Domain.
* This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
*/
+
#define HDS_HORZ 0x0
#define HDS_BUTTONS 0x2
#define HDS_HOTTRACK 0x4
@@ -11,6 +11,40 @@
#define HDS_FULLDRAG 0x80
#define HDS_FILTERBAR 0x100
#define HDS_FLAT 0x200
+#if NTDDI_VERSION >= 0x06000000
+#define HDS_CHECKBOXES 0x400
+#define HDS_NOSIZING 0x800
+#define HDS_OVERFLOW 0x1000
+#endif
+
+#define TBSTYLE_BUTTON 0x0
+#define TBSTYLE_SEP 0x1
+#define TBSTYLE_CHECK 0x2
+#define TBSTYLE_GROUP 0x4
+#define TBSTYLE_CHECKGROUP (TBSTYLE_GROUP | TBSTYLE_CHECK)
+#define TBSTYLE_DROPDOWN 0x8
+#define TBSTYLE_AUTOSIZE 0x10
+#define TBSTYLE_NOPREFIX 0x20
+#define TBSTYLE_TOOLTIPS 0x100
+#define TBSTYLE_WRAPABLE 0x200
+#define TBSTYLE_ALTDRAG 0x400
+#define TBSTYLE_FLAT 0x800
+#define TBSTYLE_LIST 0x1000
+#define TBSTYLE_CUSTOMERASE 0x2000
+#define TBSTYLE_REGISTERDROP 0x4000
+#define TBSTYLE_TRANSPARENT 0x8000
+
+#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_SHOWTEXT 0x40
+#define BTNS_WHOLEDROPDOWN 0x80
+
#define RBS_TOOLTIPS 0x100
#define RBS_VARHEIGHT 0x200
#define RBS_BANDBORDERS 0x400
@@ -19,15 +53,22 @@
#define RBS_AUTOSIZE 0x2000
#define RBS_VERTICALGRIPPER 0x4000
#define RBS_DBLCLKTOGGLE 0x8000
+
#define TTS_ALWAYSTIP 0x1
#define TTS_NOPREFIX 0x2
#define TTS_NOANIMATE 0x10
#define TTS_NOFADE 0x20
#define TTS_BALLOON 0x40
#define TTS_CLOSE 0x80
+#if NTDDI_VERSION >= 0x06000000
+#define TTS_USEVISUALSTYLE 0x100
+#endif
+
#define SBARS_SIZEGRIP 0x100
#define SBARS_TOOLTIPS 0x800
+
#define SBT_TOOLTIPS 0x800
+
#define TBS_AUTOTICKS 0x1
#define TBS_VERT 0x2
#define TBS_HORZ 0x0
@@ -43,17 +84,30 @@
#define TBS_TOOLTIPS 0x100
#define TBS_REVERSED 0x200
#define TBS_DOWNISLEFT 0x400
+#if _WIN32_IE >= 0x0600
+#define TBS_NOTIFYBEFOREMOVE 0x800
+#endif
+#if NTDDI_VERSION >= 0x06000000
+#define TBS_TRANSPARENTBKGND 0x1000
+#endif
+
#define UDS_WRAP 0x1
#define UDS_SETBUDDYINT 0x2
#define UDS_ALIGNRIGHT 0x4
#define UDS_ALIGNLEFT 0x8
#define UDS_AUTOBUDDY 0x10
#define UDS_ARROWKEYS 0x20
-#define UDS_HORZ 0x40
+#define UDS_HORZ 0x0040
#define UDS_NOTHOUSANDS 0x80
#define UDS_HOTTRACK 0x100
+
#define PBS_SMOOTH 0x1
#define PBS_VERTICAL 0x4
+#define PBS_MARQUEE 0x8
+#if NTDDI_VERSION >= 0x06000000
+#define PBS_SMOOTHREVERSE 0x10
+#endif
+
#define CCS_TOP 0x1L
#define CCS_NOMOVEY 0x2L
#define CCS_BOTTOM 0x3L
@@ -65,6 +119,16 @@
#define CCS_LEFT (CCS_VERT | CCS_TOP)
#define CCS_RIGHT (CCS_VERT | CCS_BOTTOM)
#define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY)
+
+#define LWS_TRANSPARENT 0x1
+#define LWS_IGNORERETURN 0x2
+#if NTDDI_VERSION >= 0x06000000
+#define LWS_NOPREFIX 0x4
+#define LWS_USEVISUALSTYLE 0x8
+#define LWS_USECUSTOMTEXT 0x10
+#define LWS_RIGHT 0x20
+#endif
+
#define LVS_ICON 0x0
#define LVS_REPORT 0x1
#define LVS_SMALLICON 0x2
@@ -80,10 +144,13 @@
#define LVS_EDITLABELS 0x200
#define LVS_OWNERDATA 0x1000
#define LVS_NOSCROLL 0x2000
+
#define LVS_TYPESTYLEMASK 0xfc00
+
#define LVS_ALIGNTOP 0x0
#define LVS_ALIGNLEFT 0x800
#define LVS_ALIGNMASK 0xc00
+
#define LVS_OWNERDRAWFIXED 0x400
#define LVS_NOCOLUMNHEADER 0x4000
#define LVS_NOSORTHEADER 0x8000
@@ -105,6 +172,20 @@
#define TVS_NONEVENHEIGHT 0x4000
#define TVS_NOHSCROLL 0x8000
+#define TVS_EX_NOSINGLECOLLAPSE 0x1
+#if NTDDI_VERSION >= 0x06000000
+#define TVS_EX_MULTISELECT 0x2
+#define TVS_EX_DOUBLEBUFFER 0x4
+#define TVS_EX_NOINDENTSTATE 0x8
+#define TVS_EX_RICHTOOLTIP 0x10
+#define TVS_EX_AUTOHSCROLL 0x20
+#define TVS_EX_FADEINOUTEXPANDOS 0x40
+#define TVS_EX_PARTIALCHECKBOXES 0x80
+#define TVS_EX_EXCLUSIONCHECKBOXES 0x100
+#define TVS_EX_DIMMEDCHECKBOXES 0x200
+#define TVS_EX_DRAWIMAGEASYNC 0x400
+#endif
+
#define TCS_SCROLLOPPOSITE 0x1
#define TCS_BOTTOM 0x2
#define TCS_RIGHT 0x2
@@ -136,6 +217,11 @@
#define MCS_WEEKNUMBERS 0x4
#define MCS_NOTODAYCIRCLE 0x8
#define MCS_NOTODAY 0x10
+#if NTDDI_VERSION >= 0x06000000
+#define MCS_NOTRAILINGDATES 0x40
+#define MCS_SHORTDAYSOFWEEK 0x80
+#define MCS_NOSELCHANGEONNAV 0x100
+#endif
#define DTS_UPDOWN 0x1
#define DTS_SHOWNONE 0x2
@@ -157,3 +243,18 @@
#define NFS_BUTTON 0x8
#define NFS_ALL 0x10
#define NFS_USEFONTASSOC 0x20
+
+#define BS_SPLITBUTTON 0xcL
+#define BS_DEFSPLITBUTTON 0xdL
+#define BS_COMMANDLINK 0xeL
+#define BS_DEFCOMMANDLINK 0xfL
+
+#define BCSIF_GLYPH 0x1
+#define BCSIF_IMAGE 0x2
+#define BCSIF_STYLE 0x4
+#define BCSIF_SIZE 0x8
+
+#define BCSS_NOSPLIT 0x1
+#define BCSS_STRETCH 0x2
+#define BCSS_ALIGNLEFT 0x4
+#define BCSS_IMAGE 0x8
diff --git a/mingw-w64-headers/include/commdlg.h
b/mingw-w64-headers/include/commdlg.h
index 555a08b..07a8a19 100644
--- a/mingw-w64-headers/include/commdlg.h
+++ b/mingw-w64-headers/include/commdlg.h
@@ -1,8 +1,10 @@
/**
- * This file has no copyright assigned and is placed in the Public Domain.
* This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
*/
+
+#include <winapifamily.h>
+
#ifndef _INC_COMMDLG
#define _INC_COMMDLG
@@ -19,6 +21,8 @@
DEFINE_GUID(IID_IPrintDialogServices,0x509aaeda,0x5639,0x11d1,0xb6,0xa1,0x0,0x0,
#include <pshpack1.h>
#endif
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -456,6 +460,9 @@ extern "C" {
#define CF_SELECTSCRIPT __MSABI_LONG(0x400000)
#define CF_NOSCRIPTSEL __MSABI_LONG(0x800000)
#define CF_NOVERTFONTS __MSABI_LONG(0x1000000)
+#if WINVER >= 0x0601
+#define CF_INACTIVEFONTS __MSABI_LONG (0x02000000)
+#endif
#define SIMULATED_FONTTYPE 0x8000
#define PRINTER_FONTTYPE 0x4000
@@ -468,6 +475,9 @@ extern "C" {
#define PS_OPENTYPE_FONTTYPE 0x10000
#define TT_OPENTYPE_FONTTYPE 0x20000
#define TYPE1_FONTTYPE 0x40000
+#if WINVER >= 0x0601
+#define SYMBOL_FONTTYPE 0x80000
+#endif
#endif
#define WM_CHOOSEFONT_GETLOGFONT (WM_USER + 1)
@@ -563,9 +573,11 @@ extern "C" {
#define INTERFACE IPrintDialogCallback
DECLARE_INTERFACE_(IPrintDialogCallback,IUnknown) {
+#ifndef __cplusplus
STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
+#endif
STDMETHOD(InitDone) (THIS) PURE;
STDMETHOD(SelectionChange) (THIS) PURE;
STDMETHOD(HandleMessage) (THIS_ HWND hDlg,UINT uMsg,WPARAM wParam,LPARAM
lParam,LRESULT *pResult) PURE;
@@ -574,9 +586,11 @@ extern "C" {
#undef INTERFACE
#define INTERFACE IPrintDialogServices
DECLARE_INTERFACE_(IPrintDialogServices,IUnknown) {
+#ifndef __cplusplus
STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
+#endif
STDMETHOD(GetCurrentDevMode) (THIS_ LPDEVMODE pDevMode,UINT *pcbSize) PURE;
STDMETHOD(GetCurrentPrinterName) (THIS_ LPTSTR pPrinterName,UINT
*pcchSize) PURE;
STDMETHOD(GetCurrentPortName) (THIS_ LPTSTR pPortName,UINT *pcchSize) PURE;
@@ -768,6 +782,8 @@ extern "C" {
}
#endif
+#endif
+
#ifndef _WIN64
#include <poppack.h>
#endif
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
