Re: commctrl.h (+ other headers) patch

----- Original Message -----
From: "Filip Navara"

> I tried compiling comctl32.dll from Wine with w32api and this patch is
the
> result of my work. Hope, it will get the way into w32api 2.4 :)
>
> FiN <xnavara-VIXq6x/[email protected]>
>
> REFERENCES:
> Mostly MSDN and sometimes guessing & testing. If you want URLs for
online
> MSDN I can create and post it, but it would involve lot of work :(
>
> CHANGLOG (Also in attachment):
>
> 2003-08-22  Filip Navara  <xnavara-VIXq6x/[email protected]>
>  * include/commctrl.h (ILCF_MOVE, ILCF_SWAP, ILS_GLOW, ILS_SHADOW,
>  ILS_SATURATE, ILS_ALPHA, ILD_NORMAL, ILD_BLEND, ILD_IMAGE, ILD_ROP,
>     ILD_OVERLAYMASK, ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE,
> HDS_HOTTRACK,
>     HDS_DRAGDROP, HDS_FULLDRAG, HDS_FILTERBAR, SBN_FIRST, SBN_LAST,
>     HDM_SETIMAGELIST, HDM_GETIMAGELIST, HDM_CREATEDRAGIMAGE,
> HDM_SETHOTDIVIDER,
>     HDM_GETUNICODEFORMAT, HDM_SETUNICODEFORMAT, HICF_OTHER,
HICF_MOUSE,
>     HICF_ARROWKEYS, HICF_ACCELERATOR, HICF_DUPACCEL, HICF_ENTERING,
>     HICF_LEAVING, HICF_RESELECT, HICF_LMOUSE, HICF_TOGGLEDROPDOWN,
>     TBSTATE_MARKED, TBSTYLE_EX_MIXEDBUTTONS,
TBSTYLE_EX_HIDECLIPPEDBUTTONS,
>     TBSTYLE_EX_DOUBLEBUFFER, TBCDRF_NOEDGES, TBCDRF_HILITEHOTTRACK,
>     TBCDRF_NOOFFSET, TBCDRF_NOMARK, TBCDRF_NOETCHEDEFFECT,
> IDB_HIST_SMALL_COLOR,
>     IDB_HIST_LARGE_COLOR, TB_ISBUTTONHIGHLIGHTED, TB_REPLACEBITMAP,
>     TB_SETINDENT, TB_SETIMAGELIST, TB_GETIMAGELIST, TB_LOADIMAGES,
> TB_GETRECT,
>     TB_SETHOTIMAGELIST, TB_GETHOTIMAGELIST, TB_SETDISABLEDIMAGELIST,
>     TB_GETDISABLEDIMAGELIST, TB_SETSTYLE, TB_GETSTYLE,
TB_GETBUTTONSIZE,
>     TB_SETBUTTONWIDTH, TB_SETMAXTEXTROWS, TB_GETTEXTROWS,
TB_GETOBJECT,
>     TB_GETBUTTONINFOW, TB_GETBUTTONINFOA, TB_SETBUTTONINFOA,
> TB_INSERTBUTTONW,
>     TB_ADDBUTTONSW, TB_HITTEST, TB_GETHOTITEM, TB_SETHOTITEM,
>     TB_SETANCHORHIGHLIGHT, TB_GETANCHORHIGHLIGHT, TB_MAPACCELERATORA,
>     TB_GETINSERTMARK, TB_SETINSERTMARK, TB_INSERTMARKHITTEST,
TB_MOVEBUTTON,
>     TB_GETMAXSIZE, TB_SETEXTENDEDSTYLE, TB_GETEXTENDEDSTYLE,
TB_GETPADDING,
>     TB_SETPADDING, TB_SETINSERTMARKCOLOR, TB_GETINSERTMARKCOLOR,
>     TB_MAPACCELERATORW, TB_SETCOLORSCHEME, TB_GETCOLORSCHEME,
>     TB_SETUNICODEFORMAT, TB_GETUNICODEFORMAT, TBN_DROPDOWN,
> TBN_HOTITEMCHANGE,
>     TBN_DRAGOUT, TBN_DELETINGBUTTON, TBN_GETDISPINFOA,
TBN_GETDISPINFOW,
>     TBN_GETINFOTIPA, TBN_GETINFOTIPW, TBN_RESTORE, TBN_SAVE,
> TBN_INITCUSTOMIZE,
>     TBNRF_HIDEHELP, TBNRF_ENDCUSTOMIZE, TBNF_IMAGE, TBNF_TEXT,
> TBNF_DI_SETITEM,
>     TTM_TRACKACTIVATE, TTM_TRACKPOSITION, TTM_SETTIPBKCOLOR,
> TTM_GETBUBBLESIZE,
>     TTM_ADJUSTRECT, TTM_SETTITLEA, TTM_SETTITLEW, UDM_SETPOS32,
> UDM_GETPOS32,
>     UDM_SETUNICODEFORMAT, UDM_GETUNICODEFORMAT, SBN_SIMPLEMODECHANGE,
>     TBS_DOWNISLEFT, TBTS_TOP, TBTS_LEFT, TBTS_BOTTOM, TBTS_RIGHT,
TBCD_TICS,
>     TBCD_THUMB, TBCD_CHANNEL, TTF_TRACK, TTF_ABSOLUTE,
TTF_TRANSPARENT,
>     TTF_PARSELINKS, TTF_DI_SETITEM, TBDDRET_DEFAULT,
TBDDRET_NODEFAULT,
>     TBDDRET_TREATPRESSED, TBIMHT_AFTER, TBIMHT_BACKGROUND,
I_INDENTCALLBACK,
>  I_IMAGENONE, CDIS_MARKED, CDIS_INDETERMINATE, CDIS_SHOWKEYBOARDCUES,
>     CDDS_SUBITEM, LVIF_INDENT, LVIF_NORECOMPUTE, LVIF_GROUPID,
LVIF_COLUMNS,
>     LV_MAX_WORKAREAS, LVM_SETWORKAREAS, LVM_GETWORKAREAS,
>     LVM_GETNUMBEROFWORKAREAS, LVM_GETSELECTIONMARK,
LVM_SETSELECTIONMARK,
>     LVM_SETHOVERTIME, LVM_GETHOVERTIME, LVM_SETTOOLTIPS,
LVM_GETTOOLTIPS,
>     LVN_GETINFOTIPA, LVN_GETINFOTIPW, LVGIT_UNFOLDED,
TVM_GETITEMSTATE,
>     TVM_SETLINECOLOR, TVM_GETLINECOLOR, TVM_SETUNICODEFORMAT,
>     TVM_GETUNICODEFORMAT, TVE_EXPANDPARTIAL, TVGN_LASTVISIBLE,
> TVN_GETINFOTIPA,
>     TVN_GETINFOTIPW, TVN_SINGLEEXPAND, TVNRET_DEFAULT, TVNRET_SKIPOLD,
>     TVNRET_SKIPNEW, TCIF_STATE, NM_TOOLTIPSCREATED, CCM_FIRST,
CCM_LAST,
>     CCM_SETVERSION, CCM_GETVERSION, CCM_SETNOTIFYWINDOW,
CCM_SETWINDOWTHEME,
>     CCM_DPISCALE, MCM_GETMAXTODAYWIDTH, MCHT_TITLE, MCHT_CALENDAR,
>     MCHT_TODAYLINK, MCHT_NEXT, MCHT_PREV, MCHT_NOWHERE, MCHT_TITLEBK,
>     MCHT_TITLEMONTH, MCHT_TITLEYEAR, MCHT_TITLEBTNNEXT,
MCHT_TITLEBTNPREV,
>     MCHT_CALENDARBK, MCHT_CALENDARDATE, MCHT_CALENDARDATENEXT,
>     MCHT_CALENDARDATEPREV, MCHT_CALENDARDAY, MCHT_CALENDARWEEKNUM,
PGS_VERT,
>     PGS_HORZ, PGS_AUTOSCROLL, PGS_DRAGNDROP, PGF_INVISIBLE,
PGF_NORMAL,
>     PGF_GRAYED, PGF_DEPRESSED, PGF_HOT, PGB_TOPORLEFT,
PGB_BOTTOMORRIGHT,
>     PGF_SCROLLUP, PGF_SCROLLDOWN, PGF_SCROLLLEFT, PGF_SCROLLRIGHT,
> PGK_SHIFT,
>     PGK_CONTROL, PGK_MENU, PGF_CALCWIDTH, PGF_CALCHEIGHT, PGM_FIRST,
>     PGM_SETCHILD, PGM_RECALCSIZE, PGM_FORWARDMOUSE, PGM_SETBKCOLOR,
>     PGM_GETBKCOLOR, PGM_SETBORDER, PGM_GETBORDER, PGM_SETPOS,
PGM_GETPOS,
>     PGM_SETBUTTONSIZE, PGM_GETBUTTONSIZE, PGM_GETBUTTONSTATE,
> PGM_GETDROPTARGET,
>     PGN_FIRST, PGN_LAST, PGN_SCROLL, PGN_CALCSIZE,
TTTOOLINFOA_V1_SIZE,
>     TTTOOLINFOA_V2_SIZE, TTTOOLINFOA_V3_SIZE, TreeView_GetItemState,
>     ListView_SetWorkAreas, ListView_GetWorkAreas,
> ListView_GetNumberOfWorkAreas,
>     ListView_SetHoverTime, ListView_GetHoverTime,
ListView_GetSelectionMark,
>     ListView_SetSelectionMark, ListView_SetToolTips,
ListView_GetToolTips,
>     TreeView_SetInsertMark, TreeView_SetUnicodeFormat,
>     TreeView_GetUnicodeFormat, TB_GETBUTTONINFO, TB_SETBUTTONINFO,
>     TB_INSERTBUTTON, TB_ADDBUTTONS, TB_MAPACCELERATOR,
TBN_GETDISPINFO,
>     NMTBDISPINFO, LPNMTBDISPINFO, LVN_GETINFOTIP, NMLVGETINFOTIP,
>     LPNMLVGETINFOTIP, TCITEM, LPTCITEM, TB_GETBUTTONINFO,
TB_SETBUTTONINFO,
>     TB_INSERTBUTTON, TB_ADDBUTTONS, TB_MAPACCELERATOR,
TBN_GETDISPINFO,
>     NMTBDISPINFO, LPNMTBDISPINFO, LVN_GETINFOTIP, NMLVGETINFOTIP,
>     LPNMLVGETINFOTIP, TCITEM, LPTCITEM): Defined.
>  * include/commctrl.h (IPN_FIRST, IPN_LAST, TB_ADDBUTTONS,
TB_INSERTBUTTON,
>  TBS_TOOLTIPS, TBS_REVERSED, INFOTIPSIZE, HDF_JUSTIFYMASK,
ODT_LISTVIEW,
>  CCSIZEOF_STRUCT): Fixed definitions.
>  * include/commctrl.h (LVITEMW, _TC_ITEMA, _TC_ITEMW, TCITEM,
>  IMAGELISTDRAWPARAMS): Fixed structures.
>  * include/commctrl.h (HIMAGELIST, HTREEITEM): Converted to pointers.
>  * include/commctrl.h (NMLVKEYDOWN, LPNMLVKEYDOWN, NMPGCALCSIZE,
>  LPNMPGCALCSIZE, NMPGSCROLL, LPNMPGSCROLL, NMSELCHANGE, LPNMSELCHANGE,
>     NMTBHOTITEM, LPNMTBHOTITEM, NMTBDISPINFOA, LPNMTBDISPINFOA,
> NMTBDISPINFOW,
>     LPNMTBDISPINFOW, NMMOUSE, LPNMMOUSE, NMDATETIMECHANGE,
> LPNMDATETIMECHANGE,
>     NMTOOLTIPSCREATED, LPNMTOOLTIPSCREATED, TBINSERTMARK,
LPTBINSERTMARK,
>     LPHDHITTESTINFO, NMLVGETINFOTIPA, LPNMLVGETINFOTIPA,
NMLVGETINFOTIPW,
>     LPNMLVGETINFOTIPW, NMTBCUSTOMDRAW, LPNMTBCUSTOMDRAW, TTTOOLINFOA,
>     LPTTTOOLINFOA, TTTOOLINFOW, LPTTTOOLINFOW, LPTTHITTESTINFOA,
>     LPTTHITTESTINFOW, LPLVFINDINFOA, LPLVFINDINFOW, LPLVHITTESTINFO,
> TCITEMA,
>     LPTCITEMA, TCITEMW, LPTCITEMW, LPTTHITTESTINFO): Declared.
>


The patch against commcrtl.h did not apply cleanly to CVS version (1st
hunk failed).
Can you make patch against CVS, please.

Also, for the nonce, please use numeric constants for the _WIN32_IE
guards.  I'm not sure if your
_WIN32_IE >= _IE5
really means
_WIN32_IE >= 0x0500
or
_WIN32_IE >= 0x0501

Finally, please try to keep patches easier to review (and thus easier to
approve) by _not_ reordering  statements when reordering is not
necessary.  If you think rearrangement is a good idea in its own right,
do that as a separate patch with separate justification.

Thanks

Danny




-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0