Changeset 3181 for trunk/include/win/commctrl.h

Timestamp:

Mar 21, 2000, 6:28:20 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/include/win/commctrl.h (modified) (54 diffs)

trunk/include/win/commctrl.h

@@ -1 @@
-/* $Id: commctrl.h,v 1.24 2000-03-17 17:10:51 cbratschi Exp $ */
+/* $Id: commctrl.h,v 1.25 2000-03-21 17:28:19 cbratschi Exp $ */
 /*
  * Common controls definitions
@@ -112 +112 @@
 #define NM_CHAR                 (NM_FIRST-18)
 #define NM_TOOLTIPSCREATED      (NM_FIRST-19)
+#define NM_LDOWN                (NM_FIRST-20)
+#define NM_RDOWN                (NM_FIRST-21)
 #define NM_UPDOWN                NMUPDOWN
 
@@ -247 +249 @@
 #define SB_ISSIMPLE             (WM_USER+14)
 #define SB_SETICON              (WM_USER+15)
-#define SB_SETTIPTEXTA  (WM_USER+16)
-#define SB_SETTIPTEXTW  (WM_USER+17)
+#define SB_SETTIPTEXTA          (WM_USER+16)
+#define SB_SETTIPTEXTW          (WM_USER+17)
 #define SB_SETTIPTEXT           WINELIB_NAME_AW(SB_SETTIPTEXT)
-#define SB_GETTIPTEXTA  (WM_USER+18)
-#define SB_GETTIPTEXTW  (WM_USER+19)
+#define SB_GETTIPTEXTA          (WM_USER+18)
+#define SB_GETTIPTEXTW          (WM_USER+19)
 #define SB_GETTIPTEXT           WINELIB_NAME_AW(SB_GETTIPTEXT)
 #define SB_GETICON              (WM_USER+20)
@@ -301 +303 @@
 /* UpDown */
 
-#define UPDOWN_CLASS16          "msctls_updown"
+#define UPDOWN_CLASS16        "msctls_updown"
 #define UPDOWN_CLASSA         "msctls_updown32"
 #define UPDOWN_CLASSW         L"msctls_updown32"
-#define UPDOWN_CLASS            WINELIB_NAME_AW(UPDOWN_CLASS)
+#define UPDOWN_CLASS          WINELIB_NAME_AW(UPDOWN_CLASS)
 
 typedef struct tagUDACCEL
@@ -349 +351 @@
 /* Progress Bar */
 
-#define PROGRESS_CLASSA   "msctls_progress32"
+#define PROGRESS_CLASSA  "msctls_progress32"
 #define PROGRESS_CLASSW  L"msctls_progress32"
-#define PROGRESS_CLASS16    "msctls_progress"
-#define PROGRESS_CLASS      WINELIB_NAME_AW(PROGRESS_CLASS)
+#define PROGRESS_CLASS16 "msctls_progress"
+#define PROGRESS_CLASS   WINELIB_NAME_AW(PROGRESS_CLASS)
 
 #define PBM_SETRANGE        (WM_USER+1)
@@ -529 +531 @@
 /* Flat Scrollbar control */
 
-#define FLATSB_CLASS16        "flatsb_class"
+#define FLATSB_CLASS16      "flatsb_class"
 #define FLATSB_CLASSA       "flatsb_class32"
 #define FLATSB_CLASSW       L"flatsb_class32"
-#define FLATSB_CLASS          WINELIB_NAME_AW(FLATSB_CLASS)
+#define FLATSB_CLASS        WINELIB_NAME_AW(FLATSB_CLASS)
 
 #define WSB_PROP_CYVSCROLL     0x00000001L
@@ -656 +658 @@
 #define HDN_ITEMCHANGINGA     (HDN_FIRST-0)
 #define HDN_ITEMCHANGINGW     (HDN_FIRST-20)
-#define HDN_ITEMCHANGING WINELIB_NAME_AW(HDN_ITEMCHANGING)
+#define HDN_ITEMCHANGING      WINELIB_NAME_AW(HDN_ITEMCHANGING)
 #define HDN_ITEMCHANGEDA      (HDN_FIRST-1)
 #define HDN_ITEMCHANGEDW      (HDN_FIRST-21)
-#define HDN_ITEMCHANGED WINELIB_NAME_AW(HDN_ITEMCHANGED)
+#define HDN_ITEMCHANGED       WINELIB_NAME_AW(HDN_ITEMCHANGED)
 #define HDN_ITEMCLICKA        (HDN_FIRST-2)
 #define HDN_ITEMCLICKW        (HDN_FIRST-22)
-#define HDN_ITEMCLICK WINELIB_NAME_AW(HDN_ITEMCLICK)
+#define HDN_ITEMCLICK         WINELIB_NAME_AW(HDN_ITEMCLICK)
 #define HDN_ITEMDBLCLICKA     (HDN_FIRST-3)
 #define HDN_ITEMDBLCLICKW     (HDN_FIRST-23)
-#define HDN_ITEMDBLCLICK WINELIB_NAME_AW(HDN_ITEMDBLCLICK)
+#define HDN_ITEMDBLCLICK       WINELIB_NAME_AW(HDN_ITEMDBLCLICK)
 #define HDN_DIVIDERDBLCLICKA  (HDN_FIRST-5)
 #define HDN_DIVIDERDBLCLICKW  (HDN_FIRST-25)
-#define HDN_DIVIDERDBLCLICK WINELIB_NAME_AW(HDN_DIVIDERDBLCLICK)
+#define HDN_DIVIDERDBLCLICK    WINELIB_NAME_AW(HDN_DIVIDERDBLCLICK)
 #define HDN_BEGINTRACKA       (HDN_FIRST-6)
 #define HDN_BEGINTRACKW       (HDN_FIRST-26)
-#define HDN_BEGINTRACK WINELIB_NAME_AW(HDN_BEGINTRACK)
+#define HDN_BEGINTRACK        WINELIB_NAME_AW(HDN_BEGINTRACK)
 #define HDN_ENDTRACKA         (HDN_FIRST-7)
 #define HDN_ENDTRACKW         (HDN_FIRST-27)
-#define HDN_ENDTRACK WINELIB_NAME_AW(HDN_ENDTRACK)
+#define HDN_ENDTRACK          WINELIB_NAME_AW(HDN_ENDTRACK)
 #define HDN_TRACKA            (HDN_FIRST-8)
 #define HDN_TRACKW            (HDN_FIRST-28)
-#define HDN_TRACK WINELIB_NAME_AW(HDN_TRACK)
+#define HDN_TRACK             WINELIB_NAME_AW(HDN_TRACK)
 #define HDN_GETDISPINFOA      (HDN_FIRST-9)
 #define HDN_GETDISPINFOW      (HDN_FIRST-29)
-#define HDN_GETDISPINFO WINELIB_NAME_AW(HDN_GETDISPINFO)
-#define HDN_BEGINDRAG          (HDN_FIRST-10)
-#define HDN_ENDDRAG            (HDN_FIRST-11)
-#define HDN_FILTERCHANGE        (HDN_FIRST-12)
-#define HDN_FILTERBTNCLICK      (HDN_FIRST-13)
+#define HDN_GETDISPINFO       WINELIB_NAME_AW(HDN_GETDISPINFO)
+#define HDN_BEGINDRAG         (HDN_FIRST-10)
+#define HDN_ENDDRAG           (HDN_FIRST-11)
+#define HDN_FILTERCHANGE      (HDN_FIRST-12)
+#define HDN_FILTERBTNCLICK    (HDN_FIRST-13)
 
 typedef struct _HD_TEXTFILTERA
@@ -867 +869 @@
 /* Toolbar */
 
