Changeset 10530

Timestamp:

Mar 16, 2004, 6:17:31 PM (21 years ago)

Author:

sandervl

Message:

Wine merge

Location:

trunk

Files:

• include/win/commctrl.h (modified) (1 diff)
• src/comctl32/comctl32.h (modified) (1 diff)
• src/comctl32/listview.c (modified) (289 diffs)

trunk/include/win/commctrl.h ¶

@@ -1130 +1130 @@
 #define TB_UNKWN45E              (WM_USER+94)
 #define TB_UNKWN460              (WM_USER+96)
+#define TB_UNKWN462              (WM_USER+98)
 #define TB_UNKWN463              (WM_USER+99)
 #define TB_UNKWN464              (WM_USER+100)

trunk/src/comctl32/comctl32.h ¶

@@ -346 +346 @@
 
 
+/* undocumented functions */
+
+LPVOID WINAPI COMCTL32_Alloc (DWORD);
+#define Alloc(a) COMCTL32_Alloc(a)
+
+LPVOID WINAPI COMCTL32_ReAlloc (LPVOID, DWORD);
+BOOL   WINAPI COMCTL32_Free (LPVOID);
+#define Free(a) COMCTL32_Free(a)
+DWORD  WINAPI COMCTL32_GetSize (LPVOID);
+
 #ifdef __cplusplus
 }

trunk/src/comctl32/listview.c ¶

@@ -26 +26 @@
  * This code was audited for completeness against the documented features
  * of Comctl32.dll version 6.0 on Oct. 21, 2002, by Dimitrie O. Paun.
- *
- * Unless otherwise noted, we belive this code to be complete, as per
+ * 
+ * Unless otherwise noted, we believe this code to be complete, as per
  * the specification mentioned above.
  * If you discover missing features, or bugs, please note them below.
- *
+ * 
  * TODO:
  *
@@ -42 +42 @@
  *   -- Expand large item in ICON mode when the cursor is flying over the icon or text.
  *   -- Support CustonDraw options for _WIN32_IE >= 0x560 (see NMLVCUSTOMDRAW docs.
- *   -- in LISTVIEW_AddGroupSelection, se whould send LVN_ODSTATECHANGED
+ *   -- in LISTVIEW_AddGroupSelection, se whould send LVN_ODSTATECHANGED 
  *   -- LVA_SNAPTOGRID not implemented
  *   -- LISTVIEW_ApproximateViewRect partially implemented
@@ -79 +79 @@
  * Extended Styles
  *   -- LVS_EX_BORDERSELECT
- *   -- LVS_EX_CHECKBOXES
  *   -- LVS_EX_FLATSB
  *   -- LVS_EX_GRIDLINES
@@ -89 +88 @@
  *   -- LVS_EX_REGIONAL
  *   -- LVS_EX_SIMPLESELECT
- *   -- LVS_EX_SUBITEMIMAGES
  *   -- LVS_EX_TRACKSELECT
  *   -- LVS_EX_TWOCLICKACTIVATE
  *   -- LVS_EX_UNDERLINECOLD
  *   -- LVS_EX_UNDERLINEHOT
- *
+ *   
  * Notifications:
- *   -- LVN_BEGINRDRAG
  *   -- LVN_BEGINSCROLL, LVN_ENDSCROLL
  *   -- LVN_GETINFOTIP
@@ -108 +105 @@
  * Messages:
  *   -- LVM_CANCELEDITLABEL
- *   -- LVM_CREATEDRAGIMAGE
  *   -- LVM_ENABLEGROUPVIEW
  *   -- LVM_GETBKIMAGE, LVM_SETBKIMAGE
@@ -153 +149 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdio.h>
 
+#include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
 #include "commctrl.h"
 #include "comctl32.h"
@@ -234 +235 @@
   INT nHotItem;
   SHORT notifyFormat;
+  HWND hwndNotify;
   RECT rcList;                 /* This rectangle is really the window
-                                * client rectangle possibly reduced by the
-                                * horizontal scroll bar and/or header - see
+                                * client rectangle possibly reduced by the 
+                                * horizontal scroll bar and/or header - see 
                                 * LISTVIEW_UpdateSize. This rectangle offset
                                 * by the LISTVIEW_GetOrigin value is in
@@ -251 +253 @@
   INT ntmAveCharWidth;          /* by the listview to draw items */
   BOOL bRedraw;                 /* Turns on/off repaints & invalidations */
-  BOOL bFirstPaint;             /* Flags if the control has never painted before */
   BOOL bAutoarrange;            /* Autoarrange flag when NOT in LVS_AUTOARRANGE */
   BOOL bFocus;
@@ -273 +274 @@
   HWND hwndToolTip;
 
-  /* __WIN32OS2__: this might be sligtly fishy as the merge with wine is only partially done ... */
   DWORD cditemmode;             /* Keep the custom draw flags for an item/row */
 
@@ -349 +349 @@
 #define LV_ML_DT_FLAGS  (DT_TOP | DT_NOPREFIX | DT_EDITCONTROL | DT_CENTER | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS)
 #define LV_FL_DT_FLAGS  (DT_TOP | DT_NOPREFIX | DT_EDITCONTROL | DT_CENTER | DT_WORDBREAK | DT_NOCLIP)
-#define LV_SL_DT_FLAGS  (DT_TOP | DT_EDITCONTROL | DT_SINGLELINE | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS)
+#define LV_SL_DT_FLAGS  (DT_VCENTER | DT_EDITCONTROL | DT_SINGLELINE | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS)
 
 /* The time in milliseconds to reset the search in the list */
@@ -396 +396 @@
 static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL);
 static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, INT, INT, INT, INT, BOOL);
+static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST);
 
 /******** Text handling functions *************************************/
@@ -460 +461 @@
 {
     BOOL bResult = TRUE;
-
+    
     if (src == LPSTR_TEXTCALLBACKW)
     {
-        if (is_textW(*dest)) COMCTL32_Free(*dest);
+        if (is_textW(*dest)) Free(*dest);
         *dest = LPSTR_TEXTCALLBACKW;
     }
@@ -491 +492 @@
         textfreeT(bw, isW);
         return r;
-    }   
-        
+    }       
+            
     return 1;
 }
-
+    
 static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n)
 {
@@ -506 +507 @@
 
 /******** Debugging functions *****************************************/
-
 #if defined(__WIN32OS2__) && !defined(DEBUG)
 //can be removed when switching to GCC
@@ -522 +522 @@
 #define debugscrollcode(nScrollCode) 0
 #else
+
 static inline LPCSTR debugtext_t(LPCWSTR text, BOOL isW)
 {
@@ -546 +547 @@
 }
 
-static inline char* debugrange(const RANGE *lprng)
-{
-    if (lprng)
+static inline const char* debugrange(const RANGE *lprng)
+{
+    if (lprng) 
     {
         char* buf = debug_getbuf();
@@ -556 +557 @@
 }
 
-static inline char* debugpoint(const POINT *lppt)
-{
-    if (lppt)
+static inline const char* debugpoint(const POINT *lppt)
+{
+    if (lppt) 
     {
         char* buf = debug_getbuf();
@@ -566 +567 @@
 }
 
-static inline char* debugrect(const RECT *rect)
-{
-    if (rect)
+static inline const char* debugrect(const RECT *rect)
+{
+    if (rect) 
     {
         char* buf = debug_getbuf();
@@ -577 +578 @@
 }
 
-static char * debugscrollinfo(const SCROLLINFO *pScrollInfo)
+static const char * debugscrollinfo(const SCROLLINFO *pScrollInfo)
 {
     char* buf = debug_getbuf(), *text = buf;
     int len, size = DEBUG_BUFFER_SIZE;
-
+    
     if (pScrollInfo == NULL) return "(null)";
     len = snprintf(buf, size, "{cbSize=%d, ", pScrollInfo->cbSize);
@@ -607 +608 @@
     if (buf - text > 2) { buf[-2] = '}'; buf[-1] = 0; }
     return text;
-}
-
-static char* debugnmlistview(const NMLISTVIEW *plvnm)
+} 
+
+static const char* debugnmlistview(const NMLISTVIEW *plvnm)
 {
     if (plvnm)
@@ -622 +623 @@
 }
 
-static char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW)
+static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW)
 {
     char* buf = debug_getbuf(), *text = buf;
     int len, size = DEBUG_BUFFER_SIZE;
-
+    
     if (lpLVItem == NULL) return "(null)";
     len = snprintf(buf, size, "{iItem=%d, iSubItem=%d, ", lpLVItem->iItem, lpLVItem->iSubItem);
@@ -658 +659 @@
 }
 
-static char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW)
+static const char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW)
 {
     char* buf = debug_getbuf(), *text = buf;
     int len, size = DEBUG_BUFFER_SIZE;
-
+    
     if (lpColumn == NULL) return "(null)";
     len = snprintf(buf, size, "{");
@@ -698 +699 @@
 }
 
-static char* debuglvhittestinfo(const LVHITTESTINFO *lpht)
-{
-    if (lpht)
+static const char* debuglvhittestinfo(const LVHITTESTINFO *lpht)
+{
+    if (lpht) 
     {
         char* buf = debug_getbuf();
@@ -725 +726 @@
   }
 }
-#endif
+#endif /* __WIN32OS2__ */
+
 
 /******** Notification functions i************************************/
@@ -732 +734 @@
 {
     LRESULT result;
-
+    
     TRACE("(code=%d)\n", code);
 
@@ -738 +740 @@
     pnmh->idFrom = GetWindowLongW(infoPtr->hwndSelf, GWL_ID);
     pnmh->code = code;
-    result = SendMessageW(GetParent(infoPtr->hwndSelf), WM_NOTIFY,
+    result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY,
                           (WPARAM)pnmh->idFrom, (LPARAM)pnmh);
 
@@ -752 +754 @@
 }
 
-static inline void notify_itemactivate(LISTVIEW_INFO *infoPtr)
-{
-    notify(infoPtr, LVN_ITEMACTIVATE);
+static inline void notify_itemactivate(LISTVIEW_INFO *infoPtr, LVHITTESTINFO *htInfo)
+{
+    NMITEMACTIVATE nmia;
+    LVITEMW item;
+
+    if (htInfo) {
+      nmia.uNewState = 0;
+      nmia.uOldState = 0;
+      nmia.uChanged  = 0;
+      nmia.uKeyFlags = 0;
+      
+      item.mask = LVIF_PARAM|LVIF_STATE;
+      item.iItem = htInfo->iItem;
+      item.iSubItem = 0;
+      if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) {
+          nmia.lParam = item.lParam;
+          nmia.uOldState = item.state;
+          nmia.uNewState = item.state | LVIS_ACTIVATING;
+          nmia.uChanged  = LVIF_STATE;
+      }
+      
+      nmia.iItem = htInfo->iItem;
+      nmia.iSubItem = htInfo->iSubItem;
+      nmia.ptAction = htInfo->pt;     
+      
+      if (GetKeyState(VK_SHIFT) & 0x8000) nmia.uKeyFlags |= LVKF_SHIFT;
+      if (GetKeyState(VK_CONTROL) & 0x8000) nmia.uKeyFlags |= LVKF_CONTROL;
+      if (GetKeyState(VK_MENU) & 0x8000) nmia.uKeyFlags |= LVKF_ALT;
+    }
+    notify_hdr(infoPtr, LVN_ITEMACTIVATE, (LPNMHDR)&nmia);
 }
 
@@ -767 +796 @@
     NMLISTVIEW nmlv;
     LVITEMW item;
-
-    TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht));
+   
+    TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); 
     ZeroMemory(&nmlv, sizeof(nmlv));
     nmlv.iItem = lvht->iItem;
@@ -784 +813 @@
     NMLISTVIEW nmlv;
     LVITEMW item;
-
+   
     ZeroMemory(&nmlv, sizeof (NMLISTVIEW));
     nmlv.iItem = nItem;
@@ -873 +902 @@
 }
 
