include: Add new Vista SDK constants, fields and structures documented at http://ian.joeuser.com/index.asp?AID=738

Francois Gouget fgouget at free.fr
Thu Sep 7 13:03:42 CDT 2006


---
 include/commctrl.h |  132 ++++++++++++++++++++++++++++++++++++++++++++++++----
 include/winuser.h  |    4 ++
 2 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/include/commctrl.h b/include/commctrl.h
index 86d7bfd..95379f8 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -119,7 +119,9 @@ #define NM_TOOLTIPSCREATED      (NM_FIRS
 #define NM_LDOWN                (NM_FIRST-20)
 #define NM_RDOWN                (NM_FIRST-21)
 #define NM_THEMECHANGED         (NM_FIRST-22)
-
+#define NM_FONTCHANGED          (NM_FIRST-23)
+#define NM_CUSTOMTEXT           (NM_FIRST-24)
+#define NM_TVSTATEIMAGECHANGING (NM_FIRST-24)
 
 #define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) \
     (fn)((hwnd), (int)(wParam), (NMHDR*)(lParam))
@@ -253,6 +255,9 @@ #define CDIS_HOT                0x0040
 #define CDIS_MARKED             0x0080
 #define CDIS_INDETERMINATE      0x0100
 #define CDIS_SHOWKEYBOARDCUES   0x0200
+#define CDIS_NEARHOT            0x0400
+#define CDIS_OTHERSIDEHOT       0x0800
+#define CDIS_DROPHILITED        0x1000
 
 
 typedef struct tagNMCUSTOMDRAWINFO
@@ -524,6 +529,7 @@ #define ILD_OVERLAYMASK   0x0F00
 #define ILD_PRESERVEALPHA 0x1000
 #define ILD_SCALE         0x2000
 #define ILD_DPISCALE      0x4000
+#define ILD_ASYNC         0x8000
 
 #define ILD_SELECTED     ILD_BLEND50
 #define ILD_FOCUS        ILD_BLEND25
@@ -535,11 +541,18 @@ #define INDEXTOSTATEIMAGEMASK(i) ((i)<<1
 #define ILCF_MOVE        (0x00000000)
 #define ILCF_SWAP        (0x00000001)
 
+#define ILGT_NORMAL     0x0000
+#define ILGT_ASYNC      0x0001
+
 #define ILS_NORMAL	0x0000
 #define ILS_GLOW	0x0001
 #define ILS_SHADOW	0x0002
 #define ILS_SATURATE	0x0004
 #define ILS_ALPHA	0x0008