-#define TOOLBARCLASSNAME16      "ToolbarWindow"
-#define TOOLBARCLASSNAMEW     "ToolbarWindow32"
+#define TOOLBARCLASSNAME16    "ToolbarWindow"
+#define TOOLBARCLASSNAMEW     L"ToolbarWindow32"
 #define TOOLBARCLASSNAMEA     "ToolbarWindow32"
-#define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME)
+#define TOOLBARCLASSNAME      WINELIB_NAME_AW(TOOLBARCLASSNAME)
 
 #define CMB_MASKED              0x02
@@ -938 +940 @@
 #define TB_GETSTATE              (WM_USER+18)
 #define TB_ADDBITMAP             (WM_USER+19)
-#define TB_ADDBUTTONSA         (WM_USER+20)
-#define TB_ADDBUTTONSW         (WM_USER+68)
-#define TB_ADDBUTTONS WINELIB_NAME_AW(TB_ADDBUTTONS)
+#define TB_ADDBUTTONSA           (WM_USER+20)
+#define TB_ADDBUTTONSW           (WM_USER+68)
+#define TB_ADDBUTTONS            WINELIB_NAME_AW(TB_ADDBUTTONS)
 #define TB_HITTEST               (WM_USER+69)
-#define TB_INSERTBUTTONA       (WM_USER+21)
-#define TB_INSERTBUTTONW       (WM_USER+67)
-#define TB_INSERTBUTTON WINELIB_NAME_AW(TB_INSERTBUTTON)
+#define TB_INSERTBUTTONA         (WM_USER+21)
+#define TB_INSERTBUTTONW         (WM_USER+67)
+#define TB_INSERTBUTTON          WINELIB_NAME_AW(TB_INSERTBUTTON)
 #define TB_DELETEBUTTON          (WM_USER+22)
 #define TB_GETBUTTON             (WM_USER+23)
 #define TB_BUTTONCOUNT           (WM_USER+24)
 #define TB_COMMANDTOINDEX        (WM_USER+25)
-#define TB_SAVERESTOREA        (WM_USER+26)
-#define TB_SAVERESTOREW        (WM_USER+76)
-#define TB_SAVERESTORE WINELIB_NAME_AW(TB_SAVERESTORE)
+#define TB_SAVERESTOREA          (WM_USER+26)
+#define TB_SAVERESTOREW          (WM_USER+76)
+#define TB_SAVERESTORE           WINELIB_NAME_AW(TB_SAVERESTORE)
 #define TB_CUSTOMIZE             (WM_USER+27)
-#define TB_ADDSTRINGA          (WM_USER+28)
-#define TB_ADDSTRINGW          (WM_USER+77)
-#define TB_ADDSTRING WINELIB_NAME_AW(TB_ADDSTRING)
+#define TB_ADDSTRINGA            (WM_USER+28)
+#define TB_ADDSTRINGW            (WM_USER+77)
+#define TB_ADDSTRING             WINELIB_NAME_AW(TB_ADDSTRING)
 #define TB_GETITEMRECT           (WM_USER+29)
 #define TB_BUTTONSTRUCTSIZE      (WM_USER+30)
@@ -970 +972 @@
 #define TB_CHANGEBITMAP          (WM_USER+43)
 #define TB_GETBITMAP             (WM_USER+44)
-#define TB_GETBUTTONTEXTA      (WM_USER+45)
-#define TB_GETBUTTONTEXTW      (WM_USER+75)
-#define TB_GETBUTTONTEXT WINELIB_NAME_AW(TB_GETBUTTONTEXT)
+#define TB_GETBUTTONTEXTA        (WM_USER+45)
+#define TB_GETBUTTONTEXTW        (WM_USER+75)
+#define TB_GETBUTTONTEXT         WINELIB_NAME_AW(TB_GETBUTTONTEXT)
 #define TB_REPLACEBITMAP         (WM_USER+46)
 #define TB_SETINDENT             (WM_USER+47)
@@ -990 +992 @@
 #define TB_GETTEXTROWS           (WM_USER+61)
 #define TB_GETOBJECT             (WM_USER+62)
-#define TB_GETBUTTONINFOW      (WM_USER+63)
-#define TB_GETBUTTONINFOA      (WM_USER+65)
-#define TB_GETBUTTONINFO WINELIB_NAME_AW(TB_GETBUTTONINFO)
-#define TB_SETBUTTONINFOW      (WM_USER+64)
-#define TB_SETBUTTONINFOA      (WM_USER+66)
-#define TB_SETBUTTONINFO WINELIB_NAME_AW(TB_SETBUTTONINFO)
+#define TB_GETBUTTONINFOW        (WM_USER+63)
+#define TB_GETBUTTONINFOA        (WM_USER+65)
+#define TB_GETBUTTONINFO         WINELIB_NAME_AW(TB_GETBUTTONINFO)
+#define TB_SETBUTTONINFOW        (WM_USER+64)
+#define TB_SETBUTTONINFOA        (WM_USER+66)
+#define TB_SETBUTTONINFO         WINELIB_NAME_AW(TB_SETBUTTONINFO)
 #define TB_SETDRAWTEXTFLAGS      (WM_USER+70)
 #define TB_GETHOTITEM            (WM_USER+71)
@@ -1001 +1003 @@
 #define TB_SETANCHORHIGHLIGHT    (WM_USER+73)
 #define TB_GETANCHORHIGHLIGHT    (WM_USER+74)
-#define TB_MAPACCELERATORA     (WM_USER+78)
-#define TB_MAPACCELERATORW     (WM_USER+90)
-#define TB_MAPACCELERATOR WINELIB_NAME_AW(TB_MAPACCELERATOR)
+#define TB_MAPACCELERATORA       (WM_USER+78)
+#define TB_MAPACCELERATORW       (WM_USER+90)
+#define TB_MAPACCELERATOR        WINELIB_NAME_AW(TB_MAPACCELERATOR)
 #define TB_GETINSERTMARK         (WM_USER+79)
 #define TB_SETINSERTMARK         (WM_USER+80)
@@ -1015 +1017 @@
 #define TB_SETINSERTMARKCOLOR    (WM_USER+88)
 #define TB_GETINSERTMARKCOLOR    (WM_USER+89)
+#define TB_GETSTRINGW            (WM_USER+91)
+#define TB_GETSTRINGA            (WM_USER+92)
+#define TB_GETSTRING             WINELIB_NAME_AW(TB_GETSTRING)
 #define TB_SETCOLORSCHEME        CCM_SETCOLORSCHEME
 #define TB_GETCOLORSCHEME        CCM_GETCOLORSCHEME
@@ -1022 +1027 @@
 #define TBN_FIRST               (0U-700U)
 #define TBN_LAST                (0U-720U)
-#define TBN_GETBUTTONINFOA    (TBN_FIRST-0)
-#define TBN_GETBUTTONINFOW    (TBN_FIRST-20)
-#define TBN_GETBUTTONINFO WINELIB_NAME_AW(TBN_GETBUTTONINFO)
+#define TBN_GETBUTTONINFOA      (TBN_FIRST-0)
+#define TBN_GETBUTTONINFOW      (TBN_FIRST-20)
+#define TBN_GETBUTTONINFO       WINELIB_NAME_AW(TBN_GETBUTTONINFO)
 #define TBN_BEGINDRAG           (TBN_FIRST-1)
 #define TBN_ENDDRAG             (TBN_FIRST-2)
@@ -1042 +1047 @@
 #define TBN_GETDISPINFOW        (TBN_FIRST-17)
 #define TBN_GETDISPINFO         WINELIB_NAME_AW(TBN_GETDISPINFO)