-static void customdraw_fill(NMLVCUSTOMDRAW *lpnmlvcd, LISTVIEW_INFO *infoPtr, HDC hdc,
+static void customdraw_fill(NMLVCUSTOMDRAW *lpnmlvcd, LISTVIEW_INFO *infoPtr, HDC hdc, 
                             const RECT *rcBounds, const LVITEMW *lplvItem)
 {
@@ -896 +925 @@
 
     lpnmlvcd->nmcd.dwDrawStage = dwDrawStage;
-    if (isForItem) lpnmlvcd->nmcd.dwDrawStage |= CDDS_ITEM;
+    if (isForItem) lpnmlvcd->nmcd.dwDrawStage |= CDDS_ITEM; 
     if (lpnmlvcd->iSubItem) lpnmlvcd->nmcd.dwDrawStage |= CDDS_SUBITEM;
     if (isForItem) lpnmlvcd->nmcd.dwItemSpec--;
@@ -904 +933 @@
 }
 
-static DWORD notify_prepaint (LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd)
-{
-    BOOL isSelected = lpnmlvcd->nmcd.uItemState & CDIS_SELECTED;
-    DWORD cditemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, lpnmlvcd);
-
-    if (cditemmode & CDRF_SKIPDEFAULT) return cditemmode;
-
+static void prepaint_setup (LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd)
+{
     /* apprently, for selected items, we have to override the returned values */
-    if (isSelected)
+    if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED)
     {
         if (infoPtr->bFocus)
@@ -938 +962 @@
         SetBkMode(hdc, TRANSPARENT);
     SetTextColor(hdc, lpnmlvcd->clrText);
-
-    return cditemmode;
 }
 
@@ -988 +1010 @@
  * after it's done with it, as the creation of the iterator may
  * allocate memory, which thus needs to be freed.
- *
+ * 
  * You can iterate both forwards, and backwards through the list,
  * by using iterator_next or iterator_prev respectively.
- *
+ * 
  * Lower numbered items are draw on top of higher number items in
  * LVS_ICON, and LVS_SMALLICON (which are the only modes where
@@ -1015 +1037 @@
  * LVS_ICON, and LVS_SMALLICON mode to handle the focused item,
  * which needs to be first, as it may overlap other items.
- *
+ *           
  * The code is a bit messy because we have:
  *   - a special item to deal with
@@ -1051 +1073 @@
     if (i->ranges)
     {
-        if (i->index < i->ranges->hdpa->nItemCount)
+        if (i->index < DPA_GetPtrCount(i->ranges->hdpa))
             i->range = *(RANGE*)DPA_GetPtr(i->ranges->hdpa, i->index++);
         else goto end;
@@ -1077 +1099 @@
     {
         start = TRUE;
-        if (i->ranges) i->index = i->ranges->hdpa->nItemCount;
+        if (i->ranges) i->index = DPA_GetPtrCount(i->ranges->hdpa);
         goto pickarange;
     }
@@ -1113 +1135 @@
 
     range.lower = (*(RANGE*)DPA_GetPtr(i->ranges->hdpa, 0)).lower;
-    range.upper = (*(RANGE*)DPA_GetPtr(i->ranges->hdpa, i->ranges->hdpa->nItemCount - 1)).upper;
+    range.upper = (*(RANGE*)DPA_GetPtr(i->ranges->hdpa, DPA_GetPtrCount(i->ranges->hdpa) - 1)).upper;
     return range;
 }
@@ -1165 +1187 @@
     RECT frame = *lprc, rcItem, rcTemp;
     POINT Origin;
-
+    
     /* in case we fail, we want to return an empty iterator */
     if (!iterator_empty(i)) return FALSE;
@@ -1250 +1272 @@
     RECT rcItem, rcClip;
     INT rgntype;
-
+    
     rgntype = GetClipBox(hdc, &rcClip);
     if (rgntype == NULLREGION) return iterator_empty(i);
@@ -1262 +1284 @@
         if (!RectVisible(hdc, &rcItem)) i->nSpecial = -1;
     }
-
+    
     /* if we can't deal with the region, we'll just go with the simple range */
     LISTVIEW_GetOrigin(infoPtr, &Origin);
@@ -1290 +1312 @@
     /* the iterator should restart on the next iterator_next */
     TRACE("done\n");
-
+    
     return TRUE;
 }
@@ -1306 +1328 @@
 {
     UINT uView = infoPtr->dwStyle & LVS_TYPEMASK;
-
+    
     return ((infoPtr->dwStyle & LVS_AUTOARRANGE) || infoPtr->bAutoarrange) &&
            (uView == LVS_ICON || uView == LVS_SMALLICON);
@@ -1317 +1339 @@
     static COLUMN_INFO mainItem;
 
-    if (nSubItem == 0 && infoPtr->hdpaColumns->nItemCount == 0) return &mainItem;
-    assert (nSubItem >= 0 && nSubItem < infoPtr->hdpaColumns->nItemCount);
+    if (nSubItem == 0 && DPA_GetPtrCount(infoPtr->hdpaColumns) == 0) return &mainItem;
+    assert (nSubItem >= 0 && nSubItem < DPA_GetPtrCount(infoPtr->hdpaColumns));
     return (COLUMN_INFO *)DPA_GetPtr(infoPtr->hdpaColumns, nSubItem);
 }
@@ -1336 +1358 @@
 static inline BOOL is_redrawing(LISTVIEW_INFO *infoPtr)
 {
-    return infoPtr->bRedraw && !infoPtr->bFirstPaint;
+    return infoPtr->bRedraw;
 }
 
 static inline void LISTVIEW_InvalidateRect(LISTVIEW_INFO *infoPtr, const RECT* rect)
 {
-    if(!is_redrawing(infoPtr)) return;
+    if(!is_redrawing(infoPtr)) return; 
     TRACE(" invalidating rect=%s\n", debugrect(rect));
     InvalidateRect(infoPtr->hwndSelf, rect, TRUE);
@@ -1350 +1372 @@
     RECT rcBox;
 
-    if(!is_redrawing(infoPtr)) return;
+    if(!is_redrawing(infoPtr)) return; 
     LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox);
     LISTVIEW_InvalidateRect(infoPtr, &rcBox);
@@ -1359 +1381 @@
     POINT Origin, Position;
     RECT rcBox;
-
-    if(!is_redrawing(infoPtr)) return;
+    
+    if(!is_redrawing(infoPtr)) return; 
     assert ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT);
     LISTVIEW_GetOrigin(infoPtr, &Origin);
@@ -1379 +1401 @@
 {
     RECT rcCol;
-
-    if(!is_redrawing(infoPtr)) return;
+    
+    if(!is_redrawing(infoPtr)) return; 
     LISTVIEW_GetHeaderRect(infoPtr, nColumn, &rcCol);
     rcCol.top = infoPtr->rcList.top;
@@ -1631 +1653 @@
         if (LISTVIEW_GetViewRect(infoPtr, &rcView)) horzInfo.nMax = rcView.right - rcView.left;
     }
-
+  
     horzInfo.fMask = SIF_RANGE | SIF_PAGE;
     horzInfo.nMax = max(horzInfo.nMax - 1, 0);
@@ -1680 +1702 @@
 /***
  * DESCRIPTION:
- * Shows/hides the focus rectangle.
+ * Shows/hides the focus rectangle. 
  *
  * PARAMETER(S):
@@ -1703 +1725 @@
         RECT rcBox;
 
-        LISTVIEW_GetItemBox(infoPtr, infoPtr->nFocusedItem, &rcBox);
+        LISTVIEW_GetItemBox(infoPtr, infoPtr->nFocusedItem, &rcBox); 
         if ((rcBox.bottom - rcBox.top) > infoPtr->nItemHeight)
         {
@@ -1723 +1745 @@
         item.mask = LVIF_PARAM;
         if (!LISTVIEW_GetItemW(infoPtr, &item)) goto done;
-        
-        ZeroMemory(&dis, sizeof(dis));
+           
+        ZeroMemory(&dis, sizeof(dis)); 
         dis.CtlType = ODT_LISTVIEW;
         dis.CtlID = GetWindowLongW(infoPtr->hwndSelf, GWL_ID);
@@ -1735 +1757 @@
         dis.itemData = item.lParam;
 
-        SendMessageW(GetParent(infoPtr->hwndSelf), WM_DRAWITEM, dis.CtlID, (LPARAM)&dis);
+        SendMessageW(infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis);
     }
     else
@@ -1750 +1772 @@
 static void LISTVIEW_InvalidateSelectedItems(LISTVIEW_INFO *infoPtr)
 {
-    ITERATOR i;
-
-    iterator_frameditems(&i, infoPtr, &infoPtr->rcList);
+    ITERATOR i; 
+   
+    iterator_frameditems(&i, infoPtr, &infoPtr->rcList); 
     while(iterator_next(&i))
     {
@@ -1761 +1783 @@
 }
 
-        
+            
 /***
  * DESCRIPTION:            [INTERNAL]
@@ -1770 +1792 @@
  * one ca factor the computation of the Origin before the loop,
  * and offset the value retured by this function, on every iteration.
- *
+ * 
  * PARAMETER(S):
  * [I] infoPtr : valid pointer to the listview structure
@@ -1802 +1824 @@
     }
 }
-
+    
 /***
  * DESCRIPTION:            [INTERNAL]
@@ -1845 +1867 @@
  */
 static void LISTVIEW_GetItemMetrics(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
-                                    LPRECT lprcBox, LPRECT lprcState,
+                                    LPRECT lprcBox, LPRECT lprcState, 
                                     LPRECT lprcIcon, LPRECT lprcLabel)
 {
@@ -1865 +1887 @@
     if (doLabel || lprcIcon) doIcon = TRUE;
     if (doIcon || lprcState) doState = TRUE;
-
+    
     /************************************************************/
     /* compute the box rectangle (it should be cheap to do)     */
@@ -1872 +1894 @@
         lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, lpLVItem->iSubItem);
 
-    if (lpLVItem->iSubItem)
+    if (lpLVItem->iSubItem)    
     {
         Box = lpColumnInfo->rcHeader;
@@ -1892 +1914 @@
         {
             State.left = Box.left - infoPtr->iconStateSize.cx - 2;
-            if (infoPtr->himlNormal)
+            if (infoPtr->himlNormal) 
                 State.left += (infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2;
             State.top  = Box.top + infoPtr->iconSize.cy - infoPtr->iconStateSize.cy + 4;
@@ -1900 +1922 @@
             /* we need the ident in report mode, if we don't have it, we fail */
             State.left = Box.left;
-            if (uView == LVS_REPORT)
+            if (uView == LVS_REPORT) 
             {
                 if (lpLVItem->iSubItem == 0)
@@ -1930 +1952 @@
         {
             Icon.left   = Box.left;
-            if (infoPtr->himlNormal)
+            if (infoPtr->himlNormal) 
                 Icon.left += (infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2;
             Icon.top    = Box.top + ICON_TOP_PADDING;
@@ -1946 +1968 @@
             Icon.top    = Box.top;
             Icon.right  = Icon.left;
-            if (infoPtr->himlSmall && (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE)))
+            if (infoPtr->himlSmall &&
+                (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) ||
+                 ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK)))
                 Icon.right += infoPtr->iconSize.cx;
             Icon.bottom = Icon.top + infoPtr->nItemHeight;
@@ -1989 +2013 @@
             rcText.right = infoPtr->nItemWidth - TRAILING_LABEL_PADDING;
             rcText.bottom = infoPtr->nItemHeight;
-            if (uView == LVS_ICON)
+            if (uView == LVS_ICON) 
                 rcText.bottom -= ICON_TOP_PADDING + infoPtr->iconSize.cy + ICON_BOTTOM_PADDING;
 
@@ -1997 +2021 @@
             else
                 uFormat = LV_SL_DT_FLAGS;
-        
+            
             DrawTextW (hdc, lpLVItem->pszText, -1, &rcText, uFormat | DT_CALCRECT);
 
@@ -2031 +2055 @@
             Label.bottom = Label.top + infoPtr->nItemHeight;
         }
-
+  
         if (lprcLabel) *lprcLabel = Label;
         TRACE("    - label=%s\n", debugrect(&Label));
@@ -2102 +2126 @@
 {
     INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
-
+    
     *lpPos = infoPtr->currIconPos;
-
+    
     infoPtr->currIconPos.x += infoPtr->nItemWidth;
     if (infoPtr->currIconPos.x + infoPtr->nItemWidth <= nListWidth) return;
@@ -2112 +2136 @@
 }
 
-
+    
 /***
  * DESCRIPTION:
@@ -2128 +2152 @@
 {
     INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
-
+    
     *lpPos = infoPtr->currIconPos;
-
+    
     infoPtr->currIconPos.y += infoPtr->nItemHeight;
     if (infoPtr->currIconPos.y + infoPtr->nItemHeight <= nListHeight) return;
@@ -2138 +2162 @@
 }
 
-
+    
 /***
  * DESCRIPTION:
@@ -2157 +2181 @@
 {
     POINT old;
-
+    
     if (!isNew)
-    {
+    { 
         old.x = (LONG)DPA_GetPtr(infoPtr->hdpaPosX, nItem);
         old.y = (LONG)DPA_GetPtr(infoPtr->hdpaPosY, nItem);
-
+    
         if (lppt->x == old.x && lppt->y == old.y) return TRUE;
         LISTVIEW_InvalidateItem(infoPtr, nItem);
@@ -2197 +2221 @@
 
     if (uView != LVS_ICON && uView != LVS_SMALLICON) return FALSE;
-
+  
     TRACE("nAlignCode=%d\n", nAlignCode);
 
@@ -2205 +2229 @@
         else nAlignCode = LVA_ALIGNTOP;
     }
-
+   
     switch (nAlignCode)
     {
@@ -2213 +2237 @@
     default: return FALSE;
     }
-
+    
     infoPtr->bAutoarrange = TRUE;
     infoPtr->currIconPos.x = infoPtr->currIconPos.y = 0;
@@ -2224 +2248 @@
     return TRUE;
 }
-
+  
 /***
  * DESCRIPTION:
@@ -2269 +2293 @@
         break;
         
-    case LVS_REPORT:    
+    case LVS_REPORT:        
         lprcView->right = infoPtr->nItemWidth;
         lprcView->bottom = infoPtr->nItemCount * infoPtr->nItemHeight;
@@ -2295 +2319 @@
 
     if (!lprcView) return FALSE;
-
+ 
     LISTVIEW_GetOrigin(infoPtr, &ptOrigin);
-    LISTVIEW_GetAreaRect(infoPtr, lprcView);
-    OffsetRect(lprcView, ptOrigin.x, ptOrigin.y);
+    LISTVIEW_GetAreaRect(infoPtr, lprcView); 
+    OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); 
 
     TRACE("lprcView=%s\n", debugrect(lprcView));
@@ -2323 +2347 @@
 
     /* we should binary search here if need be */
-    for (i = 1; i < hdpaSubItems->nItemCount; i++)
+    for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++)
     {
         lpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i);
@@ -2357 +2381 @@
         RECT rcHeader;
 
-        if (infoPtr->hdpaColumns->nItemCount > 0)
+        if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0)
         {
-            LISTVIEW_GetHeaderRect(infoPtr, infoPtr->hdpaColumns->nItemCount - 1, &rcHeader);
+            LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcHeader);
             nItemWidth = rcHeader.right;
         }