+#define ILS_EMBOSS      0x0010
+#define ILS_REFLECT     0x0020
+#define ILS_INVERT      0x0040
+#define ILS_EFFECTS     0x007F
 
 typedef struct _IMAGEINFO
 {
@@ -726,6 +739,7 @@ #define HDS_DRAGDROP            0x0040
 #define HDS_FULLDRAG            0x0080
 #define HDS_FILTERBAR           0x0100
 #define HDS_FLAT                0x0200
+#define HDS_CHECKBOXES          0x0400
 
 #define HDI_WIDTH               0x0001
 #define HDI_HEIGHT              HDI_WIDTH
@@ -743,7 +757,9 @@ #define HDF_RIGHT               0x0001
 #define HDF_CENTER              0x0002
 #define HDF_JUSTIFYMASK         0x0003
 #define HDF_RTLREADING          0x0004
-
+#define HDF_CHECKBOX            0x0040
+#define HDF_CHECKED             0x0080
+#define HDF_FIXEDWIDTH          0x0100
 #define HDF_SORTDOWN            0x0200
 #define HDF_SORTUP              0x0400
 #define HDF_IMAGE               0x0800
@@ -762,6 +778,7 @@ #define HHT_ABOVE               0x0100
 #define HHT_BELOW               0x0200
 #define HHT_TORIGHT             0x0400
 #define HHT_TOLEFT              0x0800
+#define HHT_ONITEMSTATEICON     0x1000
 
 #define HDM_FIRST               0x1200
 #define HDM_GETITEMCOUNT        (HDM_FIRST+0)
@@ -827,6 +844,10 @@ #define HDN_BEGINDRAG           (HDN_FIR
 #define HDN_ENDDRAG             (HDN_FIRST-11)
 #define HDN_FILTERCHANGE        (HDN_FIRST-12)
 #define HDN_FILTERBTNCLICK      (HDN_FIRST-13)
+#define HDN_BEGINFILTEREDIT     (HDN_FIRST-14)
+#define HDN_ENDFILTEREDIT       (HDN_FIRST-15)
+#define HDN_ITEMSTATEICONCLICK  (HDN_FIRST-16)
+#define HDN_ITEMKEYDOWN         (HDN_FIRST-17)
 
 typedef struct _HD_LAYOUT
 {
@@ -1273,6 +1295,7 @@ #define TBCDRF_NOETCHEDEFFECT 0x00100000
                                           /* disabled items                */
 #define TBCDRF_BLENDICON      0x00200000  /* ILD_BLEND50 on the icon image */
 #define TBCDRF_NOBACKGROUND   0x00400000  /* ILD_BLEND50 on the icon image */
+#define TBCDRF_USECDCOLORS    0x00800000
 
 
 /* This is just for old CreateToolbar. */
@@ -1505,6 +1528,7 @@ #define HICF_LEAVING        0x00000020  
 #define HICF_RESELECT       0x00000040   /* hot item reselected            */
 #define HICF_LMOUSE         0x00000080   /* left mouse button selected     */
 #define HICF_TOGGLEDROPDOWN 0x00000100   /* Toggle button's dropdown state */
+#define HICF_STYLUS         0x00000200
 
 typedef struct
 {
@@ -1604,6 +1628,7 @@ #define TTS_NOANIMATE           0x10
 #define TTS_NOFADE              0x20
 #define TTS_BALLOON             0x40
 #define TTS_CLOSE               0x80
+#define TTS_USEVISUALSTYLE      0x100
 
 #define TTF_IDISHWND            0x0001
 #define TTF_CENTERTIP           0x0002
@@ -1707,6 +1732,7 @@ typedef struct tagTOOLINFOA {
     LPSTR lpszText;
     LPARAM lParam;
     void *lpReserved;
+    HBITMAP hbmp;
 } TTTOOLINFOA, *LPTOOLINFOA, *PTOOLINFOA, *LPTTTOOLINFOA;
 
 typedef struct tagTOOLINFOW {
@@ -1719,6 +1745,7 @@ typedef struct tagTOOLINFOW {
     LPWSTR lpszText;
     LPARAM lParam;
     void *lpReserved;
+    HBITMAP hbmp;
 } TTTOOLINFOW, *LPTOOLINFOW, *PTOOLINFOW, *LPTTTOOLINFOW;
 
 #define TTTOOLINFO WINELIB_NAME_AW(TTTOOLINFO)
@@ -1753,22 +1780,24 @@ #define LPHITTESTINFO WINELIB_NAME_AW(LP
 
 typedef struct tagNMTTDISPINFOA
 {
-    NMHDR hdr;
-    LPSTR lpszText;
-    CHAR  szText[80];
+    NMHDR     hdr;
+    LPSTR     lpszText;
+    CHAR      szText[80];
     HINSTANCE hinst;
     UINT      uFlags;
-    LPARAM      lParam;
+    LPARAM    lParam;
+    HBITMAP   hbmp;
 } NMTTDISPINFOA, *LPNMTTDISPINFOA;
 
 typedef struct tagNMTTDISPINFOW
 {
-    NMHDR       hdr;
-    LPWSTR      lpszText;
-    WCHAR       szText[80];
+    NMHDR     hdr;
+    LPWSTR    lpszText;
+    WCHAR     szText[80];
     HINSTANCE hinst;
     UINT      uFlags;
-    LPARAM      lParam;
+    LPARAM    lParam;
+    HBITMAP   hbmp;
 } NMTTDISPINFOW, *LPNMTTDISPINFOW;
 
 #define NMTTDISPINFO WINELIB_NAME_AW(NMTTDISPINFO)
@@ -1808,6 +1837,8 @@ static const WCHAR REBARCLASSNAMEW[] = {
 #endif
 #define REBARCLASSNAME          WINELIB_NAME_AW(REBARCLASSNAME)
 
+#define RBS_EX_TRANSPARENT      0x0001
+#define RBS_EX_SPLITTER         0x0002
 #define RBS_TOOLTIPS            0x0100
 #define RBS_VARHEIGHT           0x0200
 #define RBS_BANDBORDERS         0x0400
@@ -2896,6 +2927,14 @@ #define LVS_EX_HIDELABELS       0x000200
 #define LVS_EX_SINGLEROW        0x00040000
 #define LVS_EX_SNAPTOGRID       0x00080000
 #define LVS_EX_SIMPLESELECT     0x00100000
+#define LVS_EX_JUSTIFYCOLUMNS   0x00200000
+#define LVS_EX_TRANSPARENTBKGND 0x00400000
+#define LVS_EX_TRANSPARENTSHADOWTEXT 0x00800000
+#define LVS_EX_AUTOAUTOARRANGE  0x01000000
+#define LVS_EX_HEADERINALLVIEWS 0x02000000
+#define LVS_EX_AUTOCHECKSELECT  0x08000000
+#define LVS_EX_AUTOSIZECOLUMNS  0x10000000
+#define LVS_EX_COLUMNSNAPPOINTS 0x40000000
 
 #define LVCF_FMT                0x0001
 #define LVCF_WIDTH              0x0002
@@ -2908,9 +2947,16 @@ #define LVCFMT_LEFT             0x0000
 #define LVCFMT_RIGHT            0x0001
 #define LVCFMT_CENTER           0x0002
 #define LVCFMT_JUSTIFYMASK      0x0003
+#define LVCFMT_FIXED_WIDTH      0x0100
 #define LVCFMT_IMAGE            0x0800
 #define LVCFMT_BITMAP_ON_RIGHT  0x1000
 #define LVCFMT_COL_HAS_IMAGES   0x8000
+#define LVCFMT_NO_DPI_SCALE     0x00040000
+#define LVCFMT_FIXED_RATIO      0x00080000
+#define LVCFMT_LINE_BREAK       0x00100000
+#define LVCFMT_FILL_TITLE       0x00200000
+#define LVCFMT_FILL_NOTITLE     0x00400000
+#define LVCFMT_TILE_PLACEMENTMASK (LVCFMT_LINE_BREAK | LVCFMT_FILL_TITLE | LVCFMT_FILL_NOTITLE)
 
 #define LVSIL_NORMAL            0
 #define LVSIL_SMALL             1
@@ -2937,6 +2983,7 @@ #define LVIF_GROUPID            0x0100
 #define LVIF_COLUMNS            0x0200
 #define LVIF_NORECOMPUTE        0x0800
 #define LVIF_DI_SETITEM         0x1000
+#define LVIF_COLFMT             0x00010000
 
 #define LVIR_BOUNDS             0x0000
 #define LVIR_ICON               0x0001
@@ -2987,6 +3034,15 @@ #define LVGF_FOOTER             0x000000
 #define LVGF_STATE              0x00000004
 #define LVGF_ALIGN              0x00000008
 #define LVGF_GROUPID            0x00000010
+#define LVGF_SUBTITLE           0x00000100
+#define LVGF_TASK               0x00000200
+#define LVGF_DESCRIPTIONTOP     0x00000400
+#define LVGF_DESCRIPTIONBOTTOM  0x00000800
+#define LVGF_TITLEIMAGE         0x00001000
+#define LVGF_EXTENDEDIMAGE      0x00002000
+#define LVGF_ITEMS              0x00004000
+#define LVGF_SUBSET             0x00008000
+#define LVGF_SUBSETITEMS        0x00010000
 
 #define LVGS_NORMAL             0x00000000
 #define LVGS_COLLAPSED          0x00000001
@@ -3008,6 +3064,7 @@ #define LVTVIF_AUTOSIZE         0x000000
 #define LVTVIF_FIXEDWIDTH       0x00000001
 #define LVTVIF_FIXEDHEIGHT      0x00000002
 #define LVTVIF_FIXEDSIZE        0x00000003
+#define LVTVIF_EXTENDED         0x00000004
 
 #define LVTVIM_TILESIZE         0x00000001
 #define LVTVIM_COLUMNS          0x00000002
@@ -3192,12 +3249,21 @@ #define LVN_MARQUEEBEGIN        (LVN_FIR
 #define LVN_GETINFOTIPA         (LVN_FIRST-57)
 #define LVN_GETINFOTIPW         (LVN_FIRST-58)
 #define LVN_GETINFOTIP          WINELIB_NAME_AW(LVN_GETINFOTIP)
+#define LVN_BEGINSCROLL         (LVN_FIRST-80)
+#define LVN_ENDSCROLL           (LVN_FIRST-81)
+#define LVN_LINKCLICK           (LVN_FIRST-84)
+#define LVN_ASYNCDRAWN          (LVN_FIRST-86)
+#define LVN_GETEMPTYMARKUP      (LVN_FIRST-87)
 
 #define LVA_DEFAULT             0x0000
 #define LVA_ALIGNLEFT           0x0001
 #define LVA_ALIGNTOP            0x0002
 #define LVA_SNAPTOGRID          0x0005
 
+#define LVADPART_ITEM           0
+#define LVADPART_GROUP          1
+
+
 typedef struct tagLVITEMA
 {
     UINT mask;
@@ -3213,6 +3279,8 @@ typedef struct tagLVITEMA
     int iGroupId;       /* (_WIN32_IE >= 0x560) */
     UINT cColumns;      /* (_WIN32_IE >= 0x560) */
     PUINT puColumns;	/* (_WIN32_IE >= 0x560) */
+    int* piColFmt;
+    int iGroup;
 } LVITEMA, *LPLVITEMA;
 
 typedef struct tagLVITEMW
@@ -3230,6 +3298,8 @@ typedef struct tagLVITEMW
     int iGroupId;       /* (_WIN32_IE >= 0x560) */
     UINT cColumns;      /* (_WIN32_IE >= 0x560) */
     PUINT puColumns;	/* (_WIN32_IE >= 0x560) */
+    int* piColFmt;
+    int iGroup;
 } LVITEMW, *LPLVITEMW;
 
 #define LVITEM   WINELIB_NAME_AW(LVITEM)
@@ -3250,6 +3320,7 @@ typedef struct LVSETINFOTIP
     LPWSTR pszText;
     int iItem;
     int iSubItem;
+    HBITMAP hbmp;
 } LVSETINFOTIP, *PLVSETINFOTIP;
 
 /* ListView background image structs and constants
@@ -3399,6 +3470,7 @@ typedef struct tagNMLVGETINFOTIPA
     int iItem;
     int iSubItem;
     LPARAM lParam;
+    HBITMAP hbmp;
 } NMLVGETINFOTIPA, *LPNMLVGETINFOTIPA;
 
 typedef struct tagNMLVGETINFOTIPW
@@ -3466,6 +3538,20 @@ typedef struct LVGROUP
 	UINT stateMask;
 	UINT state;
 	UINT uAlign;
+	LPWSTR pszSubtitle;
+	UINT cchSubtitle;
+	LPWSTR pszTask;
+	UINT cchTask;
+	LPWSTR pszDescriptionTop;
+	UINT cchDescriptionTop;
+	LPWSTR pszDescriptionBottom;
+	UINT cchDescriptionBottom;
+	int iTitleImage;
+	int iExtendedImage;
+	int iFirstItem;
+	UINT cItems;
+	LPWSTR pszSubsetTitle;
+	UINT cchSubsetTitle;
 } LVGROUP, *PLVGROUP;
 
 typedef struct LVGROUPMETRICS
@@ -3501,6 +3587,7 @@ typedef struct LVTILEINFO
 	int iItem;
 	UINT cColumns;
 	PUINT puColumns;
+	int* piColFmt;
 } LVTILEINFO, *PLVTILEINFO;
 
 typedef struct LVTILEVIEWINFO
@@ -3533,6 +3620,19 @@ typedef INT (CALLBACK *PFNLVCOMPARE)(LPA
 
 #define NMLVCUSTOMDRAW_V3_SIZE CCSIZEOF_STRUCT(NMLCUSTOMDRW, clrTextBk)
 
+typedef struct tagNMLVASYNCDRAWN
+{
+    NMHDR hdr;
+    IMAGELISTDRAWPARAMS* pimldp;
+    HRESULT hr;
+    int iPart;
+    int iItem;
+    int iSubItem;
+    LPARAM lParam;
+    DWORD dwRetFlags;
+    int iRetImageIndex;
+} NMLVASYNCDRAWN;
+
 typedef struct tagNMLVCUSTOMDRAW
 {
     NMCUSTOMDRAW nmcd;
@@ -3796,6 +3896,10 @@ #define ListView_GetView(hwnd) \
     (DWORD)SNDMSG((hwnd), LVM_GETVIEW, 0, 0)
 #define ListView_InsertGroup(hwnd, index, pgrp) \
     SNDMSG((hwnd), LVM_INSERTGROUP, (WPARAM)index, (LPARAM)pgrp)
+#define ListView_SetGroupHeaderImageList(hwnd, himl) \
+    SNDMSG((hwnd), LVM_SETIMAGELIST, (WPARAM)LVSIL_GROUPHEADER, (LPARAM)himl)
+#define ListView_GetGroupHeaderImageList(hwnd) \
+    SNDMSG((hwnd), LVM_GETIMAGELIST, (WPARAM)LVSIL_GROUPHEADER, 0)
 #define ListView_SetGroupInfo(hwnd, iGroupId, pgrp) \
     SNDMSG((hwnd), LVM_SETGROUPINFO, (WPARAM)iGroupId, (LPARAM)pgrp)
 #define ListView_GetGroupInfo(hwnd, iGroupId, pgrp) \
@@ -4870,6 +4974,14 @@ typedef struct tagNMLINK
   LITEM item;
 } NMLINK, *PNMLINK;
 
+typedef struct tagNMLVLINK
+{
+    NMHDR hdr;
+    LITEM link;
+    int iItem;
+    int iSubItem;
+} NMLVLINK, *PNMLVLINK;
+
 /**************************************************************************
  * Static control
  */
diff --git a/include/winuser.h b/include/winuser.h
index cd83c5a..7847e44 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -951,6 +951,7 @@ #define SM_MEDIACENTER        87
 #define SM_STARTER            88
 #define SM_SERVERR2           89
 #define SM_CMETRICS           90
+#define SM_MOUSEHORIZONTALWHEELPRESENT 91
 
 
 /* Messages */
@@ -2642,6 +2643,7 @@ #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 */
@@ -2800,6 +2802,8 @@ #define SPI_GETWHEELSCROLLLINES   104
 #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
 #define SPI_GETMOUSESPEED         112
-- 
1.4.1.1




More information about the wine-patches mailing list