Author: fireball Date: Sat Nov 7 20:56:54 2009 New Revision: 44016
URL: http://svn.reactos.org/svn/reactos?rev=44016&view=rev Log: - Merge r44013 and r44015 from trunk (commctrl.h updates).
Modified: branches/arwinss/reactos/include/psdk/commctrl.h (contents, props changed)
Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/com... ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Nov 7 20:56:54 2009 @@ -568,6 +568,7 @@ } IMAGELISTDRAWPARAMS, *LPIMAGELISTDRAWPARAMS;
+HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **); INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP); INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF); BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT); @@ -1595,25 +1596,6 @@ # define TOOLTIPS_CLASSW L"tooltips_class32" #define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS)
-#if (_WIN32_WINNT >= 0x501) -#define BUTTON_IMAGELIST_ALIGN_LEFT 0 -#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 -#define BUTTON_IMAGELIST_ALIGN_TOP 2 -#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 -#define BUTTON_IMAGELIST_ALIGN_CENTER 4 - -typedef struct -{ - HIMAGELIST himl; - RECT margin; - UINT uAlign; -} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; - -#define BCM_FIRST 0x1600 -#define BCM_GETIDEALSIZE (BCM_FIRST + 1) -#define BCM_SETIMAGELIST (BCM_FIRST + 2) -#endif /* _WIN32_WINNT */ - #define INFOTIPSIZE 1024
#define TTS_ALWAYSTIP 0x01 @@ -1749,6 +1731,10 @@ #define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText) #define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText) #define TTTOOLINFO_V1_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(TTTOOLINFO), lpszText) +#define TTTOOLINFOA_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lParam) +#define TTTOOLINFOW_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lParam) +#define TTTOOLINFOA_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpReserved) +#define TTTOOLINFOW_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpReserved)
typedef struct _TT_HITTESTINFOA { @@ -4237,9 +4223,10 @@ #define TCN_FIRST (0U-550U) #define TCN_LAST (0U-580U) #define TCN_KEYDOWN (TCN_FIRST - 0) -#define TCN_SELCHANGE (TCN_FIRST - 1) +#define TCN_SELCHANGE (TCN_FIRST - 1) #define TCN_SELCHANGING (TCN_FIRST - 2) #define TCN_GETOBJECT (TCN_FIRST - 3) +#define TCN_FOCUSCHANGE (TCN_FIRST - 4)
#include <pshpack1.h> typedef struct tagTCKEYDOWN @@ -4642,6 +4629,7 @@ #define MCS_WEEKNUMBERS 0x0004 #define MCS_NOTODAY 0x0010 #define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTRAILINGDATES 0x0040
#define MCHT_TITLE 0x00010000 #define MCHT_CALENDAR 0x00020000 @@ -4677,7 +4665,14 @@ POINT pt; UINT uHit; SYSTEMTIME st; + /* Vista */ + RECT rc; + INT iOffset; + INT iRow; + INT iCol; } MCHITTESTINFO, *PMCHITTESTINFO; + +#define MCHITTESTINFO_V1_SIZE CCSIZEOF_STRUCT(MCHITTESTINFO, st)
typedef struct tagNMSELCHANGE { @@ -4701,51 +4696,51 @@ /* macros */
#define MonthCal_GetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_SetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_GetMaxSelCount(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXSELCOUNT, 0, 0L) + (DWORD)SNDMSG(hmc, MCM_GETMAXSELCOUNT, 0, 0L) #define MonthCal_SetMaxSelCount(hmc, n) \ - (BOOL)SNDMSGA(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) + (BOOL)SNDMSG(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) #define MonthCal_GetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_SetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_GetMonthRange(hmc, gmr, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) #define MonthCal_SetDayState(hmc, cbds, rgds) \ - SNDMSGA(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) + SNDMSG(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) #define MonthCal_GetMinReqRect(hmc, prc) \ - SNDMSGA(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) + SNDMSG(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) #define MonthCal_SetColor(hmc, iColor, clr)\ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, clr) + SNDMSG(hmc, MCM_SETCOLOR, iColor, clr) #define MonthCal_GetColor(hmc, iColor) \ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, 0) + SNDMSG(hmc, MCM_SETCOLOR, iColor, 0) #define MonthCal_GetToday(hmc, pst)\ - (BOOL)SNDMSGA(hmc, MCM_GETTODAY, 0, (LPARAM)pst) + (BOOL)SNDMSG(hmc, MCM_GETTODAY, 0, (LPARAM)pst) #define MonthCal_SetToday(hmc, pst)\ - SNDMSGA(hmc, MCM_SETTODAY, 0, (LPARAM)pst) + SNDMSG(hmc, MCM_SETTODAY, 0, (LPARAM)pst) #define MonthCal_HitTest(hmc, pinfo) \ - SNDMSGA(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) + SNDMSG(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) #define MonthCal_SetFirstDayOfWeek(hmc, iDay) \ - SNDMSGA(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) + SNDMSG(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) #define MonthCal_GetFirstDayOfWeek(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) #define MonthCal_GetRange(hmc, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) #define MonthCal_SetRange(hmc, gd, rgst) \ - (BOOL)SNDMSGA(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define MonthCal_GetMonthDelta(hmc) \ - (int)SNDMSGA(hmc, MCM_GETMONTHDELTA, 0, 0) + (int)SNDMSG(hmc, MCM_GETMONTHDELTA, 0, 0) #define MonthCal_SetMonthDelta(hmc, n) \ - (int)SNDMSGA(hmc, MCM_SETMONTHDELTA, n, 0) + (int)SNDMSG(hmc, MCM_SETMONTHDELTA, n, 0) #define MonthCal_GetMaxTodayWidth(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) #define MonthCal_SetUnicodeFormat(hwnd, fUnicode) \ - (BOOL)SNDMSGA((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) + (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd), MCM_GETUNICODEFORMAT, 0, 0) + (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0)
/************************************************************************** @@ -4905,28 +4900,28 @@
#define DateTime_GetSystemtime(hdp, pst) \ - (DWORD)SNDMSGA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) + (DWORD)SNDMSG (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) #define DateTime_SetSystemtime(hdp, gd, pst) \ - (BOOL)SNDMSGA (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) + (BOOL)SNDMSG (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) #define DateTime_GetRange(hdp, rgst) \ - (DWORD)SNDMSGA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) #define DateTime_SetRange(hdp, gd, rgst) \ - (BOOL)SNDMSGA (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define DateTime_SetFormatA(hdp, sz) \ (BOOL)SNDMSGA (hdp, DTM_SETFORMATA, 0, (LPARAM)(sz)) #define DateTime_SetFormatW(hdp, sz) \ (BOOL)SNDMSGW (hdp, DTM_SETFORMATW, 0, (LPARAM)(sz)) #define DateTime_SetFormat WINELIB_NAME_AW(DateTime_SetFormat) #define DateTime_GetMonthCalColor(hdp, iColor) \ - SNDMSGA (hdp, DTM_GETMCCOLOR, iColor, 0) + SNDMSG (hdp, DTM_GETMCCOLOR, iColor, 0) #define DateTime_SetMonthCalColor(hdp, iColor, clr) \ - SNDMSGA (hdp, DTM_SETMCCOLOR, iColor, clr) + SNDMSG (hdp, DTM_SETMCCOLOR, iColor, clr) #define DateTime_GetMonthCal(hdp) \ - (HWND) SNDMSGA (hdp, DTM_GETMONTHCAL, 0, 0) + (HWND) SNDMSG (hdp, DTM_GETMONTHCAL, 0, 0) #define DateTime_SetMonthCalFont(hdp, hfont, fRedraw) \ - SNDMSGA (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) + SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ - SNDMSGA (hdp, DTM_GETMCFONT, 0, 0) + SNDMSG (hdp, DTM_GETMCFONT, 0, 0)
#define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff) @@ -4997,6 +4992,9 @@ struct IStream; typedef HRESULT (CALLBACK *PFNDPASTREAM)(DPASTREAMINFO*, struct IStream*, LPVOID);
+HRESULT WINAPI DPA_LoadStream(HDPA*, PFNDPASTREAM, struct IStream*, LPVOID); +HRESULT WINAPI DPA_SaveStream(HDPA, PFNDPASTREAM, struct IStream*, LPVOID); + BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR);
/************************************************************************** @@ -5010,6 +5008,10 @@ #else static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; #endif + +/* SysLink styles */ +#define LWS_TRANSPARENT 0x0001 +#define LWS_IGNORERETURN 0x0002
/* SysLink messages */ #define LM_HITTEST (WM_USER + 768)
Propchange: branches/arwinss/reactos/include/psdk/commctrl.h ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Nov 7 20:56:54 2009 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 +/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015
-
fireball＠svn.reactos.org