@@ -2370 +2394 @@
             nItemWidth = max(LISTVIEW_GetLabelWidth(infoPtr, i), nItemWidth);
 
-        if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx;
+        if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; 
         if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx;
 
@@ -2400 +2424 @@
     else
     {
-        nItemHeight = infoPtr->ntmHeight;
+        nItemHeight = infoPtr->ntmHeight; 
         if (infoPtr->himlState)
             nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy);
@@ -2424 +2448 @@
        }
 #endif
+
     }
 
@@ -2469 +2494 @@
     SelectObject(hdc, hOldFont);
     ReleaseDC(infoPtr->hwndSelf, hdc);
-
+    
     TRACE("tmHeight=%d\n", infoPtr->ntmHeight);
 }
@@ -2490 +2515 @@
 {
     INT cmp;
-
-    if (((RANGE*)range1)->upper <= ((RANGE*)range2)->lower)
+    
+    if (((RANGE*)range1)->upper <= ((RANGE*)range2)->lower) 
         cmp = -1;
-    else if (((RANGE*)range2)->upper <= ((RANGE*)range1)->lower)
+    else if (((RANGE*)range2)->upper <= ((RANGE*)range1)->lower) 
         cmp = 1;
-    else
+    else 
         cmp = 0;
-
+    
     TRACE("range1=%s, range2=%s, cmp=%d\n", debugrange((RANGE*)range1), debugrange((RANGE*)range2), cmp);
 
@@ -2513 +2538 @@
     INT i;
     RANGE *prev, *curr;
-
+    
     TRACE("*** Checking %s:%d:%s ***\n", func, line, desc);
     assert (ranges);
-    assert (ranges->hdpa->nItemCount >= 0);
+    assert (DPA_GetPtrCount(ranges->hdpa) >= 0);
     ranges_dump(ranges);
     prev = (RANGE *)DPA_GetPtr(ranges->hdpa, 0);
-    if (ranges->hdpa->nItemCount > 0)
+    if (DPA_GetPtrCount(ranges->hdpa) > 0)
         assert (prev->lower >= 0 && prev->lower < prev->upper);
-    for (i = 1; i < ranges->hdpa->nItemCount; i++)
+    for (i = 1; i < DPA_GetPtrCount(ranges->hdpa); i++)
     {
         curr = (RANGE *)DPA_GetPtr(ranges->hdpa, i);
@@ -2533 +2558 @@
 static RANGES ranges_create(int count)
 {
-    RANGES ranges = (RANGES)COMCTL32_Alloc(sizeof(struct tagRANGES));
+    RANGES ranges = (RANGES)Alloc(sizeof(struct tagRANGES));
     if (!ranges) return NULL;
     ranges->hdpa = DPA_Create(count);
     if (ranges->hdpa) return ranges;
-    COMCTL32_Free(ranges);
+    Free(ranges);
     return NULL;
 }
@@ -2545 +2570 @@
     INT i;
         
-    for(i = 0; i < ranges->hdpa->nItemCount; i++)
-        COMCTL32_Free(DPA_GetPtr(ranges->hdpa, i));
+    for(i = 0; i < DPA_GetPtrCount(ranges->hdpa); i++)
+        Free(DPA_GetPtr(ranges->hdpa, i));
     DPA_DeleteAllPtrs(ranges->hdpa);
 }
@@ -2556 +2581 @@
     ranges_clear(ranges);
     DPA_Destroy(ranges->hdpa);
-    COMCTL32_Free(ranges);
+    Free(ranges);
 }
 
@@ -2563 +2588 @@
     RANGES clone;
     INT i;
-        
-    if (!(clone = ranges_create(ranges->hdpa->nItemCount))) goto fail;
-
-    for (i = 0; i < ranges->hdpa->nItemCount; i++)
-    {
-        RANGE *newrng = (RANGE *)COMCTL32_Alloc(sizeof(RANGE));
+           
+    if (!(clone = ranges_create(DPA_GetPtrCount(ranges->hdpa)))) goto fail;
+
+    for (i = 0; i < DPA_GetPtrCount(ranges->hdpa); i++)
+    {
+        RANGE *newrng = (RANGE *)Alloc(sizeof(RANGE));
         if (!newrng) goto fail;
         *newrng = *((RANGE*)DPA_GetPtr(ranges->hdpa, i));
@@ -2574 +2599 @@
     }
     return clone;
-
+    
 fail:
     TRACE ("clone failed\n");
@@ -2585 +2610 @@
     INT i;
 
-    for (i = 0; i < sub->hdpa->nItemCount; i++)
+    for (i = 0; i < DPA_GetPtrCount(sub->hdpa); i++)
         ranges_del(ranges, *((RANGE *)DPA_GetPtr(sub->hdpa, i)));
 
@@ -2595 +2620 @@
     INT i;
 
-    for (i = 0; i < ranges->hdpa->nItemCount; i++)
+    for (i = 0; i < DPA_GetPtrCount(ranges->hdpa); i++)
         TRACE("   %s\n", debugrange(DPA_GetPtr(ranges->hdpa, i)));
 }
@@ -2611 +2636 @@
 {
     INT i, count = 0;
-
-    for (i = 0; i < ranges->hdpa->nItemCount; i++)
+    
+    for (i = 0; i < DPA_GetPtrCount(ranges->hdpa); i++)
     {
         RANGE *sel = DPA_GetPtr(ranges->hdpa, i);
@@ -2629 +2654 @@
     if (index == -1) return TRUE;
 
-    for (; index < ranges->hdpa->nItemCount; index++)
+    for (; index < DPA_GetPtrCount(ranges->hdpa); index++)
     {
         chkrng = DPA_GetPtr(ranges->hdpa, index);
@@ -2652 +2677 @@
     srchrgn.upper = range.upper + 1;
     index = DPA_Search(ranges->hdpa, &srchrgn, 0, ranges_cmp, 0, DPAS_SORTED);
-
+   
     if (index == -1)
     {
@@ -2660 +2685 @@
 
         /* create the brand new range to insert */      
-        newrgn = (RANGE *)COMCTL32_Alloc(sizeof(RANGE));
+        newrgn = (RANGE *)Alloc(sizeof(RANGE));
         if(!newrgn) goto fail;
         *newrgn = range;
@@ -2672 +2697 @@
         if (DPA_InsertPtr(ranges->hdpa, index, newrgn) == -1)
         {
-            COMCTL32_Free(newrgn);
+            Free(newrgn);
             goto fail;
         }
@@ -2693 +2718 @@
         srchrgn.lower = chkrgn->lower - 1;
         srchrgn.upper = chkrgn->upper + 1;
-        
+            
         do
         {
             mergeindex = DPA_Search(ranges->hdpa, &srchrgn, fromindex, ranges_cmp, 0, 0);
             if (mergeindex == -1) break;
-            if (mergeindex == index)
+            if (mergeindex == index) 
             {
                 fromindex = index + 1;
                 continue;
             }
-        
+          
             TRACE("Merge with index %i\n", mergeindex);
-        
+            
             mrgrgn = DPA_GetPtr(ranges->hdpa, mergeindex);
             chkrgn->lower = min(chkrgn->lower, mrgrgn->lower);
             chkrgn->upper = max(chkrgn->upper, mrgrgn->upper);
-            COMCTL32_Free(mrgrgn);
+            Free(mrgrgn);
             DPA_DeletePtr(ranges->hdpa, mergeindex);
             if (mergeindex < index) index --;
@@ -2717 +2742 @@
     ranges_check(ranges, "after add");
     return TRUE;
-
+    
 fail:
     ranges_check(ranges, "failed add");
@@ -2730 +2755 @@
     TRACE("(%s)\n", debugrange(&range));
     ranges_check(ranges, "before del");
-
+    
     /* we don't use DPAS_SORTED here, since we need *
      * to find the first overlapping range          */
     index = DPA_Search(ranges->hdpa, &range, 0, ranges_cmp, 0, 0);
-    while(index != -1)
+    while(index != -1) 
     {
         chkrgn = DPA_GetPtr(ranges->hdpa, index);
         
-        TRACE("Matches range %s @%d\n", debugrange(chkrgn), index);
+        TRACE("Matches range %s @%d\n", debugrange(chkrgn), index); 
 
         /* case 1: Same range */
@@ -2749 +2774 @@
         /* case 2: engulf */
         else if ( (chkrgn->upper <= range.upper) &&
-                  (chkrgn->lower >= range.lower) )
+                  (chkrgn->lower >= range.lower) ) 
         {
             DPA_DeletePtr(ranges->hdpa, index);
@@ -2771 +2796 @@
             RANGE tmprgn = *chkrgn, *newrgn;
 
-            if (!(newrgn = (RANGE *)COMCTL32_Alloc(sizeof(RANGE)))) goto fail;
+            if (!(newrgn = (RANGE *)Alloc(sizeof(RANGE)))) goto fail;
             newrgn->lower = chkrgn->lower;
             newrgn->upper = range.lower;
@@ -2777 +2802 @@
             if (DPA_InsertPtr(ranges->hdpa, index, newrgn) == -1)
             {
-                COMCTL32_Free(newrgn);
+                Free(newrgn);
                 goto fail;
             }
@@ -2817 +2842 @@
     lvItem.state = 0;
     lvItem.stateMask = LVIS_SELECTED;
-
+    
     /* need to clone the DPA because callbacks can change it */
     if (!(clone = ranges_clone(infoPtr->selectionRanges))) return FALSE;
@@ -2832 +2857 @@
 {
     RANGES toSkip;
-
+   
     if (!(toSkip = ranges_create(1))) return FALSE;
     if (nItem != -1) ranges_additem(toSkip, nItem);
@@ -2893 +2918 @@
 
     if (nItem == infoPtr->nFocusedItem) return FALSE;
-
+    
     lvItem.state =  nItem == -1 ? 0 : LVIS_FOCUSED;
     lvItem.stateMask = LVIS_FOCUSED;
@@ -2945 +2970 @@
     if (nNewFocus != infoPtr->nFocusedItem)
         LISTVIEW_SetItemFocus(infoPtr, nNewFocus);
-
+    
     /* But we are not supposed to modify nHotItem! */
 
@@ -3006 +3031 @@
     if (!(selection = ranges_create(100))) return;
 
-    item.state = LVIS_SELECTED;
+    item.state = LVIS_SELECTED; 
     item.stateMask = LVIS_SELECTED;
 
@@ -3019 +3044 @@
         {
             RANGE sel;
-        
+            
             sel.lower = min(infoPtr->nSelectionMark, nItem);
             sel.upper = max(infoPtr->nSelectionMark, nItem) + 1;
@@ -3050 +3075 @@
     /* this will also destroy the selection */
     iterator_destroy(&i);
-
+    
     LISTVIEW_SetItemFocus(infoPtr, nItem);
 }
@@ -3070 +3095 @@
 
     TRACE("nItem=%d\n", nItem);
-
+    
     LISTVIEW_DeselectAllSkipItem(infoPtr, nItem);
 
@@ -3192 +3217 @@
     }
   }
+
   return 0;
 }
@@ -3197 +3223 @@
 
 /***
- * Tests wheather the item is assignable to a list with style lStyle
+ * Tests wheather the item is assignable to a list with style lStyle 
  */
 static inline BOOL is_assignable_item(const LVITEMW *lpLVItem, LONG lStyle)
 {
-    if ( (lpLVItem->mask & LVIF_TEXT) &&
+    if ( (lpLVItem->mask & LVIF_TEXT) && 
         (lpLVItem->pszText == LPSTR_TEXTCALLBACKW) &&
         (lStyle & (LVS_SORTASCENDING | LVS_SORTDESCENDING)) ) return FALSE;
-
+    
     return TRUE;
 }
@@ -3235 +3261 @@
 
     assert(lpLVItem->iItem >= 0 && lpLVItem->iItem < infoPtr->nItemCount);
-
-    if (lpLVItem->mask == 0) return TRUE;
+    
+    if (lpLVItem->mask == 0) return TRUE;   
 
     if (infoPtr->dwStyle & LVS_OWNERDATA)
@@ -3262 +3288 @@
 
     TRACE("oldState=%x, newState=%x\n", item.state, lpLVItem->state);
-    /* determine what fields will change */
+    /* determine what fields will change */    
     if ((lpLVItem->mask & LVIF_STATE) && ((item.state ^ lpLVItem->state) & lpLVItem->stateMask & ~infoPtr->uCallbackMask))
         uChanged |= LVIF_STATE;
@@ -3277 +3303 @@
     if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpItem->hdr.pszText, lpLVItem->pszText, isW))
         uChanged |= LVIF_TEXT;
-
-    TRACE("uChanged=0x%x\n", uChanged);
+   
+    TRACE("uChanged=0x%x\n", uChanged); 
     if (!uChanged) return TRUE;
     *bChanged = TRUE;
-
+    
     ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
     nmlv.iItem = lpLVItem->iItem;
@@ -3288 +3314 @@
     nmlv.uChanged = uChanged;
     nmlv.lParam = item.lParam;
-
+    
     /* send LVN_ITEMCHANGING notification, if the item is not being inserted */
     /* and we are _NOT_ virtual (LVS_OWERNDATA), and change notifications */
@@ -3340 +3366 @@
     /* if we're inserting the item, we're done */
     if (isNew) return TRUE;
-
+    
     /* send LVN_ITEMCHANGED notification */
     if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam;
@@ -3369 +3395 @@
     /* we do not support subitems for virtual listviews */
     if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE;
-
+    
     /* set subitem only if column is present */
-    if (lpLVItem->iSubItem >= infoPtr->hdpaColumns->nItemCount) return FALSE;
-
+    if (lpLVItem->iSubItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE;
+   
     /* First do some sanity checks */
     if (lpLVItem->mask & ~(LVIF_TEXT | LVIF_IMAGE)) return FALSE;
     if (!(lpLVItem->mask & (LVIF_TEXT | LVIF_IMAGE))) return TRUE;
-
+   
     /* get the subitem structure, and create it if not there */
     hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
     assert (hdpaSubItems);
-
+    
     lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, lpLVItem->iSubItem);
     if (!lpSubItem)
@@ -3387 +3413 @@
         INT i;
 
-        lpSubItem = (SUBITEM_INFO *)COMCTL32_Alloc(sizeof(SUBITEM_INFO));
+        lpSubItem = (SUBITEM_INFO *)Alloc(sizeof(SUBITEM_INFO));
         if (!lpSubItem) return FALSE;
         /* we could binary search here, if need be...*/
-        for (i = 1; i < hdpaSubItems->nItemCount; i++)
+        for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++)
         {
             tmpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i);
@@ -3397 +3423 @@
         if (DPA_InsertPtr(hdpaSubItems, i, lpSubItem) == -1)
         {
-            COMCTL32_Free(lpSubItem);
+            Free(lpSubItem);
             return FALSE;
         }
         lpSubItem->iSubItem = lpLVItem->iSubItem;
+        lpSubItem->hdr.iImage = I_IMAGECALLBACK;
         *bChanged = TRUE;
     }
-
+    
     if (lpLVItem->mask & LVIF_IMAGE)
         if (lpSubItem->hdr.iImage != lpLVItem->iImage)
@@ -3439 +3466 @@
     LPWSTR pszText = NULL;
     BOOL bResult, bChanged = FALSE;
-
+    
     TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW);
 