-#define TBN_GETINFOTIPA       (TBN_FIRST-18)
-#define TBN_GETINFOTIPW       (TBN_FIRST-19)
-#define TBN_GETINFOTIP WINELIB_NAME_AW(TBN_GETINFOTIP)
-
+#define TBN_GETINFOTIPA         (TBN_FIRST-18)
+#define TBN_GETINFOTIPW         (TBN_FIRST-19)
+#define TBN_GETINFOTIP          WINELIB_NAME_AW(TBN_GETINFOTIP)
+#define TBN_RESTORE             (TBN_FIRST-21)
+#define TBN_SAVE                (TBN_FIRST-22)
+#define TBN_INITCUSTOMIZE       (TBN_FIRST-23)
+
+#define    TBNRF_HIDEHELP       0x00000001
+#define    TBNRF_ENDCUSTOMIZE   0x00000002
 
 /* This is just for old CreateToolbar. */
@@ -1119 +1129 @@
 #define VIEW_NEWFOLDER          11
 
-//CB: notify structures weren't defined
-
-typedef struct tagTBNOTIFYA {
-    NMHDR hdr;
-    int iItem;
-    TBBUTTON* tbButton; //CB: reference says pointer?!? Ok, we use one
-    int cchText;
-    LPSTR pszText;
-} TBNOTIFYA, *LBTBNOTIFYA;
-
-typedef struct tagTBNOTIFYW {
-    NMHDR hdr;
-    int iItem;
-    TBBUTTON* tbButton; //CB: dito
-    int cchText;
-    LPWSTR pszText;
-} TBNOTIFYW, *LBTBNOTIFYW;
-
 typedef struct tagTBSAVEPARAMSA {
     HKEY   hkr;
@@ -1226 +1218 @@
 #define NMTOOLBAR   WINELIB_NAME_AW(NMTOOLBAR)
 #define LPNMTOOLBAR WINELIB_NAME_AW(LPNMTOOLBAR)
+#define TBNOTIFYA NMTOOLBARA
+#define TBNOTIFYW NMTOOLBARW
+#define LPTBNOTIFYA LPNMTOOLBARA
+#define LPTBNOTIFYW LPNMTOOLBARW
+#define TBNOTIFY    NMTOOLBAR
+#define LPTBNOTIFY  LPNMTOOLBAR
 
 typedef struct
@@ -1289 +1287 @@
 #define TTM_ACTIVATE            (WM_USER+1)
 #define TTM_SETDELAYTIME        (WM_USER+3)
-#define TTM_ADDTOOLA          (WM_USER+4)
-#define TTM_ADDTOOLW          (WM_USER+50)
-#define TTM_ADDTOOL WINELIB_NAME_AW(TTM_ADDTOOL)
-#define TTM_DELTOOLA          (WM_USER+5)
-#define TTM_DELTOOLW          (WM_USER+51)
-#define TTM_DELTOOL WINELIB_NAME_AW(TTM_DELTOOL)
-#define TTM_NEWTOOLRECTA      (WM_USER+6)
-#define TTM_NEWTOOLRECTW      (WM_USER+52)
-#define TTM_NEWTOOLRECT WINELIB_NAME_AW(TTM_NEWTOOLRECT)
+#define TTM_ADDTOOLA            (WM_USER+4)
+#define TTM_ADDTOOLW            (WM_USER+50)
+#define TTM_ADDTOOL             WINELIB_NAME_AW(TTM_ADDTOOL)
+#define TTM_DELTOOLA            (WM_USER+5)
+#define TTM_DELTOOLW            (WM_USER+51)
+#define TTM_DELTOOL             WINELIB_NAME_AW(TTM_DELTOOL)
+#define TTM_NEWTOOLRECTA        (WM_USER+6)
+#define TTM_NEWTOOLRECTW        (WM_USER+52)
+#define TTM_NEWTOOLRECT         WINELIB_NAME_AW(TTM_NEWTOOLRECT)
 #define TTM_RELAYEVENT          (WM_USER+7)
-#define TTM_GETTOOLINFOA      (WM_USER+8)
-#define TTM_GETTOOLINFOW      (WM_USER+53)
-#define TTM_GETTOOLINFO WINELIB_NAME_AW(TTM_GETTOOLINFO)
-#define TTM_SETTOOLINFOA      (WM_USER+9)
-#define TTM_SETTOOLINFOW      (WM_USER+54)
-#define TTM_SETTOOLINFO WINELIB_NAME_AW(TTM_SETTOOLINFO)
-#define TTM_HITTESTA          (WM_USER+10)
-#define TTM_HITTESTW          (WM_USER+55)
-#define TTM_HITTEST WINELIB_NAME_AW(TTM_HITTEST)
-#define TTM_GETTEXTA          (WM_USER+11)
-#define TTM_GETTEXTW          (WM_USER+56)
-#define TTM_GETTEXT WINELIB_NAME_AW(TTM_GETTEXT)
-#define TTM_UPDATETIPTEXTA    (WM_USER+12)
-#define TTM_UPDATETIPTEXTW    (WM_USER+57)
-#define TTM_UPDATETIPTEXT WINELIB_NAME_AW(TTM_UPDATETIPTEXT)
+#define TTM_GETTOOLINFOA        (WM_USER+8)
+#define TTM_GETTOOLINFOW        (WM_USER+53)
+#define TTM_GETTOOLINFO         WINELIB_NAME_AW(TTM_GETTOOLINFO)
+#define TTM_SETTOOLINFOA        (WM_USER+9)
+#define TTM_SETTOOLINFOW        (WM_USER+54)
+#define TTM_SETTOOLINFO         WINELIB_NAME_AW(TTM_SETTOOLINFO)
+#define TTM_HITTESTA            (WM_USER+10)
+#define TTM_HITTESTW            (WM_USER+55)
+#define TTM_HITTEST             WINELIB_NAME_AW(TTM_HITTEST)
+#define TTM_GETTEXTA            (WM_USER+11)
+#define TTM_GETTEXTW            (WM_USER+56)
+#define TTM_GETTEXT             WINELIB_NAME_AW(TTM_GETTEXT)
+#define TTM_UPDATETIPTEXTA      (WM_USER+12)
+#define TTM_UPDATETIPTEXTW      (WM_USER+57)
+#define TTM_UPDATETIPTEXT       WINELIB_NAME_AW(TTM_UPDATETIPTEXT)
 #define TTM_GETTOOLCOUNT        (WM_USER+13)
-#define TTM_ENUMTOOLSA        (WM_USER+14)
-#define TTM_ENUMTOOLSW        (WM_USER+58)
-#define TTM_ENUMTOOLS WINELIB_NAME_AW(TTM_ENUMTOOLS)
-#define TTM_GETCURRENTTOOLA   (WM_USER+15)
-#define TTM_GETCURRENTTOOLW   (WM_USER+59)
-#define TTM_GETCURRENTTOOL WINELIB_NAME_AW(TTM_GETCURRENTTOOL)
+#define TTM_ENUMTOOLSA          (WM_USER+14)
+#define TTM_ENUMTOOLSW          (WM_USER+58)
+#define TTM_ENUMTOOLS           WINELIB_NAME_AW(TTM_ENUMTOOLS)
+#define TTM_GETCURRENTTOOLA     (WM_USER+15)
+#define TTM_GETCURRENTTOOLW     (WM_USER+59)
+#define TTM_GETCURRENTTOOL      WINELIB_NAME_AW(TTM_GETCURRENTTOOL)
 #define TTM_WINDOWFROMPOINT     (WM_USER+16)
 #define TTM_TRACKACTIVATE       (WM_USER+17)
@@ -1335 +1333 @@
 #define TTM_POP                 (WM_USER+28)
 #define TTM_UPDATE              (WM_USER+29)
-
+#define TTM_GETBUBBLESIZE       (WM_USER+30)
+#define TTM_ADJUSTRECT          (WM_USER+31)
+#define TTM_SETTITLEA           (WM_USER+32)  // wParam = TTI_*, lParam = char* szTitle
+#define TTM_SETTITLEW           (WM_USER+33)  // wParam = TTI_*, lParam = wchar* szTitle
+#define TTM_SETTITLE            WINELIB_NAME_AW(TTM_SETTITLE)
 
 #define TTN_FIRST               (0U-520U)
 #define TTN_LAST                (0U-549U)
-#define TTN_GETDISPINFOA      (TTN_FIRST-0)
-#define TTN_GETDISPINFOW      (TTN_FIRST-10)
-#define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO)
+#define TTN_GETDISPINFOA        (TTN_FIRST-0)
+#define TTN_GETDISPINFOW        (TTN_FIRST-10)
+#define TTN_GETDISPINFO         WINELIB_NAME_AW(TTN_GETDISPINFO)
 #define TTN_SHOW                (TTN_FIRST-1)
 #define TTN_POP                 (TTN_FIRST-2)
 
-#define TTN_NEEDTEXT TTN_GETDISPINFO
+#define TTN_NEEDTEXT  TTN_GETDISPINFO
 #define TTN_NEEDTEXTA TTN_GETDISPINFOA
 #define TTN_NEEDTEXTW TTN_GETDISPINFOW
@@ -1371 +1373 @@
 } TTTOOLINFOW, *LPTOOLINFOW, *PTOOLINFOW, *LPTTTOOLINFOW;
 
