Changeset 310

Timestamp:

10/17/08 21:40:08 (3 years ago)

Author:

smjg

Message:

commctrl.d updated to 3.12

Files:

• trunk/win32/commctrl.d (modified) (19 diffs)
• trunk/win32/directx/d3d10.d (modified) (3 diffs)
• trunk/win32/w32api.d (modified) (3 diffs)

trunk/win32/commctrl.d

@@ -20 +20 @@
-const COMCTL32_VERSION = 6;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-enum {
@@ -875 +877 @@
-}
-
-* IE4.0 ??? */
+/ IE4.0 ???
-    enum {
-        TTM_UPDATE = WM_USER + 29,
@@ -1130 +1132 @@
-    LVS_EDITLABELS      = 512,
-    LVS_NOSCROLL        = 0x2000,
-fc
+FC
-    LVS_ALIGNTOP        = 0,
-    LVS_ALIGNLEFT       = 0x800,
-c
+C
-    LVS_OWNERDRAWFIXED  = 0x400,
-    LVS_NOCOLUMNHEADER  = 0x4000,
@@ -1252 +1254 @@
-
-enum {
-
+            
-    LVM_SETBKCOLOR,
-    LVM_GETIMAGELIST,
-    LVM_SETIMAGELIST,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1501 +1541 @@
-static if (_WIN32_IE >= 0x400) {
-    enum {
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-}
@@ -1538 +1579 @@
-}
-
-
+ 
-    enum {
-        TVS_NOHSCROLL = 0x8000
@@ -2121 +2162 @@
-        RBBS_USECHEVRON = 0x0200
-    }
-
-
-       enum
-       RBBS_HIDETITLE = 0x0400,
-   RBBS_TOPALIGN  = 0x0800
-}
+
+
+static if (_WIN32_IE >= 0x501)
+enum {
+RBBS_HIDETITLE = 0x0400,
+RBBS_TOPALIGN  = 0x0800
-    }
-}
@@ -2182 +2223 @@
-static if (_WIN32_IE >= 0x400) {
-    enum {
-
+         
-        SB_SETTIPTEXTA,
-        SB_SETTIPTEXTW,
-        SB_GETTIPTEXTA,
-        SB_GETTIPTEXTW,
-
+     
-        SB_SETUNICODEFORMAT = 0x2005,
-        SB_GETUNICODEFORMAT = 0x2006
@@ -2390 +2431 @@
-    }
-}
+
+static if (_WIN32_WINNT >= 0x0501) {
+    enum {
+        LIF_ITEMINDEX = 1,
+        LIF_STATE     = 2,
+        LIF_ITEMID    = 4,
+        LIF_URL       = 8
+    }
+
+    enum {
+        LIS_FOCUSED = 1,
+        LIS_ENABLED = 2,
+        LIS_VISITED = 4
+    }
+
+    enum {
+        LM_HITTEST        = WM_USER + 768,
+        LM_GETIDEALHEIGHT,
+        LM_SETITEM,
+        LM_GETITEM     // = WM_USER + 771
+    }
+
+    const size_t MAX_LINKID_TEXT  =   48;
+    const size_t L_MAX_URL_LENGTH = 2084;
+}
+
-
-struct COMBOBOXEXITEMA {
@@ -3380 +3447 @@
-alias LVCOLUMNW LV_COLUMNW;
-
+static if (_WIN32_WINNT >= 0x501) {
+    /*  SG: The definitions in this static if block are from the MSDN docs.
+     *  They are not in MinGW, but nonetheless required for macros that are.
+     */
+    struct LVGROUP {
+        UINT    cbSize = LVGROUP.sizeof;
+        UINT    mask;
+        LPWSTR  pszHeader;
+        int     cchHeader;
+        LPWSTR  pszFooter;
+        int     cchFooter;
+        int     iGroupId;
+        UINT    stateMask;
+        UINT    state;
+        UINT    uAlign;
+        static if (_WIN32_WINNT >= 0x600) {
+            LPWSTR  pszSubtitle;
+            UINT    cchSubtitle;
+            LPWSTR  pszTask;
+            UINT    cchTask;
+            LPWSTR  pszDescriptionTop;
+            UINT    cchDescriptionTop;
+            LPWSTR  pszDescriptionBottom;
+            UINT    cchDescriptionBottom;
+            int     iTitleImage;
+            int     iExtendedImage;
+            int     iFirstItem;         // Read only
+            UINT    cItems;             // Read only
+            LPWSTR  pszSubsetTitle;     // NULL if group is not subset
+            UINT    cchSubsetTitle;
+        }
+    }
+    alias LVGROUP* PLVGROUP;
+
+    struct LVGROUPMETRICS {
+        UINT     cbSize = LVGROUPMETRICS.sizeof;
+        UINT     mask;
+        UINT     Left;
+        UINT     Top;
+        UINT     Right;
+        UINT     Bottom;
+        COLORREF crLeft;
+        COLORREF crTop;
+        COLORREF crRight;
+        COLORREF crBottom;
+        COLORREF crHeader;
+        COLORREF crFooter;
+    }
+    alias LVGROUPMETRICS* PLVGROUPMETRICS;
+
+    struct LVINSERTMARK {
+        UINT  cbSize = LVINSERTMARK.sizeof;
+        DWORD dwFlags;
+        int   iItem;
+        DWORD dwReserved;
+    }
+    alias LVINSERTMARK* PLVINSERTMARK;
+
+    struct LVTILEINFO {
+        UINT     cbSize = LVTILEINFO.sizeof;
+        int      iItem;
+        UINT     cColumns;
+        PUINT    puColumns;
+        static if (_WIN32_WINNT >= 0x600) {
+            int* piColFmt;
+        }
+    }
+    alias LVTILEINFO* PLVTILEINFO;
+
+    struct LVTILEVIEWINFO {
+        UINT  cbSize = LVTILEVIEWINFO.sizeof;
+        DWORD dwMask;
+        DWORD dwFlags;
+        SIZE  sizeTile;
+        int   cLines;
+        RECT  rcLabelMargin;
+    }
+    alias LVTILEVIEWINFO* PLVTILEVIEWINFO;
+
+    struct LVINSERTGROUPSORTED {
+        PFNLVGROUPCOMPARE pfnGroupCompare;
+        LPVOID* pvData;
+        LVGROUP lvGroup;
+    }
+    alias LVINSERTGROUPSORTED* PLVINSERTGROUPSORTED;
+
+    alias int function(INT, INT, VOID*) PFNLVGROUPCOMPARE;
+
+    struct LVSETINFOTIP {
+        UINT    cbSize = LVSETINFOTIP.sizeof;
+        DWORD   dwFlags;
+        LPWSTR  pszText;
+        int     iItem;
+        int     iSubItem;
+        HBITMAP hbmp;
+    }
+    alias LVSETINFOTIP* PLVSETINFOTIP;
+}
+
-alias int function(LPARAM, LPARAM, LPARAM) PFNLVCOMPARE;
+
-struct NMLISTVIEW {
-    NMHDR  hdr;
@@ -3423 +3590 @@
-    int   iTo;
-}
-PNMLV
+LPNMLVCACHEHINT, PNM_CACHEHINT, LPNM_
-alias NMLVCACHEHINT NM_CACHEHINT;
-
@@ -3820 +3987 @@
-
-static if (_WIN32_IE >= 0x300) {
+    struct NMLVODSTATECHANGE {
+        NMHDR hdr;
+        int iFrom;
+        int iTo;
+        UINT uNewState;
+        UINT uOldState;
+    }
+    alias NMLVODSTATECHANGE* LPNMLVODSTATECHANGE;
+
-    static if (_WIN32_WINNT >= 0x501) {
-        struct IMAGELISTDRAWPARAMS {
@@ -3993 +4169 @@
-    static if (_WIN32_IE >= 0x400) {
-        alias TBN_GETBUTTONINFOW TBN_GETBUTTONINFO;  // fixme
-    }
-
-    static if (_WIN32_IE >= 0x400) {
-        alias TB_GETBUTTONINFOW TB_GETBUTTONINFO;
-        alias TB_SETBUTTONINFOW TB_SETBUTTONINFO;
@@ -4341 +4514 @@
-    alias LRESULT function(HWND, UINT, WPARAM, LPARAM, UINT_PTR, DWORD_PTR)
-      SUBCLASSPROC;
+
+    struct LITEM {
+        UINT mask;
+        int  iLink;
+        UINT state;
+        UINT stateMask;
+        WCHAR[MAX_LINKID_TEXT]  szID;
+        WCHAR[L_MAX_URL_LENGTH] szUrl;
+    }
+    alias LITEM* PLITEM;
+
+    struct LHITTESTINFO {
+        POINT pt;
+        LITEM item;
+    }
+    alias LHITTESTINFO* PLHITTESTINFO;
+
+    struct NMLINK {
+        NMHDR hdr;
+        LITEM item;
+    }
+    alias NMLINK* PNMLINK;
-}
-
@@ -4703 +4898 @@
-}
-
-BOOL
-BOOL
+UINT
+UINT
-}
-
@@ -4748 +4943 @@
-}
-
-x, int dy
-x, dy
+, int d
+, d
-}
-
@@ -4829 +5024 @@
-}
-
-int
+WPARAM
-    return cast(BOOL) SendMessage(w, LVM_UPDATE, i, 0);
-}
@@ -4890 +5085 @@
-    return cast(BOOL) SendMessage(w, LVM_GETISEARCHSTRING, 0,
-      cast(LPARAM) lpsz);
+}
+
+void ListView_CancelEditLabel(HWND w) {
+    SendMessage(w, LVM_CANCELEDITLABEL, 0, 0);
+}
+
+int ListView_EnableGroupView(HWND w, BOOL i) {
+    return cast(int) SendMessage(w, LVM_ENABLEGROUPVIEW, i, 0);
+}
+
+static if (_WIN32_WINDOWS >= 0x410 && (_WIN32_WINNT >= 0x500 || _WIN32_IE >= 0x500)) {
+    BOOL ListView_SortItemsEx(HWND w, PFNLVCOMPARE c, LPARAM p) {
+        return SendMessage(w, LVM_SORTITEMSEX, cast(WPARAM) p, c);
+    }
+}
+
+static if (_WIN32_WINNT >= 0x501) {
+    int ListView_GetGroupInfo(HWND w, int i, PLVGROUP p) {
+        return SendMessage(w, LVM_GETGROUPINFO, i, cast(LPARAM) p);
+    }
+
+    void ListView_GetGroupMetrics(HWND w, PLVGROUPMETRICS p) {
+        SendMessage(w, LVM_GETGROUPMETRICS, 0, cast(LPARAM) p);
+    }
+
+    BOOL ListView_GetInsertMark(HWND w, PLVINSERTMARK p) {
+        return SendMessage(w, LVM_GETINSERTMARK, 0, cast(LPARAM) p);
+    }
+
+    COLORREF ListView_GetInsertMarkColor(HWND w) {
+        return SendMessage(w, LVM_GETINSERTMARKCOLOR, 0, 0);
+    }
+
+    int ListView_GetInsertMarkRect(HWND w, LPRECT p) {
+        return SendMessage(w, LVM_GETINSERTMARKRECT, 0, cast(LPARAM) p);
+    }
+
+    COLORREF ListView_GetOutlineColor(HWND w) {
+        return SendMessage(w, LVM_GETOUTLINECOLOR, 0, 0);
+    }
+
+    UINT ListView_GetSelectedColumn(HWND w) {
+        return SendMessage(w, LVM_GETSELECTEDCOLUMN, 0, 0);
+    }
+
+    void ListView_GetTileInfo(HWND w, PLVTILEINFO p) {
+        SendMessage(w, LVM_GETTILEINFO, 0, cast(LPARAM) p);
+    }
+
+    void ListView_GetTileViewInfo(HWND w, PLVTILEVIEWINFO p) {
+        SendMessage(w, LVM_GETTILEVIEWINFO, 0, cast(LPARAM) p);
+    }
+
+    DWORD ListView_GetView(HWND w) {
+        return SendMessage(w, LVM_GETVIEW, 0, 0);
+    }
+
+    BOOL ListView_HasGroup(HWND w, int i) {
+        return SendMessage(w, LVM_HASGROUP, i, 0);
+    }
+
+    int ListView_InsertGroup(HWND w, int i, PLVGROUP p) {
+        return SendMessage(w, LVM_INSERTGROUP, i, cast(LPARAM) p);
+    }
+
+    void ListView_InsertGroupSorted(HWND w, PLVINSERTGROUPSORTED p) {
+        SendMessage(w, LVM_INSERTGROUPSORTED, cast(WPARAM) p, 0);
+    }
+
+    BOOL ListView_InsertMarkHitTest(HWND w, LPPOINT p, PLVINSERTMARK t) {
+        return SendMessage(w, LVM_INSERTMARKHITTEST, cast(WPARAM) p, cast(LPARAM) t);
+    }
+
+    BOOL ListView_IsGroupViewEnabled(HWND w) {
+        return SendMessage(w, LVM_ISGROUPVIEWENABLED, 0, 0);
+    }
+
+    UINT ListView_MapIDToIndex(HWND w, UINT i) {
+        return SendMessage(w, LVM_MAPIDTOINDEX, i, 0);
+    }
+
+    /*  ??? MSDN documents this as "Not implemented", except in relation to
+     *  Windows CE/Mobile.
+     */
+    void ListView_MoveGroup(HWND w, int i, int t) {
+        SendMessage(w, LVM_MOVEGROUP, i, t);
+    }
+
+    void ListView_RemoveAllGroups(HWND w) {
+        SendMessage(w, LVM_REMOVEALLGROUPS, 0, 0);
+    }
+
+    int ListView_RemoveGroup(HWND w, int i) {
+        return SendMessage(w, LVM_REMOVEGROUP, i, 0);
+    }
+
+    int ListView_SetGroupInfo(HWND w, int i, PLVGROUP p) {
+        return SendMessage(w, LVM_SETGROUPINFO, i, cast(LPARAM) p);
+    }
+
+    void ListView_SetGroupMetrics(HWND w, PLVGROUPMETRICS p) {
+        SendMessage(w, LVM_SETGROUPMETRICS, 0, cast(LPARAM) p);
+    }
+
+    BOOL ListView_SetInfoTip(HWND w, PLVSETINFOTIP p) {
+        return SendMessage(w, LVM_SETINFOTIP, 0, cast(LPARAM) p);
+    }
+
+    BOOL ListView_SetInsertMark(HWND w, PLVINSERTMARK p) {
+        return SendMessage(w, LVM_SETINSERTMARK, 0, cast(LPARAM) p);
+    }
+
+    COLORREF ListView_SetInsertMarkColor(HWND w, COLORREF c) {
+        return SendMessage(w, LVM_SETINSERTMARKCOLOR, 0, c);
+    }
+
+    COLORREF ListView_SetOutlineColor(HWND w, COLORREF c) {
+        return SendMessage(w, LVM_SETOUTLINECOLOR, 0, c);
+    }
+
+    void ListView_SetSelectedColumn(HWND w, int i) {
+        SendMessage(w, LVM_SETSELECTEDCOLUMN, i, 0);
+    }
+
+    BOOL ListView_SetTileInfo(HWND w, PLVTILEINFO p) {
+        return SendMessage(w, LVM_SETTILEINFO, 0, cast(LPARAM) p);
+    }
+
+    BOOL ListView_SetTileViewInfo(HWND w, PLVTILEVIEWINFO p) {
+        return SendMessage(w, LVM_SETTILEVIEWINFO, 0, cast(LPARAM) p);
+    }
+
+    int ListView_SetView(HWND w, DWORD i) {
+        return SendMessage(w, LVM_SETVIEW, i, 0);
+    }
+
+    int ListView_SortGroups(HWND w, PFNLVGROUPCOMPARE c, LPVOID p) {
+        return SendMessage(w, LVM_SORTGROUPS, cast(WPARAM) c, cast(LPARAM) p);
+    }
-}
-
@@ -5511 +5845 @@
-    }
-}
+
+
+//#ifdef _WIN32_WCE               // these are PPC only
+/+
+extern (Windows) {
+    HWND  CommandBar_Create(HINSTANCE, HWND, int);
+    BOOL  CommandBar_Show(HWND, BOOL);
+    int   CommandBar_AddBitmap(HWND, HINSTANCE, int, int, int, int);
+    HWND  CommandBar_InsertComboBox(HWND, HINSTANCE, int, UINT, WORD, WORD);
+    BOOL  CommandBar_InsertMenubar(HWND, HINSTANCE, WORD, WORD );
+    BOOL  CommandBar_InsertMenubarEx(HWND, HINSTANCE, LPTSTR, WORD);
+    BOOL  CommandBar_DrawMenuBar(HWND, WORD);
+    HMENU CommandBar_GetMenu(HWND, WORD);
+    BOOL  CommandBar_AddAdornments(HWND, DWORD, DWORD);
+    int   CommandBar_Height(HWND hwndCB);
+}
+
+// MinGW: These two are not in the DLL
+void CommandBar_InsertButton(HWND hwnd, int i, LPTBBUTTON lptbbutton) {
+    SendMessage(hwnd, TB_INSERTBUTTON, i, lptbbutton);
+}
+alias DestroyWindow CommandBar_Destroy;
++/
+//#endif // _WIN32_WCE