@@ -3451 +3478 @@
         ((LVITEMW *)lpLVItem)->pszText = textdupTtoW(lpLVItem->pszText, isW);
     }
-
+    
     /* actually set the fields */
     if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return FALSE;
-
+    
     if (lpLVItem->iSubItem)
         bResult = set_sub_item(infoPtr, lpLVItem, TRUE, &bChanged);
@@ -3509 +3536 @@
         if ((lStyle & WS_VSCROLL) && GetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo))
             nItem = scrollInfo.nPos;
-    }
+    } 
     else
     {
@@ -3517 +3544 @@
 
     TRACE("nItem=%d\n", nItem);
-
+    
     return nItem;
 }
@@ -3565 +3592 @@
     WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
     WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 };
-    DWORD cditemmode = CDRF_DODEFAULT;
+    DWORD cdsubitemmode = CDRF_DODEFAULT;
     RECT* lprcFocus, rcSelect, rcBox, rcState, rcIcon, rcLabel;
     NMLVCUSTOMDRAW nmlvcd;
     HIMAGELIST himl;
     LVITEMW lvItem;
-
 #ifdef __WIN32OS2__
     DWORD dwBkColor;
@@ -3593 +3619 @@
     lvItem.pszText = szDispText;
     if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE;
-    if (nSubItem > 0 && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
+    if (nSubItem > 0 && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) 
         lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED);
     if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = szCallback;
@@ -3600 +3626 @@
     /* now check if we need to update the focus rectangle */
     lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0;
-
+    
     if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED;
     LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcState, &rcIcon, &rcLabel);
@@ -3607 +3633 @@
     OffsetRect(&rcIcon, pos.x, pos.y);
     OffsetRect(&rcLabel, pos.x, pos.y);
-    TRACE("    rcBox=%s, rcState=%s, rcIcon=%s. rcLabel=%s\n",
+    TRACE("    rcBox=%s, rcState=%s, rcIcon=%s. rcLabel=%s\n", 
         debugrect(&rcBox), debugrect(&rcState), debugrect(&rcIcon), debugrect(&rcLabel));
 
@@ -3613 +3639 @@
     customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem);
 
+    if (nSubItem > 0) cdmode = infoPtr->cditemmode;
     if (cdmode & CDRF_NOTIFYITEMDRAW)
-        cditemmode = notify_prepaint (infoPtr, hdc, &nmlvcd);
-    if (nSubItem == 0) infoPtr->cditemmode = cditemmode;
-    if (cditemmode & CDRF_SKIPDEFAULT) goto postpaint;
+        cdsubitemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd);
+    if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode;
+    if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint;
+    /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */
+    if (nSubItem == 0 && cdsubitemmode == CDRF_NOTIFYITEMDRAW)
+    {
+        cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd);
+        if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint;
+    }
+    if (nSubItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW))
+        prepaint_setup(infoPtr, hdc, &nmlvcd);
 
     /* in full row select, subitems, will just use main item's colors */
     if (nSubItem && uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
         nmlvcd.clrTextBk = CLR_NONE;
-
+    
     /* state icons */
     if (infoPtr->himlState && !IsRectEmpty(&rcState))
@@ -3690 +3725 @@
         if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
             rcSelect.right = rcBox.right;
-
-        if (nmlvcd.clrTextBk != CLR_NONE)
+   
+        if (nmlvcd.clrTextBk != CLR_NONE) 
 #ifdef __WIN32OS2__
             ExtTextOutW(hdc, rcSelect.left, rcSelect.top, textoutOptions, &rcSelect, 0, 0, 0);
@@ -3699 +3734 @@
         if(lprcFocus) *lprcFocus = rcSelect;
     }
-
+   
     /* figure out the text drawing flags */
     uFormat = (uView == LVS_ICON ? (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS);
@@ -3722 +3757 @@
 
 postpaint:
-    if (cditemmode & CDRF_NOTIFYPOSTPAINT)
+    if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT)
         notify_postpaint(infoPtr, &nmlvcd);
+
 
 #ifdef __WIN32OS2__
@@ -3735 +3771 @@
   }
 #endif
-
     return TRUE;
 }
@@ -3753 +3788 @@
 {
     UINT uID = GetWindowLongW(infoPtr->hwndSelf, GWL_ID);
-    HWND hwndParent = GetParent(infoPtr->hwndSelf);
     DWORD cditemmode = CDRF_DODEFAULT;
     NMLVCUSTOMDRAW nmlvcd;
@@ -3759 +3793 @@
     DRAWITEMSTRUCT dis;
     LVITEMW item;
-
+    
     TRACE("()\n");
 
     ZeroMemory(&dis, sizeof(dis));
-
+    
     /* Get scroll info once before loop */
     LISTVIEW_GetOrigin(infoPtr, &Origin);
-
+    
     /* iterate through the invalidated rows */
     while(iterator_next(i))
@@ -3775 +3809 @@
         item.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
         if (!LISTVIEW_GetItemW(infoPtr, &item)) continue;
-        
+           
         dis.CtlType = ODT_LISTVIEW;
         dis.CtlID = uID;
@@ -3794 +3828 @@
         TRACE("item=%s, rcItem=%s\n", debuglvitem_t(&item, TRUE), debugrect(&dis.rcItem));
 
+    /*
+     * Even if we do not send the CDRF_NOTIFYITEMDRAW we need to fill the nmlvcd
+     * structure for the rest. of the paint cycle
+     */
+        customdraw_fill(&nmlvcd, infoPtr, hdc, &dis.rcItem, &item);
         if (cdmode & CDRF_NOTIFYITEMDRAW)
+            cditemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd);
+    
+        if (!(cditemmode & CDRF_SKIPDEFAULT))
         {
-            customdraw_fill(&nmlvcd, infoPtr, hdc, &dis.rcItem, &item);
-            cditemmode = notify_prepaint (infoPtr, hdc, &nmlvcd);
+            prepaint_setup (infoPtr, hdc, &nmlvcd);
+            SendMessageW(infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis);
         }
-
-        if (!(cditemmode & CDRF_SKIPDEFAULT))
-            SendMessageW(hwndParent, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis);
 
         if (cditemmode & CDRF_NOTIFYPOSTPAINT)
@@ -3833 +3872 @@
     rgntype = GetClipBox(hdc, &rcClip);
     if (rgntype == NULLREGION) return;
-
+    
     /* Get scroll info once before loop */
     LISTVIEW_GetOrigin(infoPtr, &Origin);
-
+    
     /* narrow down the columns we need to paint */
-    for(colRange.lower = 0; colRange.lower < infoPtr->hdpaColumns->nItemCount; colRange.lower++)
+    for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++)
     {
         LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem);
         if (rcItem.right + Origin.x >= rcClip.left) break;
     }
-    for(colRange.upper = infoPtr->hdpaColumns->nItemCount; colRange.upper > 0; colRange.upper--)
+    for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--)
     {
         LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem);
@@ -3897 +3936 @@
     /* Get scroll info once before loop */
     LISTVIEW_GetOrigin(infoPtr, &Origin);
-
+    
     while(iterator_prev(i))
     {
@@ -3932 +3971 @@
 
     LISTVIEW_DUMP(infoPtr);
-
+  
     infoPtr->bIsDrawing = TRUE;
 
@@ -3943 +3982 @@
     oldClrTextBk = infoPtr->clrTextBk;
     oldClrText   = infoPtr->clrText;
-
+   
     infoPtr->cditemmode = CDRF_DODEFAULT;
 
     GetClientRect(infoPtr->hwndSelf, &rcClient);
     customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0);
-    cdmode = notify_prepaint(infoPtr, hdc, &nmlvcd);
+    cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd);
     if (cdmode & CDRF_SKIPDEFAULT) goto enddraw;
+    prepaint_setup(infoPtr, hdc, &nmlvcd);
 
     /* Use these colors to draw the items */
@@ -3960 +4000 @@
     /* figure out what we need to draw */
     iterator_visibleitems(&i, infoPtr, hdc);
-
+    
     /* send cache hint notification */
     if (infoPtr->dwStyle & LVS_OWNERDATA)
@@ -3987 +4027 @@
     }
     iterator_destroy(&i);
-
+    
 enddraw:
     if (cdmode & CDRF_NOTIFYPOSTPAINT)
@@ -4060 +4100 @@
   }
   else if (uView == LVS_REPORT)
+  {
 #ifdef __WIN32OS2__
   {
@@ -4099 +4140 @@
   }
 #else
-    FIXME("uView == LVS_REPORT: not implemented\n");
+    RECT rcBox;
+
+    if (infoPtr->nItemCount > 0)
+    {
+      LISTVIEW_GetItemBox(infoPtr, 0, &rcBox);
+      wWidth = rcBox.right - rcBox.left;
+      wHeight = (rcBox.bottom - rcBox.top) * nItemCount;
+    }
+    else
+    {
+      /* use current height and width */
+      if (wHeight == 0xffff)
+          wHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
+      if (wWidth == 0xffff)
+          wWidth = infoPtr->rcList.right - infoPtr->rcList.left;
+    }
+
+    dwViewRect = MAKELONG(wWidth, wHeight);
 #endif
+  }
   else if (uView == LVS_SMALLICON)
     FIXME("uView == LVS_SMALLICON: not implemented\n");
@@ -4154 +4213 @@
     rcItem.bottom = size.cy;
     FillRect(hdc, &rcItem, infoPtr->hBkBrush);
-
+    
     pos.x = pos.y = 0;
     if (LISTVIEW_DrawItem(infoPtr, hdc, iItem, 0, pos, infoPtr->cditemmode))
@@ -4216 +4275 @@
         {
             hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, i);
-            for (j = 0; j < hdpaSubItems->nItemCount; j++)
+            for (j = 0; j < DPA_GetPtrCount(hdpaSubItems); j++)
             {
                 hdrItem = (ITEMHDR *)DPA_GetPtr(hdpaSubItems, j);
-                if (is_textW(hdrItem->pszText)) COMCTL32_Free(hdrItem->pszText);
-                COMCTL32_Free(hdrItem);
+                if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText);
+                Free(hdrItem);
             }
             DPA_Destroy(hdpaSubItems);
@@ -4229 +4288 @@
         infoPtr->nItemCount --;
     }
-
+    
     LISTVIEW_UpdateScroll(infoPtr);
 
     LISTVIEW_InvalidateList(infoPtr);
-
+    
     return TRUE;
 }
@@ -4254 +4313 @@
     RECT rcOld, rcCol;
     INT nCol;