-#define TTTOOLINFO WINELIB_NAME_AW(TTTOOLINFO)
-#define TOOLINFO WINELIB_NAME_AW(TTTOOLINFO)
-#define PTOOLINFO WINELIB_NAME_AW(PTOOLINFO)
+#define TTTOOLINFO   WINELIB_NAME_AW(TTTOOLINFO)
+#define TOOLINFO     WINELIB_NAME_AW(TTTOOLINFO)
+#define PTOOLINFO    WINELIB_NAME_AW(PTOOLINFO)
 #define LPTTTOOLINFO WINELIB_NAME_AW(LPTTTOOLINFO)
-#define LPTOOLINFO WINELIB_NAME_AW(LPTOOLINFO)
+#define LPTOOLINFO   WINELIB_NAME_AW(LPTOOLINFO)
 
 #define TTTOOLINFO_V1_SIZEA CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
 #define TTTOOLINFO_V1_SIZEW CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
-#define TTTOOLINFO_V1_SIZE WINELIB_NAME_AW(TTTOOLINFO_V1_SIZE)
+#define TTTOOLINFO_V1_SIZE  WINELIB_NAME_AW(TTTOOLINFO_V1_SIZE)
 
 typedef struct _TT_HITTESTINFOA
@@ -1395 +1397 @@
 } TTHITTESTINFOW, *LPTTHITTESTINFOW;
 
-#define TTHITTESTINFO WINELIB_NAME_AW(TTHITTESTINFO)
+#define TTHITTESTINFO   WINELIB_NAME_AW(TTHITTESTINFO)
 #define LPTTHITTESTINFO WINELIB_NAME_AW(LPTTHITTESTINFO)
 
@@ -1418 +1420 @@
 } NMTTDISPINFOW, *LPNMTTDISPINFOW;
 
-#define NMTTDISPINFO WINELIB_NAME_AW(NMTTDISPINFO)
+#define NMTTDISPINFO   WINELIB_NAME_AW(NMTTDISPINFO)
 #define LPNMTTDISPINFO WINELIB_NAME_AW(LPNMTTDISPINFO)
 
@@ -1435 +1437 @@
 /* Rebar control */
 
-#define REBARCLASSNAME16        "ReBarWindow"
+#define REBARCLASSNAME16      "ReBarWindow"
 #define REBARCLASSNAMEA       "ReBarWindow32"
 #define REBARCLASSNAMEW       L"ReBarWindow32"
-#define REBARCLASSNAME          WINELIB_NAME_AW(REBARCLASSNAME)
+#define REBARCLASSNAME        WINELIB_NAME_AW(REBARCLASSNAME)
 
 #define RBS_TOOLTIPS            0x0100
@@ -1485 +1487 @@
 #define RBHT_GRABBER            0x0004
 
-#define RB_INSERTBANDA        (WM_USER+1)
-#define RB_INSERTBANDW        (WM_USER+10)
+#define RB_INSERTBANDA          (WM_USER+1)
+#define RB_INSERTBANDW          (WM_USER+10)
 #define RB_INSERTBAND           WINELIB_NAME_AW(RB_INSERTBAND)
 #define RB_DELETEBAND           (WM_USER+2)
 #define RB_GETBARINFO           (WM_USER+3)
 #define RB_SETBARINFO           (WM_USER+4)
-#define RB_GETBANDINFO        (WM_USER+5)   /* just for compatibility */
-#define RB_SETBANDINFOA       (WM_USER+6)
-#define RB_SETBANDINFOW       (WM_USER+11)
+//#define RB_GETBANDINFO          (WM_USER+5)   //deprecated (Win3.1)
+#define RB_SETBANDINFOA         (WM_USER+6)
+#define RB_SETBANDINFOW         (WM_USER+11)
 #define RB_SETBANDINFO          WINELIB_NAME_AW(RB_SETBANDINFO)
 #define RB_SETPARENT            (WM_USER+7)
@@ -1513 +1515 @@
 #define RB_DRAGMOVE             (WM_USER+26)
 #define RB_GETBARHEIGHT         (WM_USER+27)
-#define RB_GETBANDINFOW       (WM_USER+28)
-#define RB_GETBANDINFOA       (WM_USER+29)
-#define RB_GETBANDINFO16          WINELIB_NAME_AW(RB_GETBANDINFO16)
+#define RB_GETBANDINFOW         (WM_USER+28)
+#define RB_GETBANDINFOA         (WM_USER+29)
+#define RB_GETBANDINFO          WINELIB_NAME_AW(RB_GETBANDINFO)
 #define RB_MINIMIZEBAND         (WM_USER+30)
 #define RB_MAXIMIZEBAND         (WM_USER+31)
@@ -1523 +1525 @@
 #define RB_GETPALETTE           (WM_USER+38)
 #define RB_MOVEBAND             (WM_USER+39)
-#define RB_PUSHCHEVRON          (WM_USER + 43)
+#define RB_PUSHCHEVRON          (WM_USER+43)
 #define RB_GETDROPTARGET        CCM_GETDROPTARGET
 #define RB_SETCOLORSCHEME       CCM_SETCOLORSCHEME
@@ -1541 +1543 @@
 #define RBN_DELETEDBAND         (RBN_FIRST-7)
 #define RBN_CHILDSIZE           (RBN_FIRST-8)
+#define RBN_CHEVRONPUSHED       (RBN_FIRST-10)
+#define RBN_MINMAX              (RBN_FIRST-21)
 
 typedef struct tagREBARINFO
@@ -1646 +1650 @@
 /* Trackbar control */
 
-#define TRACKBAR_CLASS16        "msctls_trackbar"
+#define TRACKBAR_CLASS16      "msctls_trackbar"
 #define TRACKBAR_CLASSA       "msctls_trackbar32"
 #define TRACKBAR_CLASSW       L"msctls_trackbar32"
-#define TRACKBAR_CLASS  WINELIB_NAME_AW(TRACKBAR_CLASS)
+#define TRACKBAR_CLASS        WINELIB_NAME_AW(TRACKBAR_CLASS)
 
 #define TBS_AUTOTICKS           0x0001
@@ -1726 +1730 @@
 #define WC_PAGESCROLLERA      "SysPager"
 #define WC_PAGESCROLLERW      L"SysPager"
-#define WC_PAGESCROLLER  WINELIB_NAME_AW(WC_PAGESCROLLER)
+#define WC_PAGESCROLLER       WINELIB_NAME_AW(WC_PAGESCROLLER)
 
 #define PGS_VERT                0x00000000
@@ -1800 +1804 @@
 #define WC_TREEVIEWA          "SysTreeView32"
 #define WC_TREEVIEWW          L"SysTreeView32"