trunk/win32/directx/d3d10.d

@@ -419 +419 @@
-}
-
-
-
+extern (Windows) 
+//
-    void GetDevice(ID3D10Device* ppDevice);
-    HRESULT GetPrivateData(REFGUID guid, UINT *pDataSize, void *pData);
@@ -924 +924 @@
-           (D3D10_FILTER_TYPE.D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIP_FILTER(d3d10Filter)));
-}
-
+
-bool D3D10_DECODE_IS_TEXT_1BIT_FILTER(D3D10_FILTER d3d10Filter) {
-    return d3d10Filter == D3D10_TEXT_1BIT_BIT;
@@ -1068 +1068 @@
-    D3D10_COUNTER_TYPE_UINT16   = (D3D10_COUNTER_TYPE_FLOAT32 + 1),
-    D3D10_COUNTER_TYPE_UINT32   = (D3D10_COUNTER_TYPE_UINT16 + 1),
- 
+
-}
-

trunk/win32/w32api.d

@@ -4 +4 @@
-*                       Windows API header module                       *
-*                                                                       *
-0
+2
-*                           by Stewart Gordon                           *
-*                                                                       *
@@ -11 +11 @@
-module win32.w32api;
-
-0
+2
-const __W32API_MAJOR_VERSION = 3;
-0
+2
-
-/*  These version identifiers are used to specify the minimum version of
@@ -72 +72 @@
-const bool _WIN32_WINNT_ONLY = _WIN32_WINDOWS == uint.max;
-
-
+
+
+
+
+
+
+
-    const uint _WIN32_IE = 0x600;
-} else version (IE56) {