-
-    lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, min(nColumn, infoPtr->hdpaColumns->nItemCount - 1));
+   
+    if (nColumn < 0 || DPA_GetPtrCount(infoPtr->hdpaColumns) < 1) return;
+    lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, min(nColumn, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1));
     rcCol = lpColumnInfo->rcHeader;
-    if (nColumn >= infoPtr->hdpaColumns->nItemCount)
+    if (nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns))
         rcCol.left = rcCol.right;
-
+    
     /* ajust the other columns */
-    for (nCol = nColumn; nCol < infoPtr->hdpaColumns->nItemCount; nCol++)
+    for (nCol = nColumn; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++)
     {
         lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol);
@@ -4270 +4330 @@
     /* do not update screen if not in report mode */
     if (!is_redrawing(infoPtr) || (infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) return;
-
+    
     /* if we have a focus, must first erase the focus rect */
     if (infoPtr->bFocus) LISTVIEW_ShowFocusRect(infoPtr, FALSE);
-
+    
     /* Need to reset the item width when inserting a new column */
     infoPtr->nItemWidth += dx;
@@ -4283 +4343 @@
     rcOld.left = rcCol.left;
     ScrollWindowEx(infoPtr->hwndSelf, dx, 0, &rcOld, &rcOld, 0, 0, SW_ERASE | SW_INVALIDATE);
-
+    
     /* we can restore focus now */
     if (infoPtr->bFocus) LISTVIEW_ShowFocusRect(infoPtr, TRUE);
@@ -4303 +4363 @@
 {
     RECT rcCol;
-
+    
     TRACE("nColumn=%d\n", nColumn);
 
-    if (nColumn < 0 || infoPtr->hdpaColumns->nItemCount == 0
-           || nColumn >= infoPtr->hdpaColumns->nItemCount) return FALSE;
+    if (nColumn < 0 || DPA_GetPtrCount(infoPtr->hdpaColumns) == 0
+           || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE;
 
     /* While the MSDN specifically says that column zero should not be deleted,
        it does in fact work on WinNT, and at least one app depends on it. On
        WinNT, deleting column zero deletes the last column of items but the
-       first header. Since no app will ever depend on that bizarre behavior,
+       first header. Since no app will ever depend on that bizarre behavior, 
        we just delete the last column including the header.
      */
     if (nColumn == 0)
-        nColumn = infoPtr->hdpaColumns->nItemCount - 1;
+        nColumn = DPA_GetPtrCount(infoPtr->hdpaColumns) - 1;
 
     LISTVIEW_GetHeaderRect(infoPtr, nColumn, &rcCol);
-
+    
     if (!Header_DeleteItem(infoPtr->hwndHeader, nColumn))
         return FALSE;
 
-    COMCTL32_Free(DPA_GetPtr(infoPtr->hdpaColumns, nColumn));
+    Free(DPA_GetPtr(infoPtr->hdpaColumns, nColumn));
     DPA_DeletePtr(infoPtr->hdpaColumns, nColumn);
-
+  
     if (!(infoPtr->dwStyle & LVS_OWNERDATA))
     {
@@ -4334 +4394 @@
         if (nColumn == 0)
             return LISTVIEW_DeleteAllItems(infoPtr);
-        
+            
         for (nItem = 0; nItem < infoPtr->nItemCount; nItem++)
         {
@@ -4340 +4400 @@
             nSubItem = 0;
             lpDelItem = 0;
-            for (i = 1; i < hdpaSubItems->nItemCount; i++)
+            for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++)
             {
                 lpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i);
@@ -4348 +4408 @@
                     lpDelItem = lpSubItem;
                 }
-                else if (lpSubItem->iSubItem > nColumn)
+                else if (lpSubItem->iSubItem > nColumn) 
                 {
                     lpSubItem->iSubItem--;
@@ -4359 +4419 @@
                 /* free string */
                 if (is_textW(lpDelItem->hdr.pszText))
-                    COMCTL32_Free(lpDelItem->hdr.pszText);
+                    Free(lpDelItem->hdr.pszText);
 
                 /* free item */
-                COMCTL32_Free(lpDelItem);
+                Free(lpDelItem);
 
                 /* free dpa memory */
@@ -4397 +4457 @@
     /* if we don't refresh, what's the point of scrolling? */
     if (!is_redrawing(infoPtr)) return;
-
+    
     assert (abs(dir) == 1);
 
@@ -4412 +4472 @@
     LISTVIEW_UpdateScroll(infoPtr);
 
-    /* figure out the item's position */
+    /* figure out the item's position */ 
     if (uView == LVS_REPORT)
         nPerCol = infoPtr->nItemCount + 1;
@@ -4419 +4479 @@
     else /* LVS_ICON, or LVS_SMALLICON */
         return;
-
+    
     nItemCol = nItem / nPerCol;
     nItemRow = nItem % nPerCol;
@@ -4434 +4494 @@
     {
         TRACE("Scrolling rcScroll=%s, rcList=%s\n", debugrect(&rcScroll), debugrect(&infoPtr->rcList));
-        ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight,
+        ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, 
                        &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE);
     }
@@ -4472 +4532 @@
 
     if (nItem < 0 || nItem >= infoPtr->nItemCount) return FALSE;
-
+    
     /* remove selection, and focus */
     item.state = 0;
     item.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
     LISTVIEW_SetItemState(infoPtr, nItem, &item);
-        
+            
     /* send LVN_DELETEITEM notification. */
     notify_deleteitem(infoPtr, nItem);
 
-    /* we need to do this here, because we'll be deleting stuff */
+    /* we need to do this here, because we'll be deleting stuff */  
     if (uView == LVS_SMALLICON || uView == LVS_ICON)
         LISTVIEW_InvalidateItem(infoPtr, nItem);
-
+    
     if (!(infoPtr->dwStyle & LVS_OWNERDATA))
     {
@@ -4492 +4552 @@
 
         hdpaSubItems = (HDPA)DPA_DeletePtr(infoPtr->hdpaItems, nItem);  
-        for (i = 0; i < hdpaSubItems->nItemCount; i++)
+        for (i = 0; i < DPA_GetPtrCount(hdpaSubItems); i++)
         {
             hdrItem = (ITEMHDR *)DPA_GetPtr(hdpaSubItems, i);
-            if (is_textW(hdrItem->pszText)) COMCTL32_Free(hdrItem->pszText);
-            COMCTL32_Free(hdrItem);
+            if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText);
+            Free(hdrItem);
         }
         DPA_Destroy(hdpaSubItems);
@@ -4598 +4658 @@
     rect.left = LVIR_LABEL;
     if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rect)) return 0;
-
+    
     ZeroMemory(&dispInfo, sizeof(dispInfo));
     dispInfo.item.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT;
@@ -4611 +4671 @@
                     rect.left-2, rect.top-1, 0, rect.bottom - rect.top+2, isW);
     if (!infoPtr->hwndEdit) return 0;
-
+    
     if (notify_dispinfoT(infoPtr, LVN_BEGINLABELEDITW, &dispInfo, isW))
     {
@@ -4654 +4714 @@
 
     if (bPartial && IntersectRect(&rcTemp, &infoPtr->rcList, &rcItem)) return TRUE;
-
+    
     if (rcItem.left < infoPtr->rcList.left || rcItem.right > infoPtr->rcList.right)
     {
@@ -4739 +4799 @@
 
     if (!lpFindInfo || nItem < 0) return -1;
-
+    
     lvItem.mask = 0;
     if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL))
@@ -4751 +4811 @@
         bWrap = TRUE;
 
-    if ((lpFindInfo->flags & LVFI_NEARESTXY) &&
+    if ((lpFindInfo->flags & LVFI_NEARESTXY) && 
         (uView == LVS_ICON || uView ==LVS_SMALLICON))
     {
@@ -4771 +4831 @@
         case VK_END:
             LISTVIEW_GetAreaRect(infoPtr, &rcArea);
-            Destination.x = rcArea.right;
-            Destination.y = rcArea.bottom;
+            Destination.x = rcArea.right; 
+            Destination.y = rcArea.bottom; 
             break;
         default: ERR("Unknown vkDirection=%d\n", lpFindInfo->vkDirection);
@@ -4909 +4969 @@
     HDITEMW hdi;
 
-    if (!lpColumn || nColumn < 0 || nColumn >= infoPtr->hdpaColumns->nItemCount) return FALSE;
+    if (!lpColumn || nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE;
     lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nColumn);
 
@@ -4986 +5046 @@
         break;
     case LVS_REPORT:
-        if (nColumn < 0 || nColumn >= infoPtr->hdpaColumns->nItemCount) return 0;
+        if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0;
         LISTVIEW_GetHeaderRect(infoPtr, nColumn, &rcHeader);
         nColumnWidth = rcHeader.right - rcHeader.left;
@@ -5070 +5130 @@
  *   that, so it's not a problem.
  *   For the two cases when the text must be copied (that is,
- *   for LVM_GETITEM, and LVMGETITEMTEXT), use LISTVIEW_GetItemExtT.
+ *   for LVM_GETITEM, and LVM_GETITEMTEXT), use LISTVIEW_GetItemExtT.
  *
  * RETURN:
@@ -5083 +5143 @@
     ITEMHDR* pItemHdr;
     HDPA hdpaSubItems;
+    INT isubitem;
 
     TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW);
@@ -5090 +5151 @@
 
     if (lpLVItem->mask == 0) return TRUE;
+
+    /* make a local copy */
+    isubitem = lpLVItem->iSubItem;
 
     /* a quick optimization if all we're asked is the focus state
@@ -5117 +5181 @@
             dispInfo.item.mask = lpLVItem->mask & ~LVIF_PARAM;
             dispInfo.item.iItem = lpLVItem->iItem;
-            dispInfo.item.iSubItem = lpLVItem->iSubItem;
+            dispInfo.item.iSubItem = isubitem;
             if (lpLVItem->mask & LVIF_TEXT)
             {
@@ -5149 +5213 @@
         
         /* we store only a little state, so if we're not asked, we're done */
-        if (!(lpLVItem->mask & LVIF_STATE) || lpLVItem->iSubItem) return TRUE;
+        if (!(lpLVItem->mask & LVIF_STATE) || isubitem) return TRUE;
 
         /* if focus is handled by us, report it */
-        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED )
+        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED ) 
         {
             lpLVItem->state &= ~LVIS_FOCUSED;
@@ -5160 +5224 @@
 
         /* and do the same for selection, if we handle it */
-        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED )
+        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED ) 
         {
             lpLVItem->state &= ~LVIS_SELECTED;
@@ -5175 +5239 @@
     assert (lpItem);
 
-    if (lpLVItem->iSubItem)
-    {
-        SUBITEM_INFO *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, lpLVItem->iSubItem);
+    if (isubitem)
+    {
+        SUBITEM_INFO *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, isubitem);
         pItemHdr = lpSubItem ? &lpSubItem->hdr : &callbackHdr;
+        if (!lpSubItem)
+        {
+            WARN(" iSubItem invalid (%08x), ignored.\n", isubitem);
+            isubitem = 0;
+        }
     }
     else
@@ -5184 +5253 @@
 
     /* Do we need to query the state from the app? */
-    if ((lpLVItem->mask & LVIF_STATE) && infoPtr->uCallbackMask && lpLVItem->iSubItem == 0)
+    if ((lpLVItem->mask & LVIF_STATE) && infoPtr->uCallbackMask && isubitem == 0)
     {
         dispInfo.item.mask |= LVIF_STATE;
         dispInfo.item.stateMask = infoPtr->uCallbackMask;
     }
-
+  
     /* Do we need to enquire about the image? */
-    if ((lpLVItem->mask & LVIF_IMAGE) && pItemHdr->iImage == I_IMAGECALLBACK)
+    if ((lpLVItem->mask & LVIF_IMAGE) && pItemHdr->iImage == I_IMAGECALLBACK &&
+        (isubitem == 0 || (infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES)))
+    {
         dispInfo.item.mask |= LVIF_IMAGE;
+        dispInfo.item.iImage = I_IMAGECALLBACK;
+    }
 
     /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */
@@ -5208 +5281 @@
     {
         dispInfo.item.iItem = lpLVItem->iItem;
-        dispInfo.item.iSubItem = lpLVItem->iSubItem;
+        dispInfo.item.iSubItem = lpLVItem->iSubItem; /* yes: the original subitem */
         dispInfo.item.lParam = lpItem->lParam;
         notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW);
@@ -5215 +5288 @@
 
     /* we should not store values for subitems */
-    if (lpLVItem->iSubItem) dispInfo.item.mask &= ~LVIF_DI_SETITEM;
+    if (isubitem) dispInfo.item.mask &= ~LVIF_DI_SETITEM;
 
     /* Now, handle the iImage field */
@@ -5225 +5298 @@
     }
     else if (lpLVItem->mask & LVIF_IMAGE)
-        lpLVItem->iImage = pItemHdr->iImage;
+    {
+        if(isubitem == 0 || (infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES))
+            lpLVItem->iImage = pItemHdr->iImage;
+        else
+            lpLVItem->iImage = 0;
+    }
 
     /* The pszText field */
@@ -5242 +5320 @@
 
     /* if this is a subitem, we're done */
-    if (lpLVItem->iSubItem) return TRUE;
-
+    if (isubitem) return TRUE;
+  
     /* Next is the lParam field */
     if (dispInfo.item.mask & LVIF_PARAM)