-#define WC_TREEVIEW             WINELIB_NAME_AW(WC_TREEVIEW)
+#define WC_TREEVIEW           WINELIB_NAME_AW(WC_TREEVIEW)
 
 #define TVSIL_NORMAL            0
@@ -1806 +1810 @@
 
 #define TV_FIRST                0x1100
-#define TVM_INSERTITEMA       (TV_FIRST+0)
-#define TVM_INSERTITEMW       (TV_FIRST+50)
+#define TVM_INSERTITEMA         (TV_FIRST+0)
+#define TVM_INSERTITEMW         (TV_FIRST+50)
 #define TVM_INSERTITEM          WINELIB_NAME_AW(TVM_INSERTITEM)
 #define TVM_DELETEITEM          (TV_FIRST+1)
@@ -1819 +1823 @@
 #define TVM_GETNEXTITEM         (TV_FIRST+10)
 #define TVM_SELECTITEM          (TV_FIRST+11)
-#define TVM_GETITEMA          (TV_FIRST+12)
-#define TVM_GETITEMW          (TV_FIRST+62)
+#define TVM_GETITEMA            (TV_FIRST+12)
+#define TVM_GETITEMW            (TV_FIRST+62)
 #define TVM_GETITEM             WINELIB_NAME_AW(TVM_GETITEM)
-#define TVM_SETITEMA          (TV_FIRST+13)
-#define TVM_SETITEMW          (TV_FIRST+63)
+#define TVM_SETITEMA            (TV_FIRST+13)
+#define TVM_SETITEMW            (TV_FIRST+63)
 #define TVM_SETITEM             WINELIB_NAME_AW(TVM_SETITEM)
-#define TVM_EDITLABELA        (TV_FIRST+14)
-#define TVM_EDITLABELW        (TV_FIRST+65)
+#define TVM_EDITLABELA          (TV_FIRST+14)
+#define TVM_EDITLABELW          (TV_FIRST+65)
 #define TVM_EDITLABEL           WINELIB_NAME_AW(TVM_EDITLABEL)
 #define TVM_GETEDITCONTROL      (TV_FIRST+15)
@@ -1836 +1840 @@
 #define TVM_SORTCHILDRENCB      (TV_FIRST+21)
 #define TVM_ENDEDITLABELNOW     (TV_FIRST+22)
-#define TVM_GETISEARCHSTRINGA (TV_FIRST+23)
-#define TVM_GETISEARCHSTRINGW (TV_FIRST+64)
+#define TVM_GETISEARCHSTRINGA   (TV_FIRST+23)
+#define TVM_GETISEARCHSTRINGW   (TV_FIRST+64)
 #define TVM_GETISEARCHSTRING    WINELIB_NAME_AW(TVM_GETISEARCHSTRING)
 #define TVM_SETTOOLTIPS         (TV_FIRST+24)
@@ -1863 +1867 @@
 #define TVN_LAST                (0U-499U)
 
-#define TVN_SELCHANGING         (TVN_FIRST-1)
-#define TVN_SELCHANGED          (TVN_FIRST-2)
-#define TVN_GETDISPINFO         (TVN_FIRST-3)
-#define TVN_SETDISPINFO         (TVN_FIRST-4)
-#define TVN_ITEMEXPANDING       (TVN_FIRST-5)
-#define TVN_ITEMEXPANDED        (TVN_FIRST-6)
-#define TVN_BEGINDRAG           (TVN_FIRST-7)
-#define TVN_BEGINRDRAG          (TVN_FIRST-8)
-#define TVN_DELETEITEM          (TVN_FIRST-9)
-#define TVN_BEGINLABELEDIT      (TVN_FIRST-10)
-#define TVN_ENDLABELEDIT        (TVN_FIRST-11)
+#define TVN_SELCHANGINGA        (TVN_FIRST-1)
+#define TVN_SELCHANGINGW        (TVN_FIRST-50)
+#define TVN_SELCHANGING         WINELIB_NAME_AW(TVN_SELCHANGING)
+#define TVN_SELCHANGEDA         (TVN_FIRST-2)
+#define TVN_SELCHANGEDW         (TVN_FIRST-51)
+#define TVN_SELCHANGED          WINELIB_NAME_AW(TVN_SELCHANGED)
+#define TVN_GETDISPINFOA        (TVN_FIRST-3)
+#define TVN_GETDISPINFOW        (TVN_FIRST-52)
+#define TVN_GETDISPINFO         WINELIB_NAME_AW(TVN_GETDISPINFO)
+#define TVN_SETDISPINFOA        (TVN_FIRST-4)
+#define TVN_SETDISPINFOW        (TVN_FIRST-53)
+#define TVN_SETDISPINFO         WINELIB_NAME_AW(TVN_SETDISPINFO)
+#define TVN_ITEMEXPANDINGA      (TVN_FIRST-5)
+#define TVN_ITEMEXPANDINGW      (TVN_FIRST-54)
+#define TVN_ITEMEXPANDING       WINELIB_NAME_AW(TVN_ITEMEXPANDING)
+#define TVN_ITEMEXPANDEDA       (TVN_FIRST-6)
+#define TVN_ITEMEXPANDEDW       (TVN_FIRST-55)
+#define TVN_ITEMEXPANDED        WINELIB_NAME_AW(TVN_ITEMEXPANDED)
+#define TVN_BEGINDRAGA          (TVN_FIRST-7)
+#define TVN_BEGINDRAGW          (TVN_FIRST-56)
+#define TVN_BEGINDRAG           WINELIB_NAME_AW(TVN_BEGINDRAG)
+#define TVN_BEGINRDRAGA         (TVN_FIRST-8)
+#define TVN_BEGINRDRAGW         (TVN_FIRST-57)
+#define TVN_BEGINRDRAG          WINELIB_NAME_AW(TVN_BEGINRDRAG)
+#define TVN_DELETEITEMA         (TVN_FIRST-9)
+#define TVN_DELETEITEMW         (TVN_FIRST-58)
+#define TVN_DELETEITEM          WINELIB_NAME_AW(TVN_DELETEITEM)
+#define TVN_BEGINLABELEDITA     (TVN_FIRST-10)
+#define TVN_BEGINLABELEDITW     (TVN_FIRST-59)
+#define TVN_BEGINLABELEDIT      WINELIB_NAME_AW(TVN_BEGINLABELEDIT)
+#define TVN_ENDLABELEDITA       (TVN_FIRST-11)
+#define TVN_ENDLABELEDITW       (TVN_FIRST-60)
+#define TVN_ENDLABELEDIT        WINELIB_NAME_AW(TVN_ENDLABELEDIT)
 #define TVN_KEYDOWN             (TVN_FIRST-12)
 #define TVN_GETINFOTIPA         (TVN_FIRST-13)
 #define TVN_GETINFOTIPW         (TVN_FIRST-14)
+#define TVN_GETINFOTIP          WINELIB_NAME_AW(TVN_GETINFOTIP)
 #define TVN_SINGLEEXPAND        (TVN_FIRST-15)
-
-
-#define TVN_SELCHANGINGW        (TVN_FIRST-50)
-#define TVN_SELCHANGEDW         (TVN_FIRST-51)
-#define TVN_GETDISPINFOW        (TVN_FIRST-52)
-#define TVN_SETDISPINFOW        (TVN_FIRST-53)
-#define TVN_ITEMEXPANDINGW      (TVN_FIRST-54)
-#define TVN_ITEMEXPANDEDW       (TVN_FIRST-55)
-#define TVN_BEGINDRAGW          (TVN_FIRST-56)
-#define TVN_BEGINRDRAGW         (TVN_FIRST-57)
-#define TVN_DELETEITEMW         (TVN_FIRST-58)
-#define TVN_BEGINLABELEDITW     (TVN_FIRST-59)
-#define TVN_ENDLABELEDITW       (TVN_FIRST-60)
-
-
 
 #define TVIF_TEXT             0x0001
@@ -2360 +2372 @@
 #define WC_LISTVIEWA          "SysListView32"
 #define WC_LISTVIEWW          L"SysListView32"
-#define WC_LISTVIEW  WINELIB_NAME_AW(WC_LISTVIEW)
+#define WC_LISTVIEW           WINELIB_NAME_AW(WC_LISTVIEW)
 
 #define LVS_ICON                0x0000
@@ -2460 +2472 @@
 #define LVM_SETIMAGELIST        (LVM_FIRST+3)
 #define LVM_GETITEMCOUNT        (LVM_FIRST+4)
-#define LVM_GETITEMA          (LVM_FIRST+5)
-#define LVM_GETITEMW          (LVM_FIRST+75)
+#define LVM_GETITEMA            (LVM_FIRST+5)
+#define LVM_GETITEMW            (LVM_FIRST+75)
 #define LVM_GETITEM             WINELIB_NAME_AW(LVM_GETITEM)
-#define LVM_SETITEMA          (LVM_FIRST+6)
-#define LVM_SETITEMW          (LVM_FIRST+76)
+#define LVM_SETITEMA            (LVM_FIRST+6)
+#define LVM_SETITEMW            (LVM_FIRST+76)
 #define LVM_SETITEM             WINELIB_NAME_AW(LVM_SETITEM)
-#define LVM_INSERTITEMA       (LVM_FIRST+7)
-#define LVM_INSERTITEMW       (LVM_FIRST+77)
+#define LVM_INSERTITEMA         (LVM_FIRST+7)
+#define LVM_INSERTITEMW         (LVM_FIRST+77)
 #define LVM_INSERTITEM          WINELIB_NAME_AW(LVM_INSERTITEM)
 #define LVM_DELETEITEM          (LVM_FIRST+8)
@@ -2474 +2486 @@
 #define LVM_SETCALLBACKMASK     (LVM_FIRST+11)
 #define LVM_GETNEXTITEM         (LVM_FIRST+12)
-#define LVM_FINDITEMA         (LVM_FIRST+13)
-#define LVM_FINDITEMW         (LVM_FIRST+83)
+#define LVM_FINDITEMA           (LVM_FIRST+13)
+#define LVM_FINDITEMW           (LVM_FIRST+83)
 #define LVM_FINDITEM            WINELIB_NAME_AW(LVM_FINDITEM)
 #define LVM_GETITEMRECT         (LVM_FIRST+14)
 #define LVM_SETITEMPOSITION     (LVM_FIRST+15)
 #define LVM_GETITEMPOSITION     (LVM_FIRST+16)
-#define LVM_GETSTRINGWIDTHA   (LVM_FIRST+17)
-#define LVM_GETSTRINGWIDTHW   (LVM_FIRST+87)
+#define LVM_GETSTRINGWIDTHA     (LVM_FIRST+17)
+#define LVM_GETSTRINGWIDTHW     (LVM_FIRST+87)
 #define LVM_GETSTRINGWIDTH      WINELIB_NAME_AW(LVM_GETSTRINGWIDTH)
 #define LVM_HITTEST             (LVM_FIRST+18)
@@ -2488 +2500 @@
 #define LVM_REDRAWITEMS         (LVM_FIRST+21)
 #define LVM_ARRANGE             (LVM_FIRST+22)
-#define LVM_EDITLABELA        (LVM_FIRST+23)
-#define LVM_EDITLABELW        (LVM_FIRST+118)
+#define LVM_EDITLABELA          (LVM_FIRST+23)
+#define LVM_EDITLABELW          (LVM_FIRST+118)
 #define LVM_EDITLABEL           WINELIB_NAME_AW(LVM_EDITLABEL)
 #define LVM_GETEDITCONTROL      (LVM_FIRST+24)
-#define LVM_GETCOLUMNA        (LVM_FIRST+25)
-#define LVM_GETCOLUMNW        (LVM_FIRST+95)
+#define LVM_GETCOLUMNA          (LVM_FIRST+25)
+#define LVM_GETCOLUMNW          (LVM_FIRST+95)
 #define LVM_GETCOLUMN           WINELIB_NAME_AW(LVM_GETCOLUMN)
-#define LVM_SETCOLUMNA        (LVM_FIRST+26)
-#define LVM_SETCOLUMNW        (LVM_FIRST+96)
+#define LVM_SETCOLUMNA          (LVM_FIRST+26)
+#define LVM_SETCOLUMNW          (LVM_FIRST+96)
 #define LVM_SETCOLUMN           WINELIB_NAME_AW(LVM_SETCOLUMN)
-#define LVM_INSERTCOLUMNA     (LVM_FIRST+27)
-#define LVM_INSERTCOLUMNW     (LVM_FIRST+97)
+#define LVM_INSERTCOLUMNA       (LVM_FIRST+27)
+#define LVM_INSERTCOLUMNW       (LVM_FIRST+97)
 #define LVM_INSERTCOLUMN        WINELIB_NAME_AW(LVM_INSERTCOLUMN)
 #define LVM_DELETECOLUMN        (LVM_FIRST+28)
@@ -2518 +2530 @@
 #define LVM_SETITEMSTATE        (LVM_FIRST+43)
 #define LVM_GETITEMSTATE        (LVM_FIRST+44)
-#define LVM_GETITEMTEXTA      (LVM_FIRST+45)
-#define LVM_GETITEMTEXTW      (LVM_FIRST+115)
+#define LVM_GETITEMTEXTA        (LVM_FIRST+45)
+#define LVM_GETITEMTEXTW        (LVM_FIRST+115)
 #define LVM_GETITEMTEXT         WINELIB_NAME_AW(LVM_GETITEMTEXT)
-#define LVM_SETITEMTEXTA      (LVM_FIRST+46)
-#define LVM_SETITEMTEXTW      (LVM_FIRST+116)
+#define LVM_SETITEMTEXTA        (LVM_FIRST+46)
+#define LVM_SETITEMTEXTW        (LVM_FIRST+116)
 #define LVM_SETITEMTEXT         WINELIB_NAME_AW(LVM_SETITEMTEXT)
 #define LVM_SETITEMCOUNT        (LVM_FIRST+47)
@@ -2529 +2541 @@
 #define LVM_GETSELECTEDCOUNT    (LVM_FIRST+50)
 #define LVM_GETITEMSPACING      (LVM_FIRST+51)
-#define LVM_GETISEARCHSTRINGA (LVM_FIRST+52)
-#define LVM_GETISEARCHSTRINGW (LVM_FIRST+117)
+#define LVM_GETISEARCHSTRINGA   (LVM_FIRST+52)
+#define LVM_GETISEARCHSTRINGW   (LVM_FIRST+117)
 #define LVM_GETISEARCHSTRING    WINELIB_NAME_AW(LVM_GETISEARCHSTRING)
 #define LVM_SETICONSPACING      (LVM_FIRST+53)
@@ -2547 +2559 @@
 #define LVM_GETSELECTIONMARK    (LVM_FIRST+66)
 #define LVM_SETSELECTIONMARK    (LVM_FIRST+67)
-#define LVM_SETBKIMAGEA       (LVM_FIRST+68)
-#define LVM_SETBKIMAGEW       (LVM_FIRST+138)
+#define LVM_SETBKIMAGEA         (LVM_FIRST+68)
+#define LVM_SETBKIMAGEW         (LVM_FIRST+138)
 #define LVM_SETBKIMAGE          WINELIB_NAME_AW(LVM_SETBKIMAGE)
-#define LVM_GETBKIMAGEA       (LVM_FIRST+69)
-#define LVM_GETBKIMAGEW       (LVM_FIRST+139)
+#define LVM_GETBKIMAGEA         (LVM_FIRST+69)
+#define LVM_GETBKIMAGEW         (LVM_FIRST+139)
 #define LVM_GETBKIMAGE          WINELIB_NAME_AW(LVM_GETBKIMAGE)
 #define LVM_GETWORKAREAS        (LVM_FIRST+70)
@@ -2560 +2572 @@
 
 #define LVM_GETTOOLTIPS         (LVM_FIRST+78)
+#define LVM_SORTITEMSEX         (LVM_FIRST+81)
 
 #define LVN_FIRST               (0U-100U)
@@ -2571 +2584 @@
 #define LVN_DELETEITEM          (LVN_FIRST-3)
 #define LVN_DELETEALLITEMS      (LVN_FIRST-4)
-#define LVN_BEGINLABELEDITA   (LVN_FIRST-5)
-#define LVN_BEGINLABELEDITW   (LVN_FIRST-75)
-#define LVN_BEGINLABELEDIT WINELIB_NAME_AW(LVN_BEGINLABELEDIT)
-#define LVN_ENDLABELEDITA     (LVN_FIRST-6)
-#define LVN_ENDLABELEDITW     (LVN_FIRST-76)
-#define LVN_ENDLABELEDIT WINELIB_NAME_AW(LVN_ENDLABELEDIT)
+#define LVN_BEGINLABELEDITA     (LVN_FIRST-5)
+#define LVN_BEGINLABELEDITW     (LVN_FIRST-75)
+#define LVN_BEGINLABELEDIT      WINELIB_NAME_AW(LVN_BEGINLABELEDIT)
+#define LVN_ENDLABELEDITA       (LVN_FIRST-6)
+#define LVN_ENDLABELEDITW       (LVN_FIRST-76)
+#define LVN_ENDLABELEDIT        WINELIB_NAME_AW(LVN_ENDLABELEDIT)
 #define LVN_COLUMNCLICK         (LVN_FIRST-8)
 #define LVN_BEGINDRAG           (LVN_FIRST-9)
@@ -2586 +2599 @@
 #define LVN_ODFINDITEMA         (LVN_FIRST-52)
 #define LVN_ODFINDITEMW         (LVN_FIRST-79)
-#define LVN_ODFINDITEM WINELIB_NAME_AW(LVN_ODFINDITEM)
-#define LVN_GETDISPINFOA      (LVN_FIRST-50)
-#define LVN_GETDISPINFOW      (LVN_FIRST-77)
-#define LVN_GETDISPINFO WINELIB_NAME_AW(LVN_GETDISPINFO)
-#define LVN_SETDISPINFOA      (LVN_FIRST-51)
-#define LVN_SETDISPINFOW      (LVN_FIRST-78)
-#define LVN_SETDISPINFO WINELIB_NAME_AW(LVN_SETDISPINFO)
+#define LVN_ODFINDITEM          WINELIB_NAME_AW(LVN_ODFINDITEM)
+#define LVN_GETDISPINFOA        (LVN_FIRST-50)
+#define LVN_GETDISPINFOW        (LVN_FIRST-77)
+#define LVN_GETDISPINFO         WINELIB_NAME_AW(LVN_GETDISPINFO)
+#define LVN_SETDISPINFOA        (LVN_FIRST-51)
+#define LVN_SETDISPINFOW        (LVN_FIRST-78)
+#define LVN_SETDISPINFO         WINELIB_NAME_AW(LVN_SETDISPINFO)
 #define LVN_KEYDOWN             (LVN_FIRST-55)
+#define LVN_MARQUEEBEGIN        (LVN_FIRST-56)
+#define LVN_GETINFOTIPA         (LVN_FIRST-57)
+#define LVN_GETINFOTIPW         (LVN_FIRST-58)
+#define LVN_GETINFOTIP          WINELIB_NAME_AW(LVN_GETINFOTIP)
 
 #define LVA_ALIGNLEFT           0x0000
@@ -2633 +2650 @@
 #define LVITEM_V1_SIZEA CCSIZEOF_STRUCT(LVITEMA, lParam)
 #define LVITEM_V1_SIZEW CCSIZEOF_STRUCT(LVITEMW, lParam)
-#define LVITEM_V1_SIZE WINELIB_NAME_AW(LVITEM_V1_SIZE)
+#define LVITEM_V1_SIZE  WINELIB_NAME_AW(LVITEM_V1_SIZE)
 
 #define LV_ITEM LVITEM
@@ -3080 +3097 @@
 /* Tab Control */
 
-#define WC_TABCONTROL16          "SysTabControl"
-#define WC_TABCONTROLA   "SysTabControl32"
+#define WC_TABCONTROL16 "SysTabControl"
+#define WC_TABCONTROLA  "SysTabControl32"
 #define WC_TABCONTROLW  L"SysTabControl32"
-
-#define WC_TABCONTROL           WINELIB_NAME_AW(WC_TABCONTROL)
+#define WC_TABCONTROL   WINELIB_NAME_AW(WC_TABCONTROL)
 
 /* tab control styles */
@@ -3116 +3132 @@
 #define TCM_SETIMAGELIST        (TCM_FIRST + 3)
 #define TCM_GETITEMCOUNT        (TCM_FIRST + 4)
-#define TCM_GETITEM                             WINELIB_NAME_AW(TCM_GETITEM)
-#define TCM_GETITEMA                    (TCM_FIRST + 5)
-#define TCM_GETITEMW                    (TCM_FIRST + 60)
-#define TCM_SETITEMA                    (TCM_FIRST + 6)
-#define TCM_SETITEMW                    (TCM_FIRST + 61)
-#define TCM_SETITEM                             WINELIB_NAME_AW(TCM_SETITEM)
+#define TCM_GETITEMA            (TCM_FIRST + 5)
+#define TCM_GETITEMW            (TCM_FIRST + 60)
+#define TCM_GETITEM             WINELIB_NAME_AW(TCM_GETITEM)
+#define TCM_SETITEMA            (TCM_FIRST + 6)
+#define TCM_SETITEMW            (TCM_FIRST + 61)
+#define TCM_SETITEM             WINELIB_NAME_AW(TCM_SETITEM)
 #define TCM_INSERTITEMA         (TCM_FIRST + 7)
 #define TCM_INSERTITEMW         (TCM_FIRST + 62)
-#define TCM_INSERTITEM                  WINELIB_NAME_AW(TCM_INSERTITEM)
+#define TCM_INSERTITEM          WINELIB_NAME_AW(TCM_INSERTITEM)
 #define TCM_DELETEITEM          (TCM_FIRST + 8)
 #define TCM_DELETEALLITEMS      (TCM_FIRST + 9)
@@ -3143 +3159 @@
 #define TCM_SETMINTTABWIDTH     (TCM_FIRST + 49)
 #define TCM_DESELECTALL         (TCM_FIRST + 50)
-#define TCM_HIGHLIGHTITEM               (TCM_FIRST + 51)
+#define TCM_HIGHLIGHTITEM       (TCM_FIRST + 51)
 #define TCM_SETEXTENDEDSTYLE    (TCM_FIRST + 52)
 #define TCM_GETEXTENDEDSTYLE    (TCM_FIRST + 53)
@@ -3256 +3272 @@
 #define TCN_SELCHANGE           (TCN_FIRST - 1)
 #define TCN_SELCHANGING         (TCN_FIRST - 2)
-#define TCN_GETOBJECT      (TCN_FIRST - 3)
-
+#define TCN_GETOBJECT           (TCN_FIRST - 3)
+#define TCN_FOCUSCHANGE         (TCN_FIRST - 4)
 
 /* ComboBoxEx control */
@@ -3263 +3279 @@
 #define WC_COMBOBOXEXA        "ComboBoxEx32"
 #define WC_COMBOBOXEXW        L"ComboBoxEx32"
-#define WC_COMBOBOXEX           WINELIB_NAME_AW(WC_COMBOBOXEX)
+#define WC_COMBOBOXEX         WINELIB_NAME_AW(WC_COMBOBOXEX)
 
 #define CBEM_INSERTITEMA      (WM_USER+1)
 #define CBEM_INSERTITEMW      (WM_USER+11)
-#define CBEM_INSERTITEM         WINELIB_NAME_AW(CBEM_INSERTITEM)
-#define CBEM_SETIMAGELIST       (WM_USER+2)
-#define CBEM_GETIMAGELIST       (WM_USER+3)
+#define CBEM_INSERTITEM       WINELIB_NAME_AW(CBEM_INSERTITEM)
+#define CBEM_SETIMAGELIST     (WM_USER+2)
+#define CBEM_GETIMAGELIST     (WM_USER+3)
 #define CBEM_GETITEMA         (WM_USER+4)
 #define CBEM_GETITEMW         (WM_USER+13)
-#define CBEM_GETITEM            WINELIB_NAME_AW(CBEM_GETITEM)
+#define CBEM_GETITEM          WINELIB_NAME_AW(CBEM_GETITEM)
 #define CBEM_SETITEMA         (WM_USER+5)
 #define CBEM_SETITEMW         (WM_USER+12)
-#define CBEM_SETITEM            WINELIB_NAME_AW(CBEM_SETITEM)
-#define CBEM_GETCOMBOCONTROL    (WM_USER+6)
-#define CBEM_GETEDITCONTROL     (WM_USER+7)
-#define CBEM_SETEXSTYLE         (WM_USER+8)
-#define CBEM_GETEXSTYLE         (WM_USER+9)
-#define CBEM_GETEXTENDEDSTYLE   (WM_USER+9)
-#define CBEM_SETEXTENDEDSTYLE   (WM_USER+14)
-#define CBEM_HASEDITCHANGED     (WM_USER+10)
-#define CBEM_SETUNICODEFORMAT   CCM_SETUNICODEFORMAT
-#define CBEM_GETUNICODEFORMAT   CCM_GETUNICODEFORMAT
+#define CBEM_SETITEM          WINELIB_NAME_AW(CBEM_SETITEM)
+#define CBEM_GETCOMBOCONTROL  (WM_USER+6)
+#define CBEM_GETEDITCONTROL   (WM_USER+7)
+#define CBEM_SETEXSTYLE       (WM_USER+8)
+#define CBEM_GETEXSTYLE       (WM_USER+9)
+#define CBEM_GETEXTENDEDSTYLE (WM_USER+9)
+#define CBEM_SETEXTENDEDSTYLE (WM_USER+14)
+#define CBEM_HASEDITCHANGED   (WM_USER+10)
+#define CBEM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT
+#define CBEM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT
 
 #define CBEN_FIRST              (0U-800U)
 #define CBEN_LAST               (0U-830U)
 
+#define CBEN_GETDISPINFOA        (CBEN_FIRST - 0)
+#define CBEN_GETDISPINFOW        (CBEN_FIRST - 7)
+#define CBEN_GETDISPINFO         WINELIB_NAME_AW(CBEN_GETDISPINFO)
+#define CBEN_INSERTITEM          (CBEN_FIRST - 1)
+#define CBEN_DELETEITEM          (CBEN_FIRST - 2)
+#define CBEN_BEGINEDIT           (CBEN_FIRST - 4)
+#define CBEN_ENDEDITA            (CBEN_FIRST - 5)
+#define CBEN_ENDEDITW            (CBEN_FIRST - 6)
+#define CBEN_ENDEDIT             WINELIB_NAME_AW(CBEN_ENDEDIT)
+#define CBEN_DRAGBEGINA          (CBEN_FIRST - 8)
+#define CBEN_DRAGBEGINW          (CBEN_FIRST - 9)
+#define CBEN_DRAGBEGIN           WINELIB_NAME_AW(CBEN_DRAGBEGIN)
+
+#define CBENF_KILLFOCUS         1
+#define CBENF_RETURN            2
+#define CBENF_ESCAPE            3
+#define CBENF_DROPDOWN          4
+
+#define CBEMAXSTRLEN 260
+
+typedef struct {
+    NMHDR hdr;
+    int   iItemid;
+    WCHAR szText[CBEMAXSTRLEN];
+}NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
+
+
+typedef struct {
+    NMHDR hdr;
+    int   iItemid;
+    char szText[CBEMAXSTRLEN];
+}NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+
+#define  NMCBEDRAGBEGIN   WINELIB_NAME_AW(NMCBEDRAGBEGIN)
+#define  LPNMCBEDRAGBEGIN WINELIB_NAME_AW(LPNMCBEDRAGBEGIN)
+#define  PNMCBEDRAGBEGIN  WINELIB_NAME_AW(PNMCBEDRAGBEGIN)
+
+typedef struct {
+        NMHDR hdr;
+        BOOL fChanged;
+        int iNewSelection;
+        WCHAR szText[CBEMAXSTRLEN];
+        int iWhy;
+} NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
+
+typedef struct {
+        NMHDR hdr;
+        BOOL fChanged;
+        int iNewSelection;
+        char szText[CBEMAXSTRLEN];
+        int iWhy;
+} NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
+
+#define  NMCBEENDEDIT   WINELIB_NAME_AW(NMCBEENDEDIT)
+#define  LPNMCBEENDEDIT WINELIB_NAME_AW(LPNMCBEENDEDIT)
+#define  PNMCBEENDEDIT  WINELIB_NAME_AW(PNMCBEENDEDIT)
+
 
 /* Hotkey control */
 
-#define HOTKEY_CLASS16          "msctls_hotkey"
+#define HOTKEY_CLASS16        "msctls_hotkey"
 #define HOTKEY_CLASSA         "msctls_hotkey32"
 #define HOTKEY_CLASSW         L"msctls_hotkey32"
-#define HOTKEY_CLASS            WINELIB_NAME_AW(HOTKEY_CLASS)
+#define HOTKEY_CLASS          WINELIB_NAME_AW(HOTKEY_CLASS)
 
 #define HOTKEYF_SHIFT           0x01
@@ -3320 +3393 @@
 #define ANIMATE_CLASSA        "SysAnimate32"
 #define ANIMATE_CLASSW        L"SysAnimate32"
-#define ANIMATE_CLASS           WINELIB_NAME_AW(ANIMATE_CLASS)
+#define ANIMATE_CLASS         WINELIB_NAME_AW(ANIMATE_CLASS)
 
 #define ACS_CENTER              0x0001
@@ -3329 +3402 @@
 #define ACM_OPENA             (WM_USER+100)
 #define ACM_OPENW             (WM_USER+103)
-#define ACM_OPEN                WINELIB_NAME_AW(ACM_OPEN)
-#define ACM_PLAY                (WM_USER+101)
-#define ACM_STOP                (WM_USER+102)
+#define ACM_OPEN              WINELIB_NAME_AW(ACM_OPEN)
+#define ACM_PLAY              (WM_USER+101)
+#define ACM_STOP              (WM_USER+102)
 
 #define ACN_START               1
@@ -3411 +3484 @@
 #define NFS_BUTTON              0x0008
 #define NFS_ALL                 0x0010
+#define NFS_USEFONTASSOC        0x0020
 
 
@@ -3420 +3494 @@
 #define MONTHCAL_CLASSA "SysMonthCal32"
 #define MONTHCAL_CLASSW L"SysMonthCal32"
-#define MONTHCAL_CLASS          WINELIB_NAME_AW(MONTHCAL_CLASS)
+#define MONTHCAL_CLASS  WINELIB_NAME_AW(MONTHCAL_CLASS)
 #define MCM_FIRST             0x1000
 #define MCN_FIRST             (0U-750U)