From: Luke Dunstan Date: Sat, 5 Jun 2004 13:01:07 +0000 (+0000) Subject: 2004-06-02 Rocher Laurent X-Git-Tag: gdb_6_3-20041019-branchpoint~342 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=99745be758580371785ab1d27a5476d6df616100;p=newlib-cygwin.git 2004-06-02 Rocher Laurent * include/commctrl.h (Animate_OpenEx): Define. (DateTime_GetSystemTime, DateTime_SetSystemTime): Correct names. (ListView_GetNumberOfWorkAreas): Correct macro. (ListView_SetUnicodeFormat, ListView_GetUnicodeFormat, ListView_SetItemCountEx, ListView_GetISearchString, TreeView_GetLastVisible, Header_CreateDragImage, Header_SetImageList, Header_GetImageList): Define. (LVM_SETUNICODEFORMAT, LVM_GETUNICODEFORMAT, MCM_GETUNICODEFORMAT, MCM_SETUNICODEFORMAT, TBSTATE_ELLIPSES): Define. (MonthCal_SetRange): Correct macro. (ImageList_Duplicate): Declare. --- diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 33b5b89c0..a88c662fc 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,18 @@ +2004-06-02 Rocher Laurent + + * include/commctrl.h (Animate_OpenEx): Define. + (DateTime_GetSystemTime, DateTime_SetSystemTime): Correct names. + (ListView_GetNumberOfWorkAreas): Correct macro. + (ListView_SetUnicodeFormat, ListView_GetUnicodeFormat, + ListView_SetItemCountEx, ListView_GetISearchString, + TreeView_GetLastVisible, Header_CreateDragImage, + Header_SetImageList, Header_GetImageList): Define. + (LVM_SETUNICODEFORMAT, LVM_GETUNICODEFORMAT, + MCM_GETUNICODEFORMAT, MCM_SETUNICODEFORMAT, + TBSTATE_ELLIPSES): Define. + (MonthCal_SetRange): Correct macro. + (ImageList_Duplicate): Declare. + 2004-05-29 Filip Navara * include/winnt.h (IMAGE_EXPORT_DIRECTORY): Fixed declaration. diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index d8df9f411..46d40fde6 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -416,6 +416,9 @@ extern "C" { #define TBSTATE_HIDDEN 8 #define TBSTATE_INDETERMINATE 16 #define TBSTATE_WRAP 32 +#if (_WIN32_IE >= 0x0300) +#define TBSTATE_ELLIPSES 0x40 +#endif #if (_WIN32_IE >= 0x0400) #define TBSTATE_MARKED 0x0080 #endif @@ -1041,6 +1044,8 @@ extern "C" { #define LVM_GETHOVERTIME (LVM_FIRST+72) #define LVM_SETTOOLTIPS (LVM_FIRST+74) #define LVM_GETTOOLTIPS (LVM_FIRST+78) +#define LVM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT +#define LVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #endif /* _WIN32_IE >= 0x0400 */ #define LVNI_ALL 0 #define LVNI_FOCUSED 1 @@ -1553,6 +1558,8 @@ extern "C" { #define MCM_GETMONTHDELTA 0x1013 #define MCM_SETMONTHDELTA 0x1014 #define MCM_GETMAXTODAYWIDTH 0x1015 +#define MCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT +#define MCM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define MCN_SELCHANGE ((UINT)-749) #define MCN_GETDAYSTATE ((UINT)-747) #define MCN_SELECT ((UINT)-746) @@ -2850,6 +2857,7 @@ typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_ #define FOURTH_IPADDRESS(a) (a & 0xff) #define Animate_Create(w,i,s,hI) CreateWindow(ANIMATE_CLASS,NULL,s,0,0,0,0,w,(HMENU)(i),hI,NULL) #define Animate_Open(w,f) (BOOL)SNDMSG(w,ACM_OPEN,0,(LPARAM)f) +#define Animate_OpenEx(w,h,s) (BOOL)SNDMSG(w,ACM_OPEN,(WPARAM)h,(LPARAM)(LPTSTR)(s)) #define Animate_Play(w,f,t,r) (BOOL)SNDMSG(w,ACM_PLAY,(r),(LPARAM)MAKELONG(f,t)) #define Animate_Stop(w) (BOOL)SNDMSG(w,ACM_STOP,0,0) #define Animate_Close(w) Animate_Open(w,NULL) @@ -2863,12 +2871,12 @@ HWND WINAPI CreateUpDownControl(DWORD,int,int,int,int,HWND,int,HINSTANCE,HWND,in #define DateTime_GetMonthCalColor(hwnd, icolor) SNDMSG(hwnd, DTM_GETMONTHCAL, (WPARAM)icolor,0) #define DateTime_GetMonthCalFont(hwnd) SNDMSG(hwnd,DTM_GETMCFONT,0,0) #define DateTime_GetRange(hwnd,lpsystimearray) SNDMSG(hwnd,DTM_GETRANGE,0,(LPARAM)lpsystimearray) -#define DateTime_GetSystemTime(hwnd,lpsystime) SNDMSG(hwnd,DTM_GETSYSTEMTIME,0,(LPARAM)lpsystime) +#define DateTime_GetSystemtime(hwnd,lpsystime) SNDMSG(hwnd,DTM_GETSYSTEMTIME,0,(LPARAM)lpsystime) #define DateTime_SetFormat(hwnd,lpszformat) SNDMSG(hwnd,DTM_SETFORMAT,0,(LPARAM)lpszformat) #define DateTime_SetMonthCalColor(hwnd,icolor,clr) SNDMSG(hwnd,DTM_SETMCCOLOR,(WPARAM)icolor,(LPARAM)clr) #define DateTime_SetMonthCalFont(hwnd,hfont,lparam) SNDMSG(hwnd,DTM_SETMCFONT,(WPARAM)hfont,(LPARAM)lparam) #define DateTime_SetRange(hwnd,flags,lpsystimearray) SNDMSG(hwnd,DTM_SETRANGE,(WPARAM)flags,(LPARAM)lpsystimearray) -#define DateTime_SetSystemTime(hwnd,flag,lpsystime) SNDMSG(hwnd,DTM_SETSYSTEMTIME,(WPARAM)flag,(LPARAM)lpsystime) +#define DateTime_SetSystemtime(hwnd,flag,lpsystime) SNDMSG(hwnd,DTM_SETSYSTEMTIME,(WPARAM)flag,(LPARAM)lpsystime) void WINAPI DrawInsert(HWND,HWND,int); void WINAPI DrawStatusTextA(HDC,LPRECT,LPCSTR,UINT); void WINAPI DrawStatusTextW(HDC,LPRECT,LPCWSTR,UINT); @@ -2884,6 +2892,13 @@ void WINAPI GetEffectiveClientRect(HWND,LPRECT,LPINT); #define Header_GetItemRect(w,i,r) (BOOL)SNDMSG((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r)) #define Header_GetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_GETORDERARRAY,(WPARAM)(l),(LPARAM)(a)) #define Header_SetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_SETORDERARRAY,(WPARAM)(l),(LPARAM)(a)) +#define Header_CreateDragImage(w, i) (HIMAGELIST)SNDMSG((w), HDM_CREATEDRAGIMAGE, (WPARAM)i, 0) +#define Header_SetImageList(w,l) (HIMAGELIST)SNDMSG((w), HDM_SETIMAGELIST, 0, (LPARAM)l) +#define Header_GetImageList(w) (HIMAGELIST)SNDMSG((w),HDM_GETIMAGELIST,0,0) +#endif +#if (_WIN32_IE >= 0x0400) +#define Header_GetUnicodeFormat(w) (BOOL)SNDMSG((w),HDM_GETUNICODEFORMAT,0,0) +#define Header_SetUnicodeFormat(w,f) (BOOL)SNDMSG((w),HDM_SETUNICODEFORMAT,(WPARAM)(f),0) #endif HDSA WINAPI DSA_Create(INT,INT); BOOL WINAPI DSA_Destroy(HDSA); @@ -2965,6 +2980,9 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,int,int); HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,LPSTREAM); #endif +#if (_WIN32_IE >= 0x0400) +HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST himl); +#endif void WINAPI InitCommonControls(void); #if (_WIN32_IE >= 0x0300) BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX); @@ -3046,6 +3064,7 @@ int WINAPI LBItemFromPt(HWND,POINT,BOOL); #define ListView_GetSelectedCount(w) (UINT)SNDMSG((w),LVM_GETSELECTEDCOUNT,0,0) #define ListView_GetCheckState(w,i) ((((UINT)(SNDMSG((w),LVM_GETITEMSTATE,(WPARAM)(i),LVIS_STATEIMAGEMASK)))>>12)-1) #define ListView_SetCheckState(w,i,f) ListView_SetItemState(w,i,INDEXTOSTATEIMAGEMASK((f)+1),LVIS_STATEIMAGEMASK) +#define ListView_GetISearchString(w, lpsz) (BOOL)SNDMSG((w), LVM_GETISEARCHSTRING, 0, (LPARAM) (LPTSTR)(lpsz)) BOOL WINAPI MakeDragList(HWND); void WINAPI MenuHelp(UINT,WPARAM,LPARAM,HMENU,HINSTANCE,HWND,PUINT); @@ -3068,10 +3087,10 @@ void WINAPI MenuHelp(UINT,WPARAM,LPARAM,HMENU,HINSTANCE,HWND,PUINT); #define MonthCal_SetFirstDayOfWeek(hwnd,iday) SNDMSG(hwnd,MCM_SETFIRSTDAYOFWEEK,0,(LPARAM)iday) #define MonthCal_SetMaxSelCount(hwnd,imax) SNDMSG(hwnd,MCM_SETMAXSELCOUNT,(WPARAM)imax,0) #define MonthCal_SetMonthDelta(hwnd,idelta) SNDMSG(hwnd,MCM_SETMONTHDELTA,(WPARAM)idelta,0) -#define MonthCal_SetRange(hwnd,whichlimit,systimearray) SNDMSG(hwnd,MCM_SETRANGE,whichlimit,systimearray) #define MonthCal_SetSelRange(hwnd,systimearray) SNDMSG(hwnd,MCM_SETSELRANGE,0,(LPARAM)systimearray) #define MonthCal_SetToday(hwnd,systime) SNDMSG(hwnd,MCM_SETTODAY,0,(LPARAM)systime) #define MonthCal_SetUnicodeFormat(hwnd,unicode) SNDMSG(hwnd,MCM_SETUNICODEFORMAT,(WPARAM)unicode,0) +#define MonthCal_SetRange(w,f,st) (BOOL)SNDMSG((w),MCM_SETRANGE,(WPARAM)(f),(LPARAM)(st)) BOOL WINAPI ShowHideMenuCtl(HWND,UINT,PINT); #define TabCtrl_GetItem(w,i,p) (BOOL)SNDMSG((w),TCM_GETITEM,i,(LPARAM)(TC_ITEM*)(p)) #define TabCtrl_SetItem(w,i,p) (BOOL)SNDMSG((w),TCM_SETITEM,i,(LPARAM)(TC_ITEM*)(p)) @@ -3147,6 +3166,7 @@ BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT); #define ListView_SetHotItem(w,i) (int)SNDMSG((w),LVM_SETHOTITEM,(WPARAM)(i),0) #define ListView_SetIconSpacing(w,x,y) (DWORD)SNDMSG((w),LVM_SETICONSPACING,0,MAKELONG(x,y)) #define ListView_SubItemHitTest(w,p) (int)SNDMSG((w),LVM_SUBITEMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(p)) +#define ListView_SetItemCountEx(w, i, f) SNDMSG((w), LVM_SETITEMCOUNT, (WPARAM)(i), (LPARAM)(f)) WINBOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT); WINBOOL WINAPI ImageList_Copy(HIMAGELIST,int,HIMAGELIST,int,UINT); WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); @@ -3161,13 +3181,15 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); #define ListView_SetExtendedListViewStyleEx(w,m,s) (DWORD)SNDMSG((w),LVM_SETEXTENDEDLISTVIEWSTYLE,(m),(s)) #define ListView_SetWorkAreas(w,n,r) (BOOL)SNDMSG((w),LVM_SETWORKAREAS,(WPARAM)(n),(LPARAM)(RECT *)(r)) #define ListView_GetWorkAreas(w,n,r) (BOOL)SNDMSG((w),LVM_GETWORKAREAS,(WPARAM)(n),(LPARAM)(RECT *)(r)) -#define ListView_GetNumberOfWorkAreas(w,n) (BOOL)SNDMSG((w),LVM_GETNUMBEROFWORKAREAS,0,(LPARAM)(UINT *)(pnWorkAreas)) +#define ListView_GetNumberOfWorkAreas(w,n) (BOOL)SNDMSG((w),LVM_GETNUMBEROFWORKAREAS,0,(LPARAM)(UINT *)(n)) #define ListView_SetHoverTime(w,t) (DWORD)SNDMSG((w),LVM_SETHOVERTIME,0,(LPARAM)(t)) #define ListView_GetHoverTime(w) (DWORD)SNDMSG((w),LVM_GETHOVERTIME,0,0) #define ListView_GetSelectionMark(w) (INT)SNDMSG((w),LVM_GETSELECTIONMARK,0,0) #define ListView_SetSelectionMark(w,i) (INT)SNDMSG((w),LVM_SETSELECTIONMARK,0,(LPARAM)(i)) #define ListView_SetToolTips(w,n) (HWND)SNDMSG((w),LVM_SETTOOLTIPS,(WPARAM)(n),0) #define ListView_GetToolTips(w) (HWND)SNDMSG((w),LVM_GETTOOLTIPS,0,0) +#define ListView_SetUnicodeFormat(w, f) (BOOL)SNDMSG((w), LVM_SETUNICODEFORMAT, (WPARAM)(f), 0) +#define ListView_GetUnicodeFormat(w) (BOOL)SNDMSG((w), LVM_GETUNICODEFORMAT, 0, 0) #define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0)) #define TabCtrl_SetExtendedStyle(hwnd, dw) SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw) #define TabCtrl_GetExtendedStyle(hwnd) SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0) @@ -3186,6 +3208,7 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*); #define TreeView_SetInsertMark(w,i,a) (BOOL)SNDMSG((w),TVM_SETINSERTMARK,(WPARAM)(a),(LPARAM)(i)) #define TreeView_SetUnicodeFormat(w,u) (BOOL)SNDMSG((w),TVM_SETUNICODEFORMAT,(WPARAM)(u),0) #define TreeView_GetUnicodeFormat(w) (BOOL)SNDMSG((w),TVM_GETUNICODEFORMAT,0,0) +#define TreeView_GetLastVisible(w) TreeView_GetNextItem(w,NULL,TVGN_LASTVISIBLE) #endif #if (_WIN32_IE >= 0x0500) #define TreeView_GetItemState(w,i,m) (UINT)SNDMSG((w),TVM_GETITEMSTATE,(WPARAM)(i),(LPARAM)(m))