@@ -5255 +5333 @@
 
     /* ... the state field (this one is different due to uCallbackmask) */
-    if (lpLVItem->mask & LVIF_STATE)
+    if (lpLVItem->mask & LVIF_STATE) 
     {
         lpLVItem->state = lpItem->state;
@@ -5263 +5341 @@
             lpLVItem->state |= (dispInfo.item.state & dispInfo.item.stateMask);
         }
-        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED )
+        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED ) 
         {
             lpLVItem->state &= ~LVIS_FOCUSED;
@@ -5269 +5347 @@
                 lpLVItem->state |= LVIS_FOCUSED;
         }
-        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED )
+        if ( lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED ) 
         {
             lpLVItem->state &= ~LVIS_SELECTED;
             if (ranges_contain(infoPtr->selectionRanges, lpLVItem->iItem))
                 lpLVItem->state |= LVIS_SELECTED;
-        }       
+        }           
     }
 
@@ -5354 +5432 @@
     lpptPosition->x += Origin.x;
     lpptPosition->y += Origin.y;
-
+    
     TRACE ("  lpptPosition=%s\n", debugpoint(lpptPosition));
     return TRUE;
@@ -5505 +5583 @@
  *             on input, lprc->top = nSubItem
  *                       lprc->left = LVIR_ICON | LVIR_BOUNDS | LVIR_LABEL
- *
+ * 
  * NOTE: for subItem = 0, we should return the bounds of the _entire_ item,
  *       not only those of the first column.
  *       Fortunately, LISTVIEW_GetItemMetrics does the right thing.
- *
+ * 
  * RETURN:
  *     TRUE: success
@@ -5518 +5596 @@
     POINT Position;
     LVITEMW lvItem;
-
-    if (!lprc || (infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) return FALSE;
+    
+    if (!lprc) return FALSE;
 
     TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top);
@@ -5526 +5604 @@
         return LISTVIEW_GetItemRect(infoPtr, nItem, lprc);
 
+    if ((infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) return FALSE;
+
     if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE;
 
-    lvItem.mask = lprc->top == 0 ? LVIF_INDENT : 0;
+    lvItem.mask = 0;
     lvItem.iItem = nItem;
     lvItem.iSubItem = lprc->top;
-
+    
     if (lvItem.mask && !LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE;
     switch(lprc->left)
@@ -5578 +5658 @@
     lvItem.cchTextMax = DISP_TEXT_SIZE;
     if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return 0;
-
+  
     return LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE);
 }
@@ -5702 +5782 @@
       uMask |= LVIS_SELECTED;
 
-    /* if we're asked for the focused item, that's only one,
+    /* if we're asked for the focused item, that's only one, 
      * so it's worth optimizing */
     if (uFlags & LVNI_FOCUSED)
@@ -5709 +5789 @@
         return (infoPtr->nFocusedItem == nItem) ? -1 : infoPtr->nFocusedItem;
     }
-
+    
     if (uFlags & LVNI_ABOVE)
     {
@@ -5886 +5966 @@
     SCROLLINFO scrollInfo;
 
-    scrollInfo.cbSize = sizeof(SCROLLINFO);
+    scrollInfo.cbSize = sizeof(SCROLLINFO);    
     scrollInfo.fMask = SIF_POS;
-
+    
     if ((infoPtr->dwStyle & WS_HSCROLL) && GetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo))
         nHorzPos = scrollInfo.nPos;
@@ -5902 +5982 @@
     else if (uView == LVS_REPORT)
         nVertPos *= infoPtr->nItemHeight;
-
+    
     lpptOrigin->x -= nHorzPos;
     lpptOrigin->y -= nVertPos;
@@ -5925 +6005 @@
 {
     SIZE stringSize;
-
-    stringSize.cx = 0;
+    
+    stringSize.cx = 0;    
     if (is_textT(lpszText, isW))
     {
@@ -5939 +6019 @@
         SelectObject(hdc, hOldFont);
         ReleaseDC(infoPtr->hwndSelf, hdc);
+
 #ifdef __WIN32OS2__
         if(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) {
-        /* Get item width */
-
-        MEASUREITEMSTRUCT mis;
-        UINT             id = GetWindowLongA(infoPtr->hwndSelf,GWL_ID);
-        mis.CtlType    = ODT_LISTVIEW;
-        mis.CtlID      = id;
-        mis.itemID     = 0;
-        mis.itemData   = 0;     //TODO:!!!!
-        mis.itemHeight = 0;
-        mis.itemWidth  = 0;
-        if (isW)
-         SendMessageW(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
-        else
-         SendMessageA(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
-        stringSize.cx  = (mis.itemWidth) ? mis.itemWidth : infoPtr->nItemWidth;
-    }
+            /* Get item width */
+
+            MEASUREITEMSTRUCT mis;
+            UINT             id = GetWindowLongA(infoPtr->hwndSelf,GWL_ID);
+            mis.CtlType    = ODT_LISTVIEW;
+            mis.CtlID      = id;
+            mis.itemID     = 0;
+            mis.itemData   = 0;     //TODO:!!!!
+            mis.itemHeight = 0;
+            mis.itemWidth  = 0;
+            if (isW)
+             SendMessageW(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
+            else
+             SendMessageA(GetParent(infoPtr->hwndSelf), WM_MEASUREITEM, id, (LPARAM)&mis );
+            stringSize.cx  = (mis.itemWidth) ? mis.itemWidth : infoPtr->nItemWidth;
+        }
 #endif
     }
@@ -5976 +6057 @@
  * an app might pass only a structure with space up to iItem!
  * (MS Office 97 does that for instance in the file open dialog)
- *
+ * 
  * RETURN:
  *   SUCCESS : item index
@@ -5989 +6070 @@
     LVITEMW lvItem;
     ITERATOR i;
-
+    INT iItem;
+    
     TRACE("(pt=%s, subitem=%d, select=%d)\n", debugpoint(&lpht->pt), subitem, select);
-
+    
     lpht->flags = 0;
     lpht->iItem = -1;
@@ -6000 +6082 @@
     else if (infoPtr->rcList.right < lpht->pt.x)
         lpht->flags |= LVHT_TORIGHT;
-
+    
     if (infoPtr->rcList.top > lpht->pt.y)
         lpht->flags |= LVHT_ABOVE;
@@ -6012 +6094 @@
 
     LISTVIEW_GetOrigin(infoPtr, &Origin);
-
+   
     /* first deal with the large items */
     rcSearch.left = lpht->pt.x;
@@ -6018 +6100 @@
     rcSearch.right = rcSearch.left + 1;
     rcSearch.bottom = rcSearch.top + 1;
-
+    
     iterator_frameditems(&i, infoPtr, &rcSearch);
     iterator_next(&i); /* go to first item in the sequence */
-    lpht->iItem = i.nItem;
+    iItem = i.nItem;
     iterator_destroy(&i);
-
-    TRACE("lpht->iItem=%d\n", lpht->iItem);
-    if (lpht->iItem == -1) return -1;
+   
+    TRACE("lpht->iItem=%d\n", iItem); 
+    if (iItem == -1) return -1;
 
     lvItem.mask = LVIF_STATE | LVIF_TEXT;
@@ -6031 +6113 @@
     lvItem.stateMask = LVIS_STATEIMAGEMASK;
     if (uView == LVS_ICON) lvItem.stateMask |= LVIS_FOCUSED;
-    lvItem.iItem = lpht->iItem;
+    lvItem.iItem = iItem;
     lvItem.iSubItem = 0;
     lvItem.pszText = szDispText;
     lvItem.cchTextMax = DISP_TEXT_SIZE;
     if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return -1;
-    if (!infoPtr->bFocus) lvItem.state &= ~LVIS_FOCUSED;
-
+    if (!infoPtr->bFocus) lvItem.state &= ~LVIS_FOCUSED; 
+    
     LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcState, &rcIcon, &rcLabel);
-    LISTVIEW_GetItemOrigin(infoPtr, lpht->iItem, &Position);
+    LISTVIEW_GetItemOrigin(infoPtr, iItem, &Position);
     opt.x = lpht->pt.x - Position.x - Origin.x;
     opt.y = lpht->pt.y - Position.y - Origin.y;
-
-    if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
+    
+    if (uView == LVS_REPORT)
         rcBounds = rcBox;
     else
@@ -6058 +6140 @@
     if (lpht->flags & LVHT_ONITEM)
         lpht->flags &= ~LVHT_NOWHERE;
-
-    TRACE("lpht->flags=0x%x\n", lpht->flags);
-    if (uView == LVS_REPORT && lpht->iItem != -1 && subitem)
+   
+    TRACE("lpht->flags=0x%x\n", lpht->flags); 
+    if (uView == LVS_REPORT && subitem)
     {
         INT j;
 
         rcBounds.right = rcBounds.left;
-        for (j = 0; j < infoPtr->hdpaColumns->nItemCount; j++)
+        for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++)
         {
             rcBounds.left = rcBounds.right;
@@ -6077 +6159 @@
     }
 
-    if (!select || lpht->iItem == -1) return lpht->iItem;
-
-    if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) return lpht->iItem;
-
-    if (uView == LVS_REPORT) UnionRect(&rcBounds, &rcIcon, &rcLabel);
-    return PtInRect(&rcBounds, opt) ? lpht->iItem : -1;
+    if (select && !(uView == LVS_REPORT &&
+                    ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) ||
+                     (infoPtr->dwStyle & LVS_OWNERDRAWFIXED))))
+    {
+        if (uView == LVS_REPORT)
+        {
+            UnionRect(&rcBounds, &rcIcon, &rcLabel);
+            UnionRect(&rcBounds, &rcBounds, &rcState);
+        }
+        if (!PtInRect(&rcBounds, opt)) iItem = -1;
+    }
+    return lpht->iItem = iItem;
 }
 
@@ -6106 +6194 @@
     ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 );
     ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 );
-    INT cmpv = textcmpWT(lv_first->hdr.pszText, lv_second->hdr.pszText, TRUE);
+    INT cmpv = textcmpWT(lv_first->hdr.pszText, lv_second->hdr.pszText, TRUE); 
 
     /* if we're sorting descending, negate the return value */
@@ -6144 +6232 @@
     if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return -1;
 
-    if ( !(lpItem = (ITEM_INFO *)COMCTL32_Alloc(sizeof(ITEM_INFO))) )
+    if ( !(lpItem = (ITEM_INFO *)Alloc(sizeof(ITEM_INFO))) )
         return -1;
-
+    
     /* insert item in listview control data structure */
     if ( !(hdpaSubItems = DPA_Create(8)) ) goto fail;
@@ -6159 +6247 @@
     if (nItem == -1) goto fail;
     infoPtr->nItemCount++;
+
+    /* shift indices first so they don't get tangled */
+    LISTVIEW_ShiftIndices(infoPtr, nItem, 1);
 
     /* set the item attributes */
@@ -6199 +6290 @@
         }
     }
-
-    /* Add the subitem list to the items array. Do this last in case we go to
-     * fail during the above.
-     */
-    LISTVIEW_ShiftIndices(infoPtr, nItem, 1);
-
+    
     /* send LVN_INSERTITEM notification */
     ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
@@ -6229 +6315 @@
 
 undo:
+    LISTVIEW_ShiftIndices(infoPtr, nItem, -1);
     DPA_DeletePtr(infoPtr->hdpaItems, nItem);
     infoPtr->nItemCount--;
@@ -6234 +6321 @@
     DPA_DeletePtr(hdpaSubItems, 0);
     DPA_Destroy (hdpaSubItems);
-    COMCTL32_Free (lpItem);
+    Free (lpItem);
     return -1;
 }
@@ -6254 +6341 @@
 {
     INT i;
-
-    if (nLast < nFirst || min(nFirst, nLast) < 0 ||
+ 
+    if (nLast < nFirst || min(nFirst, nLast) < 0 || 
         max(nFirst, nLast) >= infoPtr->nItemCount)
         return FALSE;
-
+    
     for (i = nFirst; i <= nLast; i++)
         LISTVIEW_InvalidateItem(infoPtr, i);
@@ -6315 +6402 @@
     if (dx != 0) LISTVIEW_HScroll(infoPtr, SB_INTERNAL, dx, 0);
     if (dy != 0) LISTVIEW_VScroll(infoPtr, SB_INTERNAL, dy, 0);
-
+  
     return TRUE;
 }
@@ -6447 +6534 @@
 
     if (!lpColumn || nColumn < 0) return -1;
-    nColumn = min(nColumn, infoPtr->hdpaColumns->nItemCount);
-
+    nColumn = min(nColumn, DPA_GetPtrCount(infoPtr->hdpaColumns));
+    
     ZeroMemory(&hdi, sizeof(HDITEMW));
     column_fill_hditem(infoPtr, &hdi, nColumn, lpColumn, isW);
 
     /* insert item in header control */
-    nNewColumn = SendMessageW(infoPtr->hwndHeader,
+    nNewColumn = SendMessageW(infoPtr->hwndHeader, 
                               isW ? HDM_INSERTITEMW : HDM_INSERTITEMA,
                               (WPARAM)nColumn, (LPARAM)&hdi);
     if (nNewColumn == -1) return -1;
     if (nNewColumn != nColumn) ERR("nColumn=%d, nNewColumn=%d\n", nColumn, nNewColumn);
-
-    /* create our own column info */
-    if (!(lpColumnInfo = COMCTL32_Alloc(sizeof(COLUMN_INFO)))) goto fail;
+   
+    /* create our own column info */ 
+    if (!(lpColumnInfo = Alloc(sizeof(COLUMN_INFO)))) goto fail;
     if (DPA_InsertPtr(infoPtr->hdpaColumns, nNewColumn, lpColumnInfo) == -1) goto fail;
 
@@ -6469 +6556 @@
     if (!(infoPtr->dwStyle & LVS_OWNERDATA) && infoPtr->nItemCount > 0)
     {
-        SUBITEM_INFO *lpSubItem, *lpMainItem, **lpNewItems = 0;
+        SUBITEM_INFO *lpSubItem;
         HDPA hdpaSubItems;
         INT nItem, i;
-        
-        /* preallocate memory, so we can fail gracefully */
-        if (nNewColumn == 0)
-        {
-            lpNewItems = COMCTL32_Alloc(sizeof(SUBITEM_INFO *) * infoPtr->nItemCount);
-            if (!lpNewItems) goto fail;
-            for (i = 0; i < infoPtr->nItemCount; i++)
-                if (!(lpNewItems[i] = COMCTL32_Alloc(sizeof(SUBITEM_INFO)))) break;
-            if (i != infoPtr->nItemCount)
-            {
-                for(; i >=0; i--) COMCTL32_Free(lpNewItems[i]);
-                COMCTL32_Free(lpNewItems);
-                goto fail;
-            }
-        }
         
         for (nItem = 0; nItem < infoPtr->nItemCount; nItem++)
         {
             hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem);
-            for (i = 1; i < hdpaSubItems->nItemCount; i++)
+            for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++)
             {
                 lpSubItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, i);
@@ -6497 +6569 @@
                     lpSubItem->iSubItem++;
             }
-
-            /* for inserting column 0, we have to special-case the main item */ 
-            if (nNewColumn == 0)
-            {
-                lpMainItem = (SUBITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0);
-                lpSubItem = lpNewItems[nItem];
-                lpSubItem->hdr = lpMainItem->hdr;
-                lpSubItem->iSubItem = 1;
-                ZeroMemory(&lpMainItem->hdr, sizeof(lpMainItem->hdr));
-                lpMainItem->iSubItem = 0;
-                DPA_InsertPtr(hdpaSubItems, 1, lpSubItem);
-            }
         }
-
-        COMCTL32_Free(lpNewItems);
     }
 
     /* make space for the new column */
     LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left);
-
+    
     return nNewColumn;
 
@@ -6524 +6582 @@
     {
         DPA_DeletePtr(infoPtr->hdpaColumns, nNewColumn);
-        COMCTL32_Free(lpColumnInfo);
+        Free(lpColumnInfo);
     }
     return -1;
@@ -6550 +6608 @@
 
     TRACE("(nColumn=%d, lpColumn=%s, isW=%d)\n", nColumn, debuglvcolumn_t(lpColumn, isW), isW);
-
-    if (!lpColumn || nColumn < 0 || nColumn >= infoPtr->hdpaColumns->nItemCount) return FALSE;
+    
+    if (!lpColumn || nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE;
 
     ZeroMemory(&hdi, sizeof(HDITEMW));
@@ -6637 +6695 @@
 
     /* resize all columns if in LVS_LIST mode */
-    if(uView == LVS_LIST)
+    if(uView == LVS_LIST) 
     {
         infoPtr->nItemWidth = cx;
@@ -6644 +6702 @@
     }
 
-    if (nColumn < 0 || nColumn >= infoPtr->hdpaColumns->nItemCount) return FALSE;
-
-    if (cx == LVSCW_AUTOSIZE || (cx == LVSCW_AUTOSIZE_USEHEADER && nColumn < infoPtr->hdpaColumns->nItemCount -1))
+    if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE;
+
+    if (cx == LVSCW_AUTOSIZE || (cx == LVSCW_AUTOSIZE_USEHEADER && nColumn < DPA_GetPtrCount(infoPtr->hdpaColumns) -1))
     {
         INT nLabelWidth;
@@ -6673 +6731 @@
     {
         /* if iCol is the last column make it fill the remainder of the controls width */
-        if(nColumn == infoPtr->hdpaColumns->nItemCount - 1)
+        if(nColumn == DPA_GetPtrCount(infoPtr->hdpaColumns) - 1) 
         {
             RECT rcHeader;
@@ -6722 +6780 @@
 
 /***
+ * Creates the checkbox imagelist.  Helper for LISTVIEW_SetExtendedListViewStyle
+ *
+ */
+static HIMAGELIST LISTVIEW_CreateCheckBoxIL(LISTVIEW_INFO *infoPtr)
+{
+    HDC hdc_wnd, hdc;
+    HBITMAP hbm_im, hbm_mask, hbm_orig;
+    RECT rc;
+    HBRUSH hbr_white = GetStockObject(WHITE_BRUSH);
+    HBRUSH hbr_black = GetStockObject(BLACK_BRUSH);
+    HIMAGELIST himl;
+
+    himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
+                            ILC_COLOR | ILC_MASK, 2, 2);
+    hdc_wnd = GetDC(infoPtr->hwndSelf);
+    hdc = CreateCompatibleDC(hdc_wnd);
+    hbm_im = CreateCompatibleBitmap(hdc_wnd, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
+    hbm_mask = CreateBitmap(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 1, 1, NULL);
+    ReleaseDC(infoPtr->hwndSelf, hdc_wnd);
+
+    rc.left = rc.top = 0;
+    rc.right = GetSystemMetrics(SM_CXSMICON);
+    rc.bottom = GetSystemMetrics(SM_CYSMICON);
+
+    hbm_orig = SelectObject(hdc, hbm_mask);
+    FillRect(hdc, &rc, hbr_white);
+    InflateRect(&rc, -3, -3);
+    FillRect(hdc, &rc, hbr_black);
+
+    SelectObject(hdc, hbm_im);
+    DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO);
+    SelectObject(hdc, hbm_orig);
+    ImageList_Add(himl, hbm_im, hbm_mask); 
+
+    SelectObject(hdc, hbm_im);
+    DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO | DFCS_CHECKED);
+    SelectObject(hdc, hbm_orig);
+    ImageList_Add(himl, hbm_im, hbm_mask);
+
+    DeleteObject(hbm_mask);
+    DeleteObject(hbm_im);
+    DeleteDC(hdc);
+
+    return himl;
+}
+
+/***
  * DESCRIPTION:
  * Sets the extended listview style.
@@ -6744 +6849 @@
         infoPtr->dwLvExStyle = dwStyle;
 
+    if((infoPtr->dwLvExStyle ^ dwOldStyle) & LVS_EX_CHECKBOXES)
+    {
+        HIMAGELIST himl = 0;
+        if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
+            himl = LISTVIEW_CreateCheckBoxIL(infoPtr);
+        LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl);
+    }
+
     return dwOldStyle;
 }
@@ -6761 +6874 @@
 {
     HCURSOR oldCursor = infoPtr->hHotCursor;
-
+    
     infoPtr->hHotCursor = hCursor;
 
@@ -6783 +6896 @@
 {
     INT iOldIndex = infoPtr->nHotItem;
-
+    
     infoPtr->nHotItem = iIndex;
-
+    
     return iOldIndex;
 }
@@ -6804 +6917 @@
 {
     DWORD oldHoverTime = infoPtr->dwHoverTime;
-
+    
     infoPtr->dwHoverTime = dwHoverTime;
-
+    
     return oldHoverTime;
 }
@@ -6828 +6941 @@
 
     TRACE("requested=(%d,%d)\n", cx, cy);
-
+    
     /* this is supported only for LVS_ICON style */
     if (uView != LVS_ICON) return oldspacing;
-
+  
     /* set to defaults, if instructed to */
     if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING);
@@ -6843 +6956 @@
 
     /* if 0 then compute height */
-    if (cy == 0)
+    if (cy == 0) 
         cy = infoPtr->iconSize.cy + 2 * infoPtr->ntmHeight +
              ICON_BOTTOM_PADDING + ICON_TOP_PADDING + LABEL_VERT_PADDING;
-
+    
 
     infoPtr->iconSpacing.cx = cx;
@@ -6852 +6965 @@
 
     TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%ld,%ld), ntmH=%d\n",
-          LOWORD(oldspacing), HIWORD(oldspacing), cx, cy,
+          LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, 
           infoPtr->iconSize.cx, infoPtr->iconSize.cy,
           infoPtr->ntmHeight);
@@ -6865 +6978 @@
 {
     INT cx, cy;
-
+    
     if (himl && ImageList_GetIconSize(himl, &cx, &cy))
     {
@@ -6982 +7095 @@
             POINT Origin;
             RECT rcErase;
-        
+            
             LISTVIEW_GetOrigin(infoPtr, &Origin);
             nFrom = min(nOldCount, nItems);
             nTo = max(nOldCount, nItems);
-
+    
             if (uView == LVS_REPORT)
             {
@@ -7059 +7172 @@
 
     /* This point value seems to be an undocumented feature.
-     * The best guess is that it means either at the origin,
+     * The best guess is that it means either at the origin, 
      * or at true beginning of the list. I will assume the origin. */
     if ((pt.x == -1) && (pt.y == -1))
         pt = Origin;
-
+    
     if (uView == LVS_ICON)
     {
@@ -7111 +7224 @@
         bResult = LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE);
 
+    /*
+     *update selection mark
+     *
+     * Investigation on windows 2k showed that selection mark was updated
+     * whenever a new selection was made, but if the selected item was
+     * unselected it was not updated.
+     *
+     * we are probably still not 100% accurate, but this at least sets the
+     * proper selection mark when it is needed
+     */
+
+    if (bResult && (lvItem.state & lvItem.stateMask & LVIS_SELECTED) &&
+        ((infoPtr->nSelectionMark == -1) || (lvItem.iItem <= infoPtr->nSelectionMark)))
+    {
+        int i;
+        infoPtr->nSelectionMark = -1;
+        for (i = 0; i < infoPtr->nItemCount; i++)
+        {
+            if (infoPtr->uCallbackMask & LVIS_SELECTED)
+            {
+                if (LISTVIEW_GetItemState(infoPtr, i, LVIS_SELECTED))
+                {
+                    infoPtr->nSelectionMark = i;
+                    break;
+                }
+            }
+            else if (ranges_contain(infoPtr->selectionRanges, i))
+            {
+                infoPtr->nSelectionMark = i;
+                break;
+            }
+        }
+    }
+
     return bResult;
 }
@@ -7133 +7280 @@
 
     if (nItem < 0 && nItem >= infoPtr->nItemCount) return FALSE;
-
+    
     lvItem.iItem = nItem;
     lvItem.iSubItem = lpLVItem->iSubItem;
@@ -7139 +7286 @@
     lvItem.pszText = lpLVItem->pszText;
     lvItem.cchTextMax = lpLVItem->cchTextMax;
-
+    
     TRACE("(nItem=%d, lpLVItem=%s, isW=%d)\n", nItem, debuglvitem_t(&lvItem, isW), isW);
 
-    return LISTVIEW_SetItemT(infoPtr, &lvItem, isW);
+    return LISTVIEW_SetItemT(infoPtr, &lvItem, isW); 
 }
 
@@ -7188 +7335 @@
         LISTVIEW_InvalidateList(infoPtr);
     }
-
+    
   return TRUE;
 }
@@ -7254 +7401 @@
 static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW((HWND)lParam, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam;
   ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 );
   ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 );
@@ -7302 +7449 @@
     /*        clear the lpItem->state for non-selected ones */
     /*        remove the selection ranges */
-
+    
     infoPtr->pfnCompare = pfnCompare;
     infoPtr->lParamSort = lParamSort;
-    DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr->hwndSelf);
+    DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr);
 
     /* Adjust selections and indices so that they are the way they should
@@ -7390 +7537 @@
 
   /* initialize info pointer */
-  infoPtr = (LISTVIEW_INFO *)COMCTL32_Alloc(sizeof(LISTVIEW_INFO));
+  infoPtr = (LISTVIEW_INFO *)Alloc(sizeof(LISTVIEW_INFO));
   if (!infoPtr) return -1;
 
@@ -7398 +7545 @@
   infoPtr->dwStyle = lpcs->style;
   /* determine the type of structures to use */
-  infoPtr->notifyFormat = SendMessageW(GetParent(infoPtr->hwndSelf), WM_NOTIFYFORMAT,
+  infoPtr->hwndNotify = lpcs->hwndParent;
+  infoPtr->notifyFormat = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT,
                                        (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY);
 
@@ -7412 +7560 @@
   infoPtr->nHotItem = -1;
   infoPtr->bRedraw = TRUE;
-  infoPtr->bFirstPaint = TRUE;
   infoPtr->bNoItemMetrics = TRUE;
   infoPtr->bDoChangeNotify = TRUE;
@@ -7452 +7599 @@
   /* init item size to avoid division by 0 */
   LISTVIEW_UpdateItemSize (infoPtr);
-
+  
   if (uView == LVS_REPORT)
   {
@@ -7476 +7623 @@
     DPA_Destroy(infoPtr->hdpaPosY);
     DPA_Destroy(infoPtr->hdpaColumns);
-    COMCTL32_Free(infoPtr);
+    Free(infoPtr);
     return -1;
 }
@@ -7517 +7664 @@
 {
     /* now we can scroll the list */
-    ScrollWindowEx(infoPtr->hwndSelf, dx, dy, &infoPtr->rcList,
+    ScrollWindowEx(infoPtr->hwndSelf, dx, dy, &infoPtr->rcList, 
                    &infoPtr->rcList, 0, 0, SW_ERASE | SW_INVALIDATE);
     /* if we have focus, adjust rect */
@@ -7544 +7691 @@
  *
  */
-static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode,
+static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, 
                                 INT nScrollDiff, HWND hScrollWnd)
 {
@@ -7552 +7699 @@
     BOOL is_an_icon;
 
-    TRACE("(nScrollCode=%d(%s), nScrollDiff=%d)\n", nScrollCode,
+    TRACE("(nScrollCode=%d(%s), nScrollDiff=%d)\n", nScrollCode, 
         debugscrollcode(nScrollCode), nScrollDiff);
 
@@ -7597 +7744 @@
     /* quit right away if pos isn't changing */
     if (nScrollDiff == 0) return 0;
-
+    
     /* calculate new position, and handle overflows */
     nNewScrollPos = scrollInfo.nPos + nScrollDiff;
@@ -7614 +7761 @@
     scrollInfo.nPos = nNewScrollPos;
     nNewScrollPos = SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &scrollInfo, TRUE);
-
+    
     /* carry on only if it really changed */
     if (nNewScrollPos == nOldScrollPos) return 0;
-
+    
     /* now adjust to client coordinates */
     nScrollDiff = nOldScrollPos - nNewScrollPos;
     if (uView == LVS_REPORT) nScrollDiff *= infoPtr->nItemHeight;
-
-    /* and scroll the window */
+   
+    /* and scroll the window */ 
     scroll_list(infoPtr, 0, nScrollDiff);
 
@@ -7656 +7803 @@
     SCROLLINFO scrollInfo;
 
-    TRACE("(nScrollCode=%d(%s), nScrollDiff=%d)\n", nScrollCode,
+    TRACE("(nScrollCode=%d(%s), nScrollDiff=%d)\n", nScrollCode, 
         debugscrollcode(nScrollCode), nScrollDiff);
 
@@ -7700 +7847 @@
     /* quit right away if pos isn't changing */
     if (nScrollDiff == 0) return 0;
-
+    
     /* calculate new position, and handle overflows */
     nNewScrollPos = scrollInfo.nPos + nScrollDiff;
@@ -7717 +7864 @@
     scrollInfo.nPos = nNewScrollPos;
     nNewScrollPos = SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo, TRUE);
-
+    
     /* carry on only if it really changed */
     if (nNewScrollPos == nOldScrollPos) return 0;
-
+    
     if(uView == LVS_REPORT)
         LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos);
-
+      
     /* now adjust to client coordinates */
     nScrollDiff = nOldScrollPos - nNewScrollPos;
     if (uView == LVS_LIST) nScrollDiff *= infoPtr->nItemWidth;
-
+   
     /* and scroll the window */
     scroll_list(infoPtr, nScrollDiff, 0);
@@ -7884 +8031 @@
     /* if we did not have the focus, there's nothing to do */
     if (!infoPtr->bFocus) return 0;
-
+   
     /* send NM_KILLFOCUS notification */
     notify(infoPtr, NM_KILLFOCUS);
@@ -7890 +8037 @@
     /* if we have a focus rectagle, get rid of it */
     LISTVIEW_ShowFocusRect(infoPtr, FALSE);
-
+    
     /* set window focus flag */
     infoPtr->bFocus = FALSE;
@@ -7896 +8043 @@
     /* invalidate the selected items before reseting focus flag */
     LISTVIEW_InvalidateSelectedItems(infoPtr);
-
+    
     return 0;
 }
@@ -7991 +8138 @@
 
     /* To send the LVN_ITEMACTIVATE, it must be on an Item */
-    if(htInfo.iItem != -1) notify(infoPtr, LVN_ITEMACTIVATE);
+    if(htInfo.iItem != -1) notify_itemactivate(infoPtr,&htInfo);
 
     return 0;
@@ -8122 +8269 @@
 #ifdef __WIN32OS2__
   //SvL: Send WM_COMMAND as well. (also done by NT's comctl32)
-  SendMessageA(GetParent(infoPtr->hwndSelf), WM_COMMAND, (1<<16) | GetWindowLongW(infoPtr->hwndSelf, GWL_ID), infoPtr->hwndSelf);
+  SendMessageA(infoPtr->hwndNotify, WM_COMMAND, (1<<16) | GetWindowLongW(infoPtr->hwndSelf, GWL_ID), infoPtr->hwndSelf);
 #endif
-
   return 0;
 }
@@ -8143 +8289 @@
 {
     LVHITTESTINFO lvHitTestInfo;
-
+    
     TRACE("(key=%hu, X=%hu, Y=%hu)\n", wKey, pts.x, pts.y);
 
@@ -8208 +8354 @@
 
   /* free listview info pointer*/
-  COMCTL32_Free(infoPtr);
+  Free(infoPtr);
 
   return 0;
@@ -8228 +8374 @@
 {
     UINT uView =  infoPtr->dwStyle & LVS_TYPEMASK;
-
+    
     TRACE("(lpnmh=%p)\n", lpnmh);
 
-    if (!lpnmh || lpnmh->iItem < 0 || lpnmh->iItem >= infoPtr->hdpaColumns->nItemCount) return 0;
-
+    if (!lpnmh || lpnmh->iItem < 0 || lpnmh->iItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0;
+    
     switch (lpnmh->hdr.code)
-    {
+    {    
         case HDN_TRACKW:
         case HDN_TRACKA:
@@ -8246 +8392 @@
             {
                 HDITEMW hdi;
-
+    
                 hdi.mask = HDI_WIDTH;
                 if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, (LPARAM)&hdi)) return 0;
@@ -8253 +8399 @@
             else
                 cxy = lpnmh->pitem->cxy;
-        
+            
             /* determine how much we change since the last know position */
             lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, lpnmh->iItem);
@@ -8313 +8459 @@
 
     if (nCommand != NF_REQUERY) return 0;
-
+    
     infoPtr->notifyFormat = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY);
-
+    
     return 0;
 }
@@ -8334 +8480 @@
     TRACE("(hdc=%p)\n", hdc);
 
-    infoPtr->bFirstPaint = FALSE;
     if (infoPtr->bNoItemMetrics && infoPtr->nItemCount)
     {
@@ -8345 +8490 @@
         LISTVIEW_UpdateScroll(infoPtr);
     }
-    if (hdc)
+    if (hdc) 
         LISTVIEW_Refresh(infoPtr, hdc);
     else
@@ -8376 +8521 @@
 {
     LVHITTESTINFO lvHitTestInfo;
-
+    
     TRACE("(key=%hu,X=%hu,Y=%hu)\n", wKey, pts.x, pts.y);
 
@@ -8423 +8568 @@
     lvHitTestInfo.pt.y = pts.y;
     nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
-
+  
     if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
     {
@@ -8459 +8604 @@
 
     if (!infoPtr->bRButtonDown) return 0;
-
+ 
     /* set button flag */
     infoPtr->bRButtonDown = FALSE;
@@ -8528 +8673 @@
     /* if we have the focus already, there's nothing to do */
     if (infoPtr->bFocus) return 0;
-
+   
     /* send NM_SETFOCUS notification */
     notify(infoPtr, NM_SETFOCUS);
@@ -8564 +8709 @@
     infoPtr->hFont = hFont ? hFont : infoPtr->hDefaultFont;
     if (infoPtr->hFont == oldFont) return 0;
-
+    
     LISTVIEW_SaveTextMetrics(infoPtr);
 
@@ -8597 +8742 @@
 
     if(!bRedraw) return 0;
-
+    
     if (is_autoarrange(infoPtr))
         LISTVIEW_Arrange(infoPtr, LVA_DEFAULT);
@@ -8630 +8775 @@
     LISTVIEW_UpdateSize(infoPtr);
     if (EqualRect(&rcOld, &infoPtr->rcList)) return 0;
-
-    /* do not bother with display related stuff if we're not redrawing */
+  
+    /* do not bother with display related stuff if we're not redrawing */ 
     if (!is_redrawing(infoPtr)) return 0;
-
-    if (is_autoarrange(infoPtr))
+    
+    if (is_autoarrange(infoPtr)) 
         LISTVIEW_Arrange(infoPtr, LVA_DEFAULT);
 
@@ -8640 +8785 @@
 
     /* refresh all only for lists whose height changed significantly */
-    if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_LIST &&
+    if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_LIST && 
         (rcOld.bottom - rcOld.top) / infoPtr->nItemHeight !=
         (infoPtr->rcList.bottom - infoPtr->rcList.top) / infoPtr->nItemHeight)
@@ -8663 +8808 @@
 
     TRACE("uView=%d, rcList(old)=%s\n", uView, debugrect(&infoPtr->rcList));
-
+    
     GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList);
 
@@ -8718 +8863 @@
 
     if (wStyleType != GWL_STYLE) return 0;
-
+  
     /* FIXME: if LVS_NOSORTHEADER changed, update header */
     /*        what if LVS_OWNERDATA changed? */
@@ -8738 +8883 @@
         SIZE oldIconSize = infoPtr->iconSize;
         HIMAGELIST himl;
-
+    
         SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
         ShowWindow(infoPtr->hwndHeader, SW_HIDE);
@@ -8747 +8892 @@
         himl = (uNewView == LVS_ICON ? infoPtr->himlNormal : infoPtr->himlSmall);
         set_icon_size(&infoPtr->iconSize, himl, uNewView != LVS_ICON);
-
+    
         if (uNewView == LVS_ICON)
         {
@@ -8773 +8918 @@
     if (uNewView == LVS_REPORT)
         ShowWindow(infoPtr->hwndHeader, (lpss->styleNew & LVS_NOCOLUMNHEADER) ? SW_HIDE : SW_SHOWNORMAL);
-
+     
     if ( (uNewView == LVS_ICON || uNewView == LVS_SMALLICON) &&
          (uNewView != uOldView || ((lpss->styleNew ^ lpss->styleOld) & LVS_ALIGNMASK)) )
@@ -9085 +9230 @@
   TRACE("(uMsg=%x wParam=%x lParam=%lx)\n", uMsg, wParam, lParam);
 #endif
+
   if (!infoPtr && (uMsg != WM_CREATE))
     return DefWindowProcW(hwnd, uMsg, wParam, lParam);
@@ -9340 +9486 @@
 
   case LVM_SETCOLUMNWIDTH:
-    return LISTVIEW_SetColumnWidth(infoPtr, (INT)wParam, SLOWORD(lParam));
+    return LISTVIEW_SetColumnWidth(infoPtr, (INT)wParam, (short)LOWORD(lParam));
 
   case LVM_SETEXTENDEDLISTVIEWSTYLE:
@@ -9359 +9505 @@
 
   case LVM_SETICONSPACING:
-    return LISTVIEW_SetIconSpacing(infoPtr, SLOWORD(lParam), SHIWORD(lParam));
+    return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
 
   case LVM_SETIMAGELIST:
@@ -9381 +9527 @@
   case LVM_SETITEMPOSITION:
     {
-        POINT pt = { SLOWORD(lParam), SHIWORD(lParam) };
+        POINT pt;
+        pt.x = (short)LOWORD(lParam);
+        pt.y = (short)HIWORD(lParam);
         return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, pt);
     }
@@ -9519 +9667 @@
 
   case WM_SIZE:
-    return LISTVIEW_Size(infoPtr, (int)SLOWORD(lParam), (int)SHIWORD(lParam));
+    return LISTVIEW_Size(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
 
   case WM_STYLECHANGED:
@@ -9539 +9687 @@
 
   case WM_WINDOWPOSCHANGED:
-      if (!(((WINDOWPOS *)lParam)->flags & SWP_NOSIZE))
+      if (!(((WINDOWPOS *)lParam)->flags & SWP_NOSIZE)) 
       {
           SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE |
@@ -9581 +9729 @@
     wndClass.cbClsExtra = 0;
     wndClass.cbWndExtra = sizeof(LISTVIEW_INFO *);
-    wndClass.hCursor = LoadCursorW(0, IDC_ARROWW);
+    wndClass.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROWW);
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_LISTVIEWW;
@@ -9667 +9815 @@
 
         default:
-          return SendMessageW (GetParent (infoPtr->hwndSelf), WM_COMMAND, wParam, lParam);
+          return SendMessageW (infoPtr->hwndNotify, WM_COMMAND, wParam, lParam);
     }
 
@@ -9737 +9885 @@
             if (len)
             {
-                if ( (buffer = COMCTL32_Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR)))) )
+                if ( (buffer = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR)))) )
                 {
                     if (isW) GetWindowTextW(hwnd, buffer, len+1);
@@ -9746 +9894 @@
         LISTVIEW_EndEditLabelT(infoPtr, buffer, isW);
 
-        if (buffer) COMCTL32_Free(buffer);
+        if (buffer) Free(buffer);
 
     }
@@ -9820 +9968 @@
         hOldFont = SelectObject(hdc, infoPtr->hFont);
 
-    /*Get String Lenght in pixels */
+    /*Get String Length in pixels */
     GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz);