Changeset 3182 for trunk/src

Timestamp:

Mar 21, 2000, 6:30:46 PM (25 years ago)

Author:

cbratschi

Message:

bug fixes and improvements

Location:

trunk/src/comctl32

Files:

• CCBase.cpp (modified) (2 diffs)
• CCBase.h (modified) (2 diffs)
• comboex.cpp (modified) (11 diffs)
• draglist.cpp (modified) (4 diffs)
• flatsb.cpp (modified) (4 diffs)
• header.cpp (modified) (9 diffs)
• listview.cpp (modified) (157 diffs)
• nativefont.cpp (modified) (3 diffs)
• pager.cpp (modified) (5 diffs)
• rsrc.orc (modified) (2 diffs)
• toolbar.cpp (modified) (3 diffs)
• tooltips.cpp (modified) (7 diffs)
• treeview.cpp (modified) (67 diffs)

trunk/src/comctl32/CCBase.cpp

@@ -1 @@
-/* $Id: CCBase.cpp,v 1.4 2000-03-18 16:17:20 cbratschi Exp $ */
+/* $Id: CCBase.cpp,v 1.5 2000-03-21 17:30:40 cbratschi Exp $ */
 /*
  * COMCTL32 Base Functions and Macros for all Controls
@@ -251 +251 @@
   if (hwndToolTip) DestroyWindow(hwndToolTip);
 }
+
+//stub control
+
+VOID drawStubControl(HWND hwnd,HDC hdc)
+{
+  RECT rect;
+  HBRUSH brush = CreateSolidBrush(RGB(0,0,255));
+  HPEN pen = CreatePen(PS_SOLID,0,RGB(255,0,0)),oldPen;
+  COLORREF oldColor;
+
+  GetClientRect(hwnd,&rect);
+  FillRect(hdc,&rect,brush);
+  oldPen = SelectObject(hdc,pen);
+  MoveToEx(hdc,0,0,NULL);
+  LineTo(hdc,rect.right,rect.bottom);
+  MoveToEx(hdc,rect.right,0,NULL);
+  LineTo(hdc,0,rect.bottom);
+  SelectObject(hdc,oldPen);
+  oldColor = SetTextColor(hdc,RGB(255,255,255));
+  DrawTextA(hdc,"Unimplemented Control!",-1,&rect,DT_CENTER | DT_SINGLELINE | DT_VCENTER);
+  SetTextColor(hdc,oldColor);
+
+  DeleteObject(brush);
+  DeleteObject(pen);
+}

trunk/src/comctl32/CCBase.h

@@ -1 @@
-/* $Id: CCBase.h,v 1.5 2000-03-18 16:17:21 cbratschi Exp $ */
+/* $Id: CCBase.h,v 1.6 2000-03-21 17:30:40 cbratschi Exp $ */
 /*
  * COMCTL32 Base Functions and Macros for all Controls
@@ -42 +42 @@
 VOID destroyToolTip(HWND hwndToolTip);
 
+VOID drawStubControl(HWND hwnd,HDC hdc);
+
 #endif

trunk/src/comctl32/comboex.cpp

@@ -1 @@
-/* $Id: comboex.cpp,v 1.2 2000-02-25 17:00:15 cbratschi Exp $ */
+/* $Id: comboex.cpp,v 1.3 2000-03-21 17:30:40 cbratschi Exp $ */
 /*
  * ComboBoxEx control
@@ -39 +39 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-//    TRACE (comboex, "\n");
-
     return (LRESULT)infoPtr->hwndCombo;
 }
@@ -53 +51 @@
         return 0;
 
-//    TRACE (comboex, "-- 0x%x\n", GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT));
-
     return (LRESULT)GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT);
 }
@@ -73 +69 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-//    TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
-
     return (LRESULT)infoPtr->himl;
 }
@@ -81 +75 @@
 
 
-static LRESULT
-COMBOEX_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT COMBOEX_InsertItem(HWND hwnd,WPARAM wParam,LPARAM lParam,BOOL unicode)
 {
     /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); */
@@ -98 +91 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
     DWORD dwTemp;
-
-//    TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
 
     dwTemp = infoPtr->dwExtStyle;
@@ -121 +112 @@
     HIMAGELIST himlTemp;
 
-//    TRACE (comboex, "(0x%08x 0x%08lx)\n", wParam, lParam);
-
     himlTemp = infoPtr->himl;
     infoPtr->himl = (HIMAGELIST)lParam;
@@ -130 +119 @@
 
 
-static LRESULT
-COMBOEX_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT COMBOEX_SetItem(HWND hwnd,WPARAM wParam,LPARAM lParam,BOOL unicode)
 {
     /* COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); */
@@ -139 +127 @@
     return TRUE;
 }
-
-
-/* << COMBOEX_SetItem32W >> */
 
 
@@ -242 +227 @@
 /*      case CBEM_GETITEM32A:
         case CBEM_GETITEM32W:
-        case CBEM_GETUNICODEFORMAT:
         case CBEM_HASEDITCHANGED:
 */
 
         case CBEM_INSERTITEMA:
-            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
-
-/*      case CBEM_INSERTITEM32W: */
+            return COMBOEX_InsertItem(hwnd,wParam,lParam,FALSE);
+
+        case CBEM_INSERTITEMW:
+            return COMBOEX_InsertItem(hwnd,wParam,lParam,TRUE);
 
         case CBEM_SETEXTENDEDSTYLE:
@@ -258 +243 @@
 
         case CBEM_SETITEMA:
-            return COMBOEX_SetItemA (hwnd, wParam, lParam);
-
-/*      case CBEM_SETITEM32W:
-        case CBEM_SETUNICODEFORMAT:
-*/
+            return COMBOEX_SetItem(hwnd,wParam,lParam,FALSE);
+
+        case CBEM_SETITEMW:
+            return COMBOEX_SetItem(hwnd,wParam,lParam,TRUE);
 
         case CB_DELETESTRING:

trunk/src/comctl32/draglist.cpp

@@ +1 @@
+/* $Id: draglist.cpp,v 1.2 2000-03-21 17:30:41 cbratschi Exp $ */
 /*
  * Drag List control
@@ -23 +24 @@
 BOOL WINAPI MakeDragList (HWND hwndLB)
 {
-    dprintf(("COMCTL32: MakeDragList - empty stub!"));
+  dprintf(("COMCTL32: MakeDragList - empty stub!"));
 
-    return FALSE;
+  return FALSE;
 }
 
@@ -31 +32 @@
 VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
 {
-    dprintf(("COMCTL32: DrawInsert - empty stub!"));
+  dprintf(("COMCTL32: DrawInsert - empty stub!"));
 }
 
@@ -93 +94 @@
 {
 
-    return FALSE;
+  return FALSE;
 }

trunk/src/comctl32/flatsb.cpp

@@ -1 @@
-/* $Id: flatsb.cpp,v 1.2 2000-02-25 17:00:15 cbratschi Exp $ */
+/* $Id: flatsb.cpp,v 1.3 2000-03-21 17:30:41 cbratschi Exp $ */
 /*
  * Flat Scrollbar control
@@ -22 +22 @@
 #include "ccbase.h"
 #include "flatsb.h"
-
+#include <misc.h>
 
 #define FlatSB_GetInfoPtr(hwnd) ((FLATSB_INFO*)getInfoPtr(hwnd))
 
 
-BOOL WINAPI
-FlatSB_EnableScrollBar(HWND hwnd, INT dummy, UINT dummy2)
+BOOL WINAPI FlatSB_EnableScrollBar(HWND hwnd, INT dummy, UINT dummy2)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_EnableScrollBar - empty stub!!!"));
+
+  return 0;
 }
 
-BOOL WINAPI
-FlatSB_ShowScrollBar(HWND hwnd, INT code, BOOL flag)
+BOOL WINAPI FlatSB_ShowScrollBar(HWND hwnd, INT code, BOOL flag)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_ShowScrollBar - empty stub!!!"));
+
+  return 0;
 }
 
-BOOL WINAPI
-FlatSB_GetScrollRange(HWND hwnd, INT code, LPINT min, LPINT max)
+BOOL WINAPI FlatSB_GetScrollRange(HWND hwnd, INT code, LPINT min, LPINT max)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_GetScrollRange - empty stub!!!"));
+
+  return 0;
 }
 
-BOOL WINAPI
-FlatSB_GetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info)
+BOOL WINAPI FlatSB_GetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_GetScrollInfo - empty stub!!!"));
+
+  return 0;
 }
 
-INT WINAPI
-FlatSB_GetScrollPos(HWND hwnd, INT code)
+INT WINAPI FlatSB_GetScrollPos(HWND hwnd, INT code)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_GetScrollPos - empty stub!!!"));
+
+  return 0;
 }
 
-BOOL WINAPI
-FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
+BOOL WINAPI FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_GetScrollProp - empty stub!!!"));
+
+  return 0;
 }
 
 
-INT WINAPI
-FlatSB_SetScrollPos(HWND hwnd, INT code, INT pos, BOOL fRedraw)
+INT WINAPI FlatSB_SetScrollPos(HWND hwnd, INT code, INT pos, BOOL fRedraw)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_SetScrollPos - empty stub!!!"));
+
+  return 0;
 }
 
-INT WINAPI
-FlatSB_SetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info, BOOL fRedraw)
+INT WINAPI FlatSB_SetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info, BOOL fRedraw)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_EnableScrollBar - empty stub!!!"));
+
+  return 0;
 }
 
-INT WINAPI
-FlatSB_SetScrollRange(HWND hwnd, INT code, INT min, INT max, BOOL fRedraw)
+INT WINAPI FlatSB_SetScrollRange(HWND hwnd, INT code, INT min, INT max, BOOL fRedraw)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_SetScrollRange - empty stub!!!"));
+
+  return 0;
 }
 
-BOOL WINAPI
-FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
+BOOL WINAPI FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_SetScrollProp - empty stub!!!"));
+
+  return 0;
 }
 
@@ -101 +101 @@
 BOOL WINAPI InitializeFlatSB(HWND hwnd)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_InitializeFlatSB - empty stub!!!"));
+
+  return 0;
 }
 
 HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
 {
-//    FIXME_(commctrl)("stub\n");
-    return 0;
+  dprintf(("COMCTL32: FlatSB_UninitializeFlatSB - empty stub!!!"));
+
+  return 0;
 }
 
 
 
-static LRESULT
-FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT FLATSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    return 0;
+  return 0;
 }
 
-
-static LRESULT
-FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT FLATSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    return 0;
+  return 0;
 }
 
+static VOID FLATSB_Draw(HWND hwnd,HDC hdc,RECT *updateRect)
+{
+  drawStubControl(hwnd,hdc);
+}
 
+static LRESULT FLATSB_Paint(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  HDC hdc = (HDC)wParam;
 
+  if (!hdc)
+  {
+    PAINTSTRUCT ps;
 
-static LRESULT WINAPI
-FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+    hdc = BeginPaint(hwnd,&ps);
+    FLATSB_Draw(hwnd, hdc,&ps.rcPaint);
+    EndPaint(hwnd,&ps);
+  } else
+      FLATSB_Draw(hwnd,hdc,NULL);
+
+  return 0;
+}
+
+static LRESULT WINAPI FLATSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    switch (uMsg)
-    {
+  switch (uMsg)
+  {
+    case WM_CREATE:
+      return FLATSB_Create (hwnd, wParam, lParam);
 
-        case WM_CREATE:
-            return FlatSB_Create (hwnd, wParam, lParam);
+    case WM_DESTROY:
+      return FLATSB_Destroy (hwnd, wParam, lParam);
 
-        case WM_DESTROY:
-            return FlatSB_Destroy (hwnd, wParam, lParam);
+    case WM_PAINT:
+      return FLATSB_Paint(hwnd,wParam,lParam);
 
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR_(datetime)("unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
-    }
-    return 0;
+    default:
+      //if (uMsg >= WM_USER)
+      //    ERR_(datetime)("unknown msg %04x wp=%08x lp=%08lx\n",
+      //         uMsg, wParam, lParam);
+      return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
+  }
+  return 0;
 }
 
@@ -158 +177 @@
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
     wndClass.style         = CS_GLOBALCLASS;
-    wndClass.lpfnWndProc   = (WNDPROC)FlatSB_WindowProc;
+    wndClass.lpfnWndProc   = (WNDPROC)FLATSB_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(FLATSB_INFO *);

trunk/src/comctl32/header.cpp

@@ -1 @@
-/* $Id: header.cpp,v 1.3 2000-03-18 16:17:23 cbratschi Exp $ */
+/* $Id: header.cpp,v 1.4 2000-03-21 17:30:41 cbratschi Exp $ */
 /*
  *  Header control
@@ -252 +252 @@
     {
       UINT uTextJustify;
-      WCHAR* pszText = phdi->pszText;
+      WCHAR *pszText = phdi->pszText,*orgPtr;
 
       if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER)
@@ -269 +269 @@
         if (isUnicodeNotify(&infoPtr->header))
         {
-          nmhdr.pszText    = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(WCHAR));
+          orgPtr = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(WCHAR));
+          nmhdr.pszText    = orgPtr;
           if (nmhdr.pszText) nmhdr.pszText[0] = 0;
         } else
         {
-          nmhdr.pszText    = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(CHAR));
+          orgPtr = (WCHAR*)COMCTL32_Alloc(phdi->cchTextMax*sizeof(CHAR));
+          nmhdr.pszText    = orgPtr;
           if (nmhdr.pszText) ((LPSTR)nmhdr.pszText)[0] = 0;
         }
@@ -291 +293 @@
               lstrcpyW(phdi->pszText,pszText);
             } else phdi->pszText = NULL;
-            COMCTL32_Free(pszText);
+            if (pszText == orgPtr) COMCTL32_Free(pszText);
             pszText = phdi->pszText;
           } else
@@ -302 +304 @@
               lstrcpyAtoW(pszText,(LPSTR)nmhdr.pszText);
             } else pszText = NULL;
-            COMCTL32_Free(nmhdr.pszText);
-
-            if (nmhdr.mask & HDI_DI_SETITEM)
-              phdi->pszText = pszText;
+            if (nmhdr.pszText == orgPtr) COMCTL32_Free(nmhdr.pszText);
+
+            phdi->pszText = pszText;
           }
         }
@@ -329 +330 @@
         }
       }
-      if (phdi->pszText == LPSTR_TEXTCALLBACKW) COMCTL32_Free(pszText);
+      if ((phdi->pszText == LPSTR_TEXTCALLBACKW) && (pszText == orgPtr)) COMCTL32_Free(pszText);
     }
 
@@ -1642 +1643 @@
         HEADER_SendItemClick(hwnd,infoPtr->iMoveItem,0);
       }
-//      TRACE (header, "Released item %d!\n", infoPtr->iMoveItem);
       infoPtr->bPressed = FALSE;
     } else if (infoPtr->bTracking)
     {
-//      TRACE (header, "End tracking item %d!\n", infoPtr->iMoveItem);
       infoPtr->bTracking = FALSE;
 
@@ -1666 +1665 @@
           {
             infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
+
+            HEADER_SetItemBounds (hwnd,infoPtr->iMoveItem);
+            HEADER_Refresh(hwnd);
             HEADER_SendItemChanged(hwnd,infoPtr->iMoveItem);
-
-            HEADER_SetItemBounds (hwnd,infoPtr->iMoveItem);
-
-            HEADER_Refresh(hwnd);
           }
         }
@@ -1816 +1814 @@
 
         HEADER_SendTrack(hwnd,infoPtr->iMoveItem);
-//          TRACE (header, "Tracking item %d!\n", infoPtr->iMoveItem);
       }
     }

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.3 2000-03-18 16:17:24 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.4 2000-03-21 17:30:42 cbratschi Exp $*/
 /*
  * Listview control
@@ -6 +6 @@
  * Copyright 1999 Luc Tourangeau
  * Copyright 1999 Achim Hasenmueller
- * Copyright 1999 Christoph Bratschi
+ * Copyright 1999-2000 Christoph Bratschi (cbratschi@datacomm.ch)
  *
  * NOTES
@@ -36 +36 @@
  *   LISTVIEW_Update : not completed
  * WM_SETREDRAW not implemented
+ *
+ * the sort algorithm isn't stable (order of same items isn't fixed)!!!
  */
 
@@ -107 +109 @@
  */
 
-static INT LISTVIEW_HitTestItem(HWND, LPLVHITTESTINFO);
-static INT LISTVIEW_GetCountPerRow(HWND);
-static INT LISTVIEW_GetCountPerColumn(HWND);
-static VOID LISTVIEW_AlignLeft(HWND);
-static VOID LISTVIEW_AlignTop(HWND);
-static VOID LISTVIEW_AddGroupSelection(HWND, INT);
-static VOID LISTVIEW_AddSelection(HWND, INT);
-static BOOL LISTVIEW_AddSubItem(HWND, LPLVITEMW,BOOL);
-static INT LISTVIEW_FindInsertPosition(HDPA, INT);
-static INT LISTVIEW_GetItemHeight(HWND);
-static BOOL LISTVIEW_GetItemPosition(HWND, INT, LPPOINT);
+static INT     LISTVIEW_HitTestItem(HWND, LPLVHITTESTINFO);
+static INT     LISTVIEW_GetCountPerRow(HWND);
+static INT     LISTVIEW_GetCountPerColumn(HWND);
+static VOID    LISTVIEW_AlignLeft(HWND);
+static VOID    LISTVIEW_AlignTop(HWND);
+static VOID    LISTVIEW_AddGroupSelection(HWND, INT);
+static VOID    LISTVIEW_AddSelection(HWND, INT);
+static BOOL    LISTVIEW_AddSubItem(HWND, LPLVITEMW,BOOL);
+static INT     LISTVIEW_FindInsertPosition(HDPA, INT);
+static INT     LISTVIEW_GetItemHeight(HWND);
+static BOOL    LISTVIEW_GetItemPosition(HWND, INT, LPPOINT);
+static LRESULT LISTVIEW_GetItemRect(HWND hwnd,INT nItem,LPRECT lprc,INT code);
 static LRESULT LISTVIEW_GetItemRect(HWND, INT, LPRECT);
-static INT LISTVIEW_GetItemWidth(HWND);
-static INT LISTVIEW_GetLabelWidth(HWND, INT);
+static INT     LISTVIEW_GetItemWidth(HWND);
+static INT     LISTVIEW_GetLabelWidth(HWND, INT);
 static LRESULT LISTVIEW_GetOrigin(HWND, LPPOINT);
-static INT LISTVIEW_CalculateWidth(HWND hwnd, INT nItem);
+static INT     LISTVIEW_CalculateWidth(HWND hwnd, INT nItem);
 static LISTVIEW_SUBITEM* LISTVIEW_GetSubItem(HDPA, INT);
 static LRESULT LISTVIEW_GetViewRect(HWND, LPRECT);
-static BOOL LISTVIEW_InitItem(HWND, LISTVIEW_ITEM *, LPLVITEMW,BOOL);
-static BOOL LISTVIEW_InitSubItem(HWND,LISTVIEW_SUBITEM*,LPLVITEMW,BOOL);
+static BOOL    LISTVIEW_InitItem(HWND, LISTVIEW_ITEM *, LPLVITEMW,BOOL);
+static BOOL    LISTVIEW_InitSubItem(HWND,LISTVIEW_SUBITEM*,LPLVITEMW,BOOL);
 static LRESULT LISTVIEW_MouseSelection(HWND, POINT);
-static BOOL LISTVIEW_RemoveColumn(HDPA, INT);
-static VOID LISTVIEW_RemoveSelections(HWND, INT, INT);
-static BOOL LISTVIEW_RemoveSubItem(HDPA, INT);
-static VOID LISTVIEW_SetGroupSelection(HWND, INT);
-static BOOL LISTVIEW_SetItem(HWND, LPLVITEMW,BOOL);
-static BOOL LISTVIEW_SetItemFocus(HWND, INT);
-static BOOL LISTVIEW_SetItemPosition(HWND, INT, INT, INT);
-static VOID LISTVIEW_UpdateScroll(HWND);
-static VOID LISTVIEW_SetSelection(HWND, INT);
-static VOID LISTVIEW_UpdateSize(HWND);
-static BOOL LISTVIEW_SetSubItem(HWND, LPLVITEMW,BOOL);
+static BOOL    LISTVIEW_RemoveColumn(HDPA, INT);
+static VOID    LISTVIEW_RemoveSelections(HWND, INT, INT);
+static BOOL    LISTVIEW_RemoveSubItem(HDPA, INT);
+static VOID    LISTVIEW_SetGroupSelection(HWND, INT);
+static LRESULT LISTVIEW_SetItem(HWND, LPLVITEMW,BOOL);
+static BOOL    LISTVIEW_SetItemFocus(HWND, INT);
+static BOOL    LISTVIEW_SetItemPosition(HWND, INT, INT, INT);
+static VOID    LISTVIEW_UpdateScroll(HWND);
+static VOID    LISTVIEW_SetSelection(HWND, INT);
+static VOID    LISTVIEW_UpdateSize(HWND);
+static BOOL    LISTVIEW_SetSubItem(HWND, LPLVITEMW,BOOL);
 static LRESULT LISTVIEW_SetViewRect(HWND, LPRECT);
-static BOOL LISTVIEW_ToggleSelection(HWND, INT);
-static VOID LISTVIEW_UnsupportedStyles(LONG lStyle);
-static HWND LISTVIEW_EditLabel(HWND hwnd,INT nItem,BOOL unicode);
-static BOOL LISTVIEW_EndEditLabel(HWND hwnd,LPSTR pszText,DWORD nItem);
+static BOOL    LISTVIEW_ToggleSelection(HWND, INT);
+static VOID    LISTVIEW_UnsupportedStyles(LONG lStyle);
+static HWND    LISTVIEW_EditLabel(HWND hwnd,INT nItem,BOOL unicode);
+static BOOL    LISTVIEW_EndEditLabel(HWND hwnd,LPSTR pszText,DWORD nItem);
 static LRESULT LISTVIEW_Command(HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT LISTVIEW_SortItems(HWND hwnd, WPARAM wParam, LPARAM lParam);
+static LRESULT LISTVIEW_GetItem(HWND hwnd,LPLVITEMW lpLVItem,BOOL unicode,BOOL internal);
+static INT     LISTVIEW_GetTopIndex(HWND hwnd);
+static LRESULT LISTVIEW_GetItemState(HWND hwnd, INT nItem, UINT uMask);
+static LRESULT LISTVIEW_SetItemState(HWND hwnd,INT nItem,DWORD data,DWORD mask);
+static BOOL    LISTVIEW_SetItemPosition(HWND hwnd, INT nItem, INT nPosX, INT nPosY);
+static LRESULT LISTVIEW_GetStringWidth(HWND hwnd,LPWSTR lpszText,BOOL unicode);
+static BOOL    LISTVIEW_EnsureVisible(HWND hwnd,INT nItem,BOOL bPartial);
+
+static VOID LISTVIEW_Refresh(HWND hwnd)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  DWORD dwStyle;
+  UINT uView;
+
+  if (infoPtr->refreshFlags & RF_REFRESH) return;
+
+  dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  uView =  dwStyle & LVS_TYPEMASK;
+
+  if (uView == LVS_REPORT)
+  {
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+    RECT rect,rect2;
+
+    GetClientRect(hwnd,&rect);
+    GetClientRect(infoPtr->hwndHeader,&rect2);
+    rect.top += rect2.bottom;
+    InvalidateRect(hwnd,&rect,TRUE);
+  } else InvalidateRect(hwnd,NULL,TRUE);
+}
+
+static VOID LISTVIEW_QueueRefresh(HWND hwnd)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+
+  if (infoPtr->refreshFlags & RF_REFRESH)
+    KillTimer (hwnd,LV_REFRESH_TIMER);
+  infoPtr->refreshFlags |= RF_REFRESH;
+  SetTimer(hwnd,LV_REFRESH_TIMER,LV_REFRESH_DELAY,0);
+}
+
+static LRESULT LISTVIEW_Timer(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+
+  switch (wParam)
+  {
+    case LV_REFRESH_TIMER:
+      KillTimer(hwnd,LV_REFRESH_TIMER);
+      if (infoPtr->refreshFlags & RF_UPDATESCROLL)
+      {
+        LISTVIEW_UpdateScroll(hwnd);
+        infoPtr->refreshFlags &= ~RF_UPDATESCROLL;
+      }
+      if (infoPtr->refreshFlags & RF_REFRESH)
+      {
+        infoPtr->refreshFlags &= ~RF_REFRESH;
+        LISTVIEW_Refresh(hwnd);
+      }
+      return 0;
+  }
+
+  return 1;
+}
+
+static VOID LISTVIEW_RefreshItem(HWND hwnd,INT nItem)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  RECT rect;
+
+  if (infoPtr->refreshFlags & RF_REFRESH) return;
+  LISTVIEW_GetItemRect(hwnd,nItem,&rect,LVIR_SELECTBOUNDS);
+  InvalidateRect(hwnd,&rect,TRUE);
+}
+
+static VOID LISTVIEW_RefreshSubItem(HWND hwnd,INT nItem,INT nSubItem)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  RECT rect;
+
+  //CB: todo
+  if (infoPtr->refreshFlags & RF_REFRESH) return;
+  LISTVIEW_GetItemRect(hwnd,nItem,&rect,LVIR_SELECTBOUNDS);
+  InvalidateRect(hwnd,&rect,TRUE);
+}
+
+static VOID LISTVIEW_ScrollWindow(HWND hwnd,INT xScroll,INT yScroll,UINT uView)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+
+  if (infoPtr->refreshFlags & RF_REFRESH) return;
+
+  if (uView == LVS_REPORT)
+  {
+    RECT rect,header;
+
+    //clip header
+    GetClientRect(hwnd,&rect);
+    GetClientRect(infoPtr->hwndHeader,&header);
+    if (yScroll < 0)
+    {
+      //up
+      rect.top += header.bottom-yScroll;
+      ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,0);
+      rect.top = rect.bottom+yScroll;
+      if (rect.top < header.bottom) rect.top = header.bottom;
+      InvalidateRect(hwnd,&rect,TRUE);//CB: still wrong pixels
+    } else if (yScroll > 0)
+    { //down
+      rect.top += header.bottom;
+      ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,SW_INVALIDATE);
+    }
+    if (yScroll == 0)
+    {
+      rect.top += header.bottom;
+      ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,SW_INVALIDATE);
+    }
+  } else ScrollWindowEx(hwnd,xScroll,yScroll,NULL,NULL,0,NULL,SW_INVALIDATE);
+}
 
 /*************************************************************************
@@ -163 +285 @@
 static VOID LISTVIEW_UpdateHeaderSize(HWND hwnd, INT nNewScrollPos)
 {
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
     RECT winRect;
     POINT point[2];
@@ -196 +318 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView =  lStyle & LVS_TYPEMASK;
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  UINT uView =  dwStyle & LVS_TYPEMASK;
   INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
   INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
   SCROLLINFO scrollInfo;
 
+  if (dwStyle & LVS_NOSCROLL)
+  {
+    ShowScrollBar(hwnd,SB_BOTH,FALSE);
+    return;
+  }
+
   ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
   scrollInfo.cbSize = sizeof(SCROLLINFO);
@@ -208 +336 @@
   {
     /* update horizontal scrollbar */
-
     INT nCountPerColumn = LISTVIEW_GetCountPerColumn(hwnd);
     INT nCountPerRow = LISTVIEW_GetCountPerRow(hwnd);
     INT nNumOfItems = GETITEMCOUNT(infoPtr);
 
-    scrollInfo.nMax = nNumOfItems / nCountPerColumn;
-    if((nNumOfItems % nCountPerColumn) == 0)
-    {
-        scrollInfo.nMax--;
-    }
-    scrollInfo.nPos = ListView_GetTopIndex(hwnd) / nCountPerColumn;
-    scrollInfo.nPage = nCountPerRow;
+    infoPtr->maxScroll.x = nNumOfItems / nCountPerColumn+1;
+    if ((nNumOfItems % nCountPerColumn) == 0)
+      infoPtr->maxScroll.x--;
+
+    infoPtr->lefttop.x = LISTVIEW_GetTopIndex(hwnd) / nCountPerColumn;
+    infoPtr->scrollPage.x = nCountPerRow;
+
+    scrollInfo.nMin  = 0;
+    scrollInfo.nMax  = infoPtr->maxScroll.x-1;
+    scrollInfo.nPos  = infoPtr->lefttop.x;
+    scrollInfo.nPage = infoPtr->scrollPage.x;
     scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
-    SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
-  }
-  else if (uView == LVS_REPORT)
+    SetScrollInfo(hwnd,SB_HORZ,&scrollInfo,TRUE);
+  } else if (uView == LVS_REPORT)
   {
     /* update vertical scrollbar */
-    scrollInfo.nMin = 0;
-    scrollInfo.nMax = GETITEMCOUNT(infoPtr) - 1;
-    scrollInfo.nPos = ListView_GetTopIndex(hwnd);
-    scrollInfo.nPage = LISTVIEW_GetCountPerColumn(hwnd);
+    infoPtr->maxScroll.y = GETITEMCOUNT(infoPtr);
+    infoPtr->lefttop.y = LISTVIEW_GetTopIndex(hwnd);
+    infoPtr->scrollPage.y = LISTVIEW_GetCountPerColumn(hwnd);
+
+    scrollInfo.nMin  = 0;
+    scrollInfo.nMax  = infoPtr->maxScroll.y-1;
+    scrollInfo.nPos  = infoPtr->lefttop.y;
+    scrollInfo.nPage = infoPtr->scrollPage.y;
     scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
-    SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
+    SetScrollInfo(hwnd,SB_VERT,&scrollInfo,TRUE);
 
     /* update horizontal scrollbar */
     nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
-    if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) == FALSE
-       || GETITEMCOUNT(infoPtr) == 0)
-    {
-      scrollInfo.nPos = 0;
-    }
-    scrollInfo.nMin = 0;
-    scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE  ;
-    scrollInfo.nPage = nListWidth / LISTVIEW_SCROLL_DIV_SIZE;
-    scrollInfo.nMax = max(infoPtr->nItemWidth / LISTVIEW_SCROLL_DIV_SIZE, 0)-1;
-    SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
+    if (!(dwStyle & WS_HSCROLL) || !GETITEMCOUNT(infoPtr))
+      infoPtr->lefttop.x = 0;
+
+    infoPtr->scrollPage.x = nListWidth / LISTVIEW_SCROLL_DIV_SIZE;
+    infoPtr->maxScroll.x = max(infoPtr->nItemWidth / LISTVIEW_SCROLL_DIV_SIZE, 0);
+
+    scrollInfo.nMin  = 0;
+    scrollInfo.nMax  = infoPtr->maxScroll.x-1;
+    scrollInfo.nPos  = infoPtr->lefttop.x;
+    scrollInfo.nPage = infoPtr->scrollPage.x;
+    scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
+    SetScrollInfo(hwnd,SB_HORZ,&scrollInfo,TRUE);
 
     /* Update the Header Control */
-    scrollInfo.fMask = SIF_POS;
-    GetScrollInfo(hwnd, SB_HORZ, &scrollInfo);
-    LISTVIEW_UpdateHeaderSize(hwnd, scrollInfo.nPos);
-
-  }
-  else
+    LISTVIEW_UpdateHeaderSize(hwnd,infoPtr->lefttop.x);
+  } else
   {
     RECT rcView;
 
-    if (LISTVIEW_GetViewRect(hwnd, &rcView) != FALSE)
+    if (LISTVIEW_GetViewRect(hwnd,&rcView))
     {
       INT nViewWidth = rcView.right - rcView.left;
@@ -262 +394 @@
 
       /* Update Horizontal Scrollbar */
-      scrollInfo.fMask = SIF_POS;
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) == FALSE
-        || GETITEMCOUNT(infoPtr) == 0)
-      {
-        scrollInfo.nPos = 0;
-      }
-      scrollInfo.nMax = max(nViewWidth / LISTVIEW_SCROLL_DIV_SIZE, 0)-1;
-      scrollInfo.nMin = 0;
-      scrollInfo.nPage = nListWidth / LISTVIEW_SCROLL_DIV_SIZE;
+      if (!(dwStyle & WS_HSCROLL) || !GETITEMCOUNT(infoPtr))
+        infoPtr->lefttop.x = 0;
+      infoPtr->maxScroll.x = max(nViewWidth / LISTVIEW_SCROLL_DIV_SIZE, 0);
+      infoPtr->scrollPage.x = nListWidth / LISTVIEW_SCROLL_DIV_SIZE;
+
+      scrollInfo.nMin  = 0;
+      scrollInfo.nMax  = infoPtr->maxScroll.x-1;
+      scrollInfo.nPos  = infoPtr->lefttop.x;
+      scrollInfo.nPage = infoPtr->scrollPage.x;
       scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
-      SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
+      SetScrollInfo(hwnd,SB_HORZ,&scrollInfo,TRUE);
 
       /* Update Vertical Scrollbar */
       nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
-      scrollInfo.fMask = SIF_POS;
-      if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) == FALSE
-        || GETITEMCOUNT(infoPtr) == 0)
-      {
-        scrollInfo.nPos = 0;
-      }
-      scrollInfo.nMax = max(nViewHeight / LISTVIEW_SCROLL_DIV_SIZE,0)-1;
-      scrollInfo.nMin = 0;
-      scrollInfo.nPage = nListHeight / LISTVIEW_SCROLL_DIV_SIZE;
+      if (!(dwStyle & WS_VSCROLL) || !GETITEMCOUNT(infoPtr))
+        infoPtr->lefttop.x = 0;
+      infoPtr->maxScroll.y = max(nViewHeight / LISTVIEW_SCROLL_DIV_SIZE,0);
+      infoPtr->scrollPage.y = nListHeight / LISTVIEW_SCROLL_DIV_SIZE;
+
+      scrollInfo.nMin  = 0;
+      scrollInfo.nMax  = infoPtr->maxScroll.y-1;
+      scrollInfo.nPos  = infoPtr->lefttop.y;
+      scrollInfo.nPage = infoPtr->scrollPage.y;
       scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
-      SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
+      SetScrollInfo(hwnd,SB_VERT,&scrollInfo,TRUE);
     }
   }
@@ -312 +444 @@
   {
     //FIXME("  LVS_NOLABELWRAP\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_NOSCROLL)
-  {
-    //FIXME("  LVS_NOSCROLL\n");
   }
 
@@ -374 +501 @@
         }
 
-        ListView_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
+        LISTVIEW_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
         ptItem.x += infoPtr->nItemWidth;
         rcView.right = max(rcView.right, ptItem.x);
@@ -385 +512 @@
       for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
       {
-        ListView_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
+        LISTVIEW_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
         ptItem.y += infoPtr->nItemHeight;
       }
@@ -431 +558 @@
         }
 
-        ListView_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
+        LISTVIEW_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
         ptItem.y += infoPtr->nItemHeight;
         rcView.bottom = max(rcView.bottom, ptItem.y);
@@ -442 +569 @@
       for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
       {
-        ListView_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
+        LISTVIEW_SetItemPosition(hwnd, i, ptItem.x, ptItem.y);
         ptItem.x += infoPtr->nItemWidth;
       }
@@ -772 +899 @@
   for (i = nFirst; i <= nLast; i++)
   {
-    ListView_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
+    LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
   }
 
@@ -794 +921 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
 
-  ListView_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
+  LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
 
   LISTVIEW_SetItemFocus(hwnd, nItem);
@@ -817 +944 @@
   BOOL bResult;
 
-  if (ListView_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED)
-  {
-    ListView_SetItemState(hwnd,nItem,0,LVIS_SELECTED);
+  if (LISTVIEW_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED)
+  {
+    LISTVIEW_SetItemState(hwnd,nItem,0,LVIS_SELECTED);
     bResult = FALSE;
   }
   else
   {
-    ListView_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
+    LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
     bResult = TRUE;
   }
@@ -856 +983 @@
     if (PtInRect(&rcSelRect, ptItem) != FALSE)
     {
-      ListView_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
+      LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
     }
     else
     {
-      ListView_SetItemState(hwnd,i,0,LVIS_SELECTED);
+      LISTVIEW_SetItemState(hwnd,i,0,LVIS_SELECTED);
     }
   }
@@ -891 +1018 @@
       if ((i < nFirst) || (i > nLast))
       {
-        ListView_SetItemState(hwnd,i,0,LVIS_SELECTED);
+        LISTVIEW_SetItemState(hwnd,i,0,LVIS_SELECTED);
       }
       else
       {
-        ListView_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
+        LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
       }
     }
@@ -937 +1064 @@
     bResult = TRUE;
 
-    ListView_SetItemState(hwnd,infoPtr->nFocusedItem,0,LVIS_FOCUSED);
-    ListView_SetItemState(hwnd,nItem,LVIS_FOCUSED,LVIS_FOCUSED);
+    LISTVIEW_SetItemState(hwnd,infoPtr->nFocusedItem,0,LVIS_FOCUSED);
+    LISTVIEW_SetItemState(hwnd,nItem,LVIS_FOCUSED,LVIS_FOCUSED);
 
     infoPtr->nFocusedItem = nItem;
-    ListView_EnsureVisible(hwnd, nItem, FALSE);
+    LISTVIEW_EnsureVisible(hwnd, nItem, FALSE);
   }
 
@@ -972 +1099 @@
   }
 
-  ListView_SetItemState(hwnd,infoPtr->nFocusedItem,0,LVIS_FOCUSED);
-  ListView_SetItemState(hwnd,nItem,LVIS_SELECTED | LVIS_FOCUSED,LVIS_SELECTED | LVIS_FOCUSED);
+  LISTVIEW_SetItemState(hwnd,infoPtr->nFocusedItem,0,LVIS_FOCUSED);
+  LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED | LVIS_FOCUSED,LVIS_SELECTED | LVIS_FOCUSED);
 
   infoPtr->nFocusedItem = nItem;
@@ -991 +1118 @@
  *   FAILURE : FALSE (nothing has changed)
  */
-static BOOL LISTVIEW_KeySelection(HWND hwnd, INT nItem)
+static VOID LISTVIEW_KeySelection(HWND hwnd, INT nItem)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
@@ -997 +1124 @@
   WORD wShift = HIWORD(GetKeyState(VK_SHIFT));
   WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL));
-  BOOL bResult = FALSE;
 
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)))
@@ -1003 +1129 @@
     if (lStyle & LVS_SINGLESEL)
     {
-      bResult = TRUE;
       LISTVIEW_SetSelection(hwnd, nItem);
-      ListView_EnsureVisible(hwnd, nItem, FALSE);
+      LISTVIEW_EnsureVisible(hwnd, nItem, FALSE);
     }
     else
@@ -1011 +1136 @@
       if (wShift)
       {
-        bResult = TRUE;
         LISTVIEW_SetGroupSelection(hwnd, nItem);
       }
       else if (wCtrl)
       {
-        bResult = LISTVIEW_SetItemFocus(hwnd, nItem);
+        LISTVIEW_SetItemFocus(hwnd, nItem);
       }
       else
       {
-        bResult = TRUE;
         LISTVIEW_SetSelection(hwnd, nItem);
-        ListView_EnsureVisible(hwnd, nItem, FALSE);
-      }
-    }
-  }
-
-  return bResult;
+        LISTVIEW_EnsureVisible(hwnd, nItem, FALSE);
+      }
+    }
+  }
 }
 
@@ -1081 +1202 @@
   for (i = nFirst; i <= nLast; i++)
   {
-    ListView_SetItemState(hwnd,i,0,LVIS_SELECTED);
+    LISTVIEW_SetItemState(hwnd,i,0,LVIS_SELECTED);
   }
 }
@@ -1291 +1412 @@
                   uChanged |= LVIF_TEXT;
                 }
-                FreeAsciiString((LPSTR)textW);
+                HeapFree(GetProcessHeap(),0,textW);
               }
               else
@@ -1450 +1571 @@
     {
       bResult = TRUE;
-      ZeroMemory(lpSubItem, sizeof(LISTVIEW_SUBITEM));
+      ZeroMemory(lpSubItem,sizeof(LISTVIEW_SUBITEM));
 
       lpSubItem->iSubItem = lpLVItem->iSubItem;
 
       if (lpLVItem->mask & LVIF_IMAGE)
-      {
         lpSubItem->iImage = lpLVItem->iImage;
-      }
 
       if (lpLVItem->mask & LVIF_TEXT)
@@ -1466 +1585 @@
           {
             if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
-            {
               return FALSE;
-            }
-
-            if ((lpSubItem->pszText != NULL) &&
-                (lpSubItem->pszText != LPSTR_TEXTCALLBACKW))
-            {
+
+            if ((lpSubItem->pszText != NULL) && (lpSubItem->pszText != LPSTR_TEXTCALLBACKW))
               COMCTL32_Free(lpSubItem->pszText);
-            }
 
             lpSubItem->pszText = LPSTR_TEXTCALLBACKW;
-          }
-          else
+          } else
           {
             if (lpSubItem->pszText == LPSTR_TEXTCALLBACKW)
-            {
               lpSubItem->pszText = NULL;
-            }
-
-            bResult = Str_SetPtrW(&lpSubItem->pszText, lpLVItem->pszText);
+
+            bResult = Str_SetPtrW(&lpSubItem->pszText,lpLVItem->pszText);
           }
         } else //!unicode
@@ -1492 +1603 @@
           {
             if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
-            {
               return FALSE;
-            }
-
-            if ((lpSubItem->pszText != NULL) &&
-                (lpSubItem->pszText != LPSTR_TEXTCALLBACKW))
-            {
+
+            if ((lpSubItem->pszText != NULL) && (lpSubItem->pszText != LPSTR_TEXTCALLBACKW))
               COMCTL32_Free(lpSubItem->pszText);
-            }
 
             lpSubItem->pszText = LPSTR_TEXTCALLBACKW;
-          }
-          else
+          } else
           {
             INT len;
 
             if (lpSubItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(lpSubItem->pszText);
-            len = (lpLVItem->pszText != NULL) ? lstrlenA((LPSTR)lpLVItem->pszText):0;
+            len = lpLVItem->pszText ? lstrlenA((LPSTR)lpLVItem->pszText):0;
 
             if (len > 0)
@@ -1649 +1754 @@
 /***
  * DESCRIPTION:
- * Sets item attributes.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new item atttributes
- *
- * RETURN:
- *   SUCCESS : TRUE
- *   FAILURE : FALSE
- */
-static BOOL LISTVIEW_SetItem(HWND hwnd, LPLVITEMW lpLVItem,BOOL unicode)
+ * Retrieves the index of the item at coordinate (0, 0) of the client area.
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
+ * RETURN:
+ * item index
+ */
+static INT LISTVIEW_GetTopIndex(HWND hwnd)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  BOOL bResult = FALSE;
-  HDPA hdpaSubItems;
-  LISTVIEW_ITEM *lpItem;
-  NMLISTVIEW nmlv;
-  UINT uChanged;
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
-
-  if (lpLVItem != NULL)
-  {
-    if (lpLVItem->iSubItem == 0)
-    {
-      hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
-      if (hdpaSubItems != NULL)
-      {
-        lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, lpLVItem->iSubItem);
-        if (lpItem != NULL)
-        {
-          ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-          nmlv.lParam = lpItem->lParam;
-          uChanged = LISTVIEW_GetItemChanges(lpItem, lpLVItem,unicode);
-          if (uChanged != 0)
-          {
-            if (uChanged & LVIF_STATE)
-            {
-              nmlv.uNewState = lpLVItem->state & lpLVItem->stateMask;
-              nmlv.uOldState = lpItem->state & lpLVItem->stateMask;
-            }
-
-            nmlv.uChanged = uChanged;
-            nmlv.iItem = lpLVItem->iItem;
-            nmlv.lParam = lpItem->lParam;
-            /* send LVN_ITEMCHANGING notification */
-            sendNotify(hwnd,LVN_ITEMCHANGING,&nmlv.hdr);
-
-            /* copy information */
-            bResult = LISTVIEW_InitItem(hwnd, lpItem, lpLVItem,unicode);
-
-            /* send LVN_ITEMCHANGED notification */
-            sendNotify(hwnd,LVN_ITEMCHANGED,&nmlv.hdr);
-          }
-          else
-          {
-            bResult = TRUE;
-          }
-
-          InvalidateRect(hwnd, NULL, TRUE);
-        }
-      }
-    }
-  }
-
-  return bResult;
-}
-
-/***
- * DESCRIPTION:
- * Sets subitem attributes.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new subitem atttributes
- *
- * RETURN:
- *   SUCCESS : TRUE
- *   FAILURE : FALSE
- */
-static BOOL LISTVIEW_SetSubItem(HWND hwnd, LPLVITEMW lpLVItem,BOOL unicode)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  BOOL bResult = FALSE;
-  HDPA hdpaSubItems;
-  LISTVIEW_SUBITEM *lpSubItem;
-
-  if (lpLVItem != NULL)
-  {
-    if (lpLVItem->iSubItem > 0)
-    {
-      hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
-      if (hdpaSubItems != NULL)
-      {
-        /* set subitem only if column is present */
-        if (Header_GetItemCount(infoPtr->hwndHeader) > lpLVItem->iSubItem)
-        {
-          lpSubItem = LISTVIEW_GetSubItem(hdpaSubItems, lpLVItem->iSubItem);
-          if (lpSubItem != NULL)
-          {
-            bResult = LISTVIEW_InitSubItem(hwnd, lpSubItem, lpLVItem,unicode);
-          }
-          else
-          {
-            bResult = LISTVIEW_AddSubItem(hwnd, lpLVItem,unicode);
-          }
-
-          InvalidateRect(hwnd, NULL, TRUE);
-        }
-      }
-    }
-  }
-
-  return bResult;
-}
-
-/***
- * DESCRIPTION:
- * Retrieves the index of the item at coordinate (0, 0) of the client area.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
- * RETURN:
- * item index
- */
-static INT LISTVIEW_GetTopIndex(HWND hwnd)
-{
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = lStyle & LVS_TYPEMASK;
+  DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
   INT nItem = 0;
-  SCROLLINFO scrollInfo;
-
-  ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
-  scrollInfo.cbSize = sizeof(SCROLLINFO);
-  scrollInfo.fMask = SIF_POS;
 
   if (uView == LVS_LIST)
   {
-    if (lStyle & WS_HSCROLL)
-    {
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
-      {
-        nItem = scrollInfo.nPos * LISTVIEW_GetCountPerColumn(hwnd);
-      }
-    }
-  }
-  else if (uView == LVS_REPORT)
-  {
-    if (lStyle & WS_VSCROLL)
-    {
-      if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
-      {
-        nItem = scrollInfo.nPos;
-      }
-    }
+    if (dwStyle & WS_HSCROLL)
+      nItem = infoPtr->lefttop.x*LISTVIEW_GetCountPerColumn(hwnd);
+  } else if (uView == LVS_REPORT)
+  {
+    if (dwStyle & WS_VSCROLL)
+      nItem = infoPtr->lefttop.y;
   }
 
@@ -1823 +1796 @@
  * None
  */
-static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem,
-                                 RECT rcItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  WCHAR szDispText[DISP_TEXT_SIZE];
-  LVITEMW lvItem;
-
-//  TRACE("(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d\n", hwnd, hdc,
-//        nItem, nSubItem);
+static VOID LISTVIEW_DrawSubItem(HWND hwnd,HDC hdc,INT nItem,INT nSubItem,RECT rcItem)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  LVINTERNALITEMW lvItem;
 
   /* get information needed for drawing the item */
   ZeroMemory(&lvItem, sizeof(LVITEMW));
-  lvItem.mask = LVIF_TEXT;
-  lvItem.iItem = nItem;
-  lvItem.iSubItem = nSubItem;
-  lvItem.cchTextMax = DISP_TEXT_SIZE;
-  lvItem.pszText = szDispText;
-  ListView_GetItemW(hwnd,&lvItem);
+  lvItem.header.mask = LVIF_TEXT;
+  lvItem.header.iItem = nItem;
+  lvItem.header.iSubItem = nSubItem;
+  lvItem.header.cchTextMax = DISP_TEXT_SIZE;
+  lvItem.header.pszText = NULL;
+  lvItem.mustFree = FALSE;
+  LISTVIEW_GetItem(hwnd,(LPLVITEMW)&lvItem,TRUE,TRUE);
 
   /* set item colors */
@@ -1846 +1815 @@
   SetTextColor(hdc, infoPtr->clrText);
 
-  ExtTextOutW(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED,
-              &rcItem, lvItem.pszText, lstrlenW(lvItem.pszText), NULL);
+  if (lvItem.unicode)
+    ExtTextOutW(hdc,rcItem.left,rcItem.top,ETO_OPAQUE | ETO_CLIPPED,&rcItem,lvItem.header.pszText,lstrlenW(lvItem.header.pszText),NULL);
+  else
+    ExtTextOutA(hdc,rcItem.left,rcItem.top,ETO_OPAQUE | ETO_CLIPPED,&rcItem,(LPSTR)lvItem.header.pszText,lstrlenA((LPSTR)lvItem.header.pszText),NULL);
+
+  if (lvItem.mustFree) COMCTL32_Free(lvItem.header.pszText);
 }
 
@@ -1864 +1837 @@
  * None
  */
-static VOID LISTVIEW_DrawItem(HWND hwnd, HDC hdc, INT nItem, RECT rcItem)
+static VOID LISTVIEW_DrawItem(HWND hwnd,HDC hdc,INT nItem,RECT rcItem)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  WCHAR szDispText[DISP_TEXT_SIZE];
   INT nLabelWidth;
-  LVITEMW lvItem;
+  LVINTERNALITEMW lvItem;
   INT nMixMode;
   DWORD dwBkColor;
   DWORD dwTextColor;
 
-//  TRACE("(hwnd=%x, hdc=%x, nItem=%d\n", hwnd, hdc, nItem);
-
   /* get information needed for drawing the item */
   ZeroMemory(&lvItem, sizeof(LVITEMW));
-  lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE | LVIF_INDENT;
-  lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK;
-  lvItem.iItem = nItem;
-  lvItem.iSubItem = 0;
-  lvItem.cchTextMax = DISP_TEXT_SIZE;
-  lvItem.pszText = szDispText;
-  ListView_GetItemW(hwnd,&lvItem);
+  lvItem.header.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE | LVIF_INDENT;
+  lvItem.header.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK;
+  lvItem.header.iItem = nItem;
+  lvItem.header.iSubItem = 0;
+  lvItem.header.cchTextMax = DISP_TEXT_SIZE;
+  lvItem.header.pszText = NULL;
+  lvItem.mustFree = FALSE;
+  LISTVIEW_GetItem(hwnd,(LPLVITEMW)&lvItem,TRUE,TRUE);
 
   /* state icons */
   if (infoPtr->himlState != NULL)
   {
-     UINT uStateImage = (lvItem.state & LVIS_STATEIMAGEMASK) >> 12;
+     UINT uStateImage = (lvItem.header.state & LVIS_STATEIMAGEMASK) >> 12;
      if (uStateImage != 0)
      {
@@ -1902 +1873 @@
   if (infoPtr->himlSmall != NULL)
   {
-    if (lvItem.state & LVIS_SELECTED)
+    if (lvItem.header.state & LVIS_SELECTED)
     {
       ImageList_SetBkColor(infoPtr->himlSmall, CLR_NONE);
-      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left,
+      ImageList_Draw(infoPtr->himlSmall, lvItem.header.iImage, hdc, rcItem.left,
                      rcItem.top, ILD_SELECTED);
     }
@@ -1911 +1882 @@
     {
       ImageList_SetBkColor(infoPtr->himlSmall, CLR_NONE);
-      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left,
+      ImageList_Draw(infoPtr->himlSmall, lvItem.header.iImage, hdc, rcItem.left,
                      rcItem.top, ILD_NORMAL);
     }
@@ -1919 +1890 @@
 
   /* Don't bother painting item being edited */
-  if (infoPtr->hwndEdit && lvItem.state & LVIS_FOCUSED)
-      return;
-
-  if ((lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus != FALSE))
+  if (infoPtr->hwndEdit && (lvItem.header.state & LVIS_FOCUSED))
+  {
+    if (lvItem.mustFree) COMCTL32_Free(lvItem.header.pszText);
+    return;
+  }
+
+  if ((lvItem.header.state & LVIS_SELECTED) && infoPtr->bFocus)
   {
     /* set item colors */
@@ -1931 +1905 @@
   }
   else if ((GetWindowLongA(hwnd, GWL_STYLE) & LVS_SHOWSELALWAYS) &&
-           (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus == FALSE))
+           (lvItem.header.state & LVIS_SELECTED) && !infoPtr->bFocus)
   {
     dwBkColor = SetBkColor(hdc, GetSysColor(COLOR_3DFACE));
@@ -1947 +1921 @@
   }
 
-  nLabelWidth = ListView_GetStringWidthW(hwnd, lvItem.pszText);
+  nLabelWidth = LISTVIEW_GetStringWidth(hwnd,lvItem.header.pszText,lvItem.unicode);
   if (rcItem.left + nLabelWidth < rcItem.right)
     rcItem.right = rcItem.left + nLabelWidth;
 
   /* draw label */
-  ExtTextOutW(hdc, rcItem.left, rcItem.top, ETO_OPAQUE | ETO_CLIPPED,
-              &rcItem, lvItem.pszText, lstrlenW(lvItem.pszText), NULL);
-
-  if ((lvItem.state & LVIS_FOCUSED) && (infoPtr->bFocus == TRUE))
+  if (lvItem.unicode)
+    ExtTextOutW(hdc,rcItem.left,rcItem.top,ETO_OPAQUE | ETO_CLIPPED,&rcItem,lvItem.header.pszText,lstrlenW(lvItem.header.pszText),NULL);
+  else
+    ExtTextOutA(hdc,rcItem.left,rcItem.top,ETO_OPAQUE | ETO_CLIPPED,&rcItem,(LPSTR)lvItem.header.pszText,lstrlenA((LPSTR)lvItem.header.pszText),NULL);
+
+  if ((lvItem.header.state & LVIS_FOCUSED) && infoPtr->bFocus)
   {
     Rectangle(hdc, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom);
@@ -1966 +1942 @@
     SetTextColor(hdc, infoPtr->clrText);
   }
+  if (lvItem.mustFree) COMCTL32_Free(lvItem.header.pszText);
 }
 
@@ -2003 +1980 @@
   lvItem.cchTextMax = DISP_TEXT_SIZE;
   lvItem.pszText = szDispText;
-  ListView_GetItemW(hwnd, &lvItem);
+  LISTVIEW_GetItem(hwnd,&lvItem,TRUE,FALSE);//CB:todo
 
   if (lvItem.state & LVIS_SELECTED)
@@ -2043 +2020 @@
 
   rcItem.top += infoPtr->iconSize.cy + ICON_BOTTOM_PADDING;
-  nLabelWidth = ListView_GetStringWidthW(hwnd, lvItem.pszText);
+  nLabelWidth = LISTVIEW_GetStringWidth(hwnd,lvItem.pszText,TRUE);
   nDrawPosX = infoPtr->iconSpacing.cx - nLabelWidth;
   if (nDrawPosX > 1)
@@ -2079 +2056 @@
  * None
  */
-static VOID LISTVIEW_DrawReport(HWND hwnd, HDC hdc)
+static VOID LISTVIEW_DrawReport(HWND hwnd,HDC hdc,RECT *updateRect)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  SCROLLINFO scrollInfo;
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
   INT nDrawPosY = infoPtr->rcList.top;
   INT nColumnCount;
-  RECT rcItem;
+  RECT rcItem,rcClient;
   INT  j;
   INT nItem;
   INT nLast;
 
-  ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
-  scrollInfo.cbSize = sizeof(SCROLLINFO);
-  scrollInfo.fMask = SIF_POS;
-
-  nItem = ListView_GetTopIndex(hwnd);
+  nItem = LISTVIEW_GetTopIndex(hwnd);
 
   /* add 1 for displaying a partial item at the bottom */
@@ -2101 +2074 @@
 
   /* send cache hint notification */
-  if (GetWindowLongA(hwnd,GWL_STYLE) & LVS_OWNERDATA)
+  if (dwStyle & LVS_OWNERDATA)
   {
     NMLVCACHEHINT nmlv;
@@ -2110 +2083 @@
     sendNotify(hwnd,LVN_ODCACHEHINT,&nmlv.hdr);
   }
+
+  GetClientRect(hwnd,&rcClient);
 
   for (; nItem < nLast; nItem++)
@@ -2122 +2097 @@
       rcItem.bottom = rcItem.top + infoPtr->nItemHeight;
 
+      if (rcItem.top >= rcClient.bottom) return;
+
       /* Offset the Scroll Bar Pos */
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
-      {
-        rcItem.left -= (scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE);
-        rcItem.right -= (scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE);
-      }
-
-      if (j == 0)
-      {
-        LISTVIEW_DrawItem(hwnd, hdc, nItem, rcItem);
-      }
-      else
-      {
-        LISTVIEW_DrawSubItem(hwnd, hdc, nItem, j, rcItem);
+      if (dwStyle & WS_HSCROLL)
+      {
+        rcItem.left -= (infoPtr->lefttop.x * LISTVIEW_SCROLL_DIV_SIZE);
+        rcItem.right -= (infoPtr->lefttop.x * LISTVIEW_SCROLL_DIV_SIZE);
+      }
+
+      if (!updateRect || IntersectRect(NULL,&rcItem,updateRect))
+      {
+        if (j == 0)
+          LISTVIEW_DrawItem(hwnd, hdc, nItem, rcItem);
+        else
+          LISTVIEW_DrawSubItem(hwnd, hdc, nItem, j, rcItem);
       }
     }
@@ -2252 +2228 @@
  * None
  */
-static VOID LISTVIEW_DrawList(HWND hwnd, HDC hdc)
+static VOID LISTVIEW_DrawList(HWND hwnd,HDC hdc,RECT *updateRect)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
@@ -2266 +2242 @@
   nColumnCount = LISTVIEW_GetColumnCount(hwnd);
   nCountPerColumn = LISTVIEW_GetCountPerColumn(hwnd);
-  nItem = ListView_GetTopIndex(hwnd);
+  nItem = LISTVIEW_GetTopIndex(hwnd);
 
   for (i = 0; i < nColumnCount; i++)
@@ -2295 +2271 @@
  * None
  */
-static VOID LISTVIEW_DrawIcon(HWND hwnd, HDC hdc, BOOL bSmall)
+static VOID LISTVIEW_DrawIcon(HWND hwnd,HDC hdc,BOOL bSmall,RECT *updateRect)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
@@ -2348 +2324 @@
  * NoneX
  */
-static VOID LISTVIEW_Draw(HWND hwnd, HDC hdc)
+static VOID LISTVIEW_Draw(HWND hwnd,HDC hdc,RECT *updateRect)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
@@ -2367 +2343 @@
   if (uView == LVS_LIST)
   {
-    LISTVIEW_DrawList(hwnd, hdc);
+    LISTVIEW_DrawList(hwnd,hdc,updateRect);
   }
   else if (uView == LVS_REPORT)
   {
-    LISTVIEW_DrawReport(hwnd, hdc);
+    LISTVIEW_DrawReport(hwnd,hdc,updateRect);
   }
   else if (uView == LVS_SMALLICON)
   {
-    LISTVIEW_DrawIcon(hwnd, hdc, TRUE);
+    LISTVIEW_DrawIcon(hwnd,hdc,TRUE,updateRect);
   }
   else if (uView == LVS_ICON)
   {
-    LISTVIEW_DrawIcon(hwnd, hdc, FALSE);
+    LISTVIEW_DrawIcon(hwnd,hdc,FALSE,updateRect);
   }
 
@@ -2622 +2598 @@
 
     /* invalidate client area (optimization needed) */
-    InvalidateRect(hwnd, NULL, TRUE);
+    LISTVIEW_Refresh(hwnd);
   }
 
@@ -2660 +2636 @@
 
       /* refresh client area */
-      InvalidateRect(hwnd, NULL, TRUE);
+      LISTVIEW_Refresh(hwnd);
     }
   }
@@ -2763 +2739 @@
           infoPtr->nFocusedItem = -1;
 
-    LISTVIEW_UpdateScroll(hwnd);
-
     /* refresh client area */
-    InvalidateRect(hwnd, NULL, TRUE);
+    infoPtr->refreshFlags |= RF_UPDATESCROLL;
+    LISTVIEW_QueueRefresh(hwnd);
   }
 
@@ -2858 +2833 @@
   }
 
-  if (textW) COMCTL32_Free(textW);
+  if (textW) HeapFree(GetProcessHeap(),0,textW);
 
   return TRUE;
@@ -2889 +2864 @@
   WCHAR* textW = NULL;
 
-
-  if (~GetWindowLongA(hwnd, GWL_STYLE) & LVS_EDITLABELS)
-      return FALSE;
+  if (!(GetWindowLongA(hwnd, GWL_STYLE) & LVS_EDITLABELS))
+    return FALSE;
 
   /* Is the EditBox still there, if so remove it */
-  if(infoPtr->hwndEdit != 0)
-  {
-      SetFocus(hwnd);
-  }
-
-  LISTVIEW_SetSelection(hwnd, nItem);
-  LISTVIEW_SetItemFocus(hwnd, nItem);
+  if (infoPtr->hwndEdit)
+    SetFocus(hwnd);
+
+  LISTVIEW_SetSelection(hwnd,nItem);
+  LISTVIEW_SetItemFocus(hwnd,nItem);
 
   ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));
   if (NULL == (hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem)))
-          return 0;
+    return 0;
 
   if (NULL == (lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0)))
-          return 0;
+    return 0;
 
   /* get information needed for drawing the item */
@@ -2919 +2891 @@
     textW = (WCHAR*)COMCTL32_Alloc(DISP_TEXT_SIZE*sizeof(WCHAR));
     lvItem.pszText = textW;
-    ListView_GetItemW(hwnd,&lvItem);
+    LISTVIEW_GetItem(hwnd,&lvItem,TRUE,FALSE);
     dispInfo.item.cchTextMax = lstrlenW(lvItem.pszText);
   } else
@@ -2925 +2897 @@
     textA = (CHAR*)COMCTL32_Alloc(DISP_TEXT_SIZE*sizeof(CHAR));
     lvItem.pszText = (LPWSTR)textA;
-    ListView_GetItemA(hwnd, &lvItem);
+    LISTVIEW_GetItem(hwnd,&lvItem,FALSE,FALSE);
     dispInfo.item.cchTextMax = lstrlenA((LPSTR)lvItem.pszText);
   }
@@ -2938 +2910 @@
 
   if (sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? LVN_BEGINLABELEDITW:LVN_BEGINLABELEDITA,&dispInfo.hdr))
-          return 0;
+    return 0;
 
   rect.left = LVIR_LABEL;
   if (!LISTVIEW_GetItemRect(hwnd, nItem, &rect))
-          return 0;
+    return 0;
 
   //Edit uses ANSI by default -> convert
   if (isUnicodeNotify(&infoPtr->header))
-  {
     textA = UnicodeToAsciiString(textW);
-  }
 
   if (!(hedit = CreateEditLabel(textA , WS_VISIBLE,
@@ -2979 +2949 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_EnsureVisible(HWND hwnd, INT nItem, BOOL bPartial)
+static BOOL LISTVIEW_EnsureVisible(HWND hwnd,INT nItem,BOOL bPartial)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
+  SCROLLINFO scrollInfo;
   INT nScrollPosHeight = 0;
   INT nScrollPosWidth = 0;
-  SCROLLINFO scrollInfo;
   RECT rcItem;
-
-  ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
+  POINT oldlefttop = infoPtr->lefttop;
+
+  ZeroMemory(&scrollInfo,sizeof(SCROLLINFO));
   scrollInfo.cbSize = sizeof(SCROLLINFO);
-  scrollInfo.fMask = SIF_POS;
+  scrollInfo.fMask  = SIF_POS;
 
   /* ALWAYS bPartial == FALSE, FOR NOW! */
@@ -2999 +2971 @@
     if (rcItem.left < infoPtr->rcList.left)
     {
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
+      if (dwStyle & WS_HSCROLL)
       {
         /* scroll left */
@@ -3006 +2978 @@
           nScrollPosWidth = infoPtr->nItemWidth;
           rcItem.left += infoPtr->rcList.left;
-        }
-        else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
+        } else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
         {
           nScrollPosWidth = LISTVIEW_SCROLL_DIV_SIZE;
@@ -3018 +2989 @@
         {
           if (rcItem.left % nScrollPosWidth == 0)
+            infoPtr->lefttop.x += rcItem.left / nScrollPosWidth;
+          else
+            infoPtr->lefttop.x += rcItem.left / nScrollPosWidth - 1;
+
+          if (infoPtr->lefttop.x != oldlefttop.x)
           {
-            scrollInfo.nPos += rcItem.left / nScrollPosWidth;
+            scrollInfo.nPos = infoPtr->lefttop.x;
+            SetScrollInfo(hwnd,SB_HORZ,&scrollInfo,TRUE);
           }
-          else
-          {
-            scrollInfo.nPos += rcItem.left / nScrollPosWidth - 1;
-          }
-
-          SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
-        }
-      }
-    }
-    else if (rcItem.right > infoPtr->rcList.right)
-    {
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
+        }
+      }
+    } else if (rcItem.right > infoPtr->rcList.right)
+    {
+      if (dwStyle & WS_HSCROLL)
       {
         /* scroll right */
@@ -3039 +3009 @@
           rcItem.right -= infoPtr->rcList.right;
           nScrollPosWidth = infoPtr->nItemWidth;
-        }
-        else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
+        } else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
         {
           rcItem.right -= infoPtr->rcList.right;
@@ -3050 +3019 @@
         if (nScrollPosWidth != 0)
         {
+          SCROLLINFO scrollInfo;
+
           if (rcItem.right % nScrollPosWidth == 0)
+            infoPtr->lefttop.x += rcItem.right / nScrollPosWidth;
+          else
+            infoPtr->lefttop.x += rcItem.right / nScrollPosWidth + 1;
+
+          if (infoPtr->lefttop.x != oldlefttop.x)
           {
-            scrollInfo.nPos += rcItem.right / nScrollPosWidth;
+            scrollInfo.nPos   = infoPtr->lefttop.x;
+            SetScrollInfo(hwnd,SB_HORZ,&scrollInfo,TRUE);
           }
-          else
-          {
-            scrollInfo.nPos += rcItem.right / nScrollPosWidth + 1;
-          }
-
-          SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
         }
       }
@@ -3067 +3038 @@
     {
       /* scroll up */
-      if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
+      if (dwStyle & WS_VSCROLL)
       {
         if (uView == LVS_REPORT)
@@ -3081 +3052 @@
 
         if (rcItem.top % nScrollPosHeight == 0)
-        {
-          scrollInfo.nPos += rcItem.top / nScrollPosHeight;
-        }
+          infoPtr->lefttop.y += rcItem.top / nScrollPosHeight;
         else
-        {
-          scrollInfo.nPos += rcItem.top / nScrollPosHeight - 1;
-        }
-
-        SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
+          infoPtr->lefttop.y += rcItem.top / nScrollPosHeight - 1;
+
+        if (infoPtr->lefttop.y != oldlefttop.y)
+        {
+          scrollInfo.nPos = infoPtr->lefttop.y;
+          SetScrollInfo(hwnd,SB_VERT,&scrollInfo,TRUE);
+        }
       }
     }
@@ -3095 +3066 @@
     {
       /* scroll down */
-      if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
+      if (dwStyle & WS_VSCROLL)
       {
         if (uView == LVS_REPORT)
@@ -3109 +3080 @@
 
         if (rcItem.bottom % nScrollPosHeight == 0)
-        {
-          scrollInfo.nPos += rcItem.bottom / nScrollPosHeight;
-        }
+          infoPtr->lefttop.y += rcItem.bottom / nScrollPosHeight;
         else
-        {
-          scrollInfo.nPos += rcItem.bottom / nScrollPosHeight + 1;
-        }
-
-        SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
-      }
-    }
-  }
+          infoPtr->lefttop.y += rcItem.bottom / nScrollPosHeight + 1;
+        if (infoPtr->lefttop.y != oldlefttop.y)
+        {
+          scrollInfo.nPos = infoPtr->lefttop.y;
+          SetScrollInfo(hwnd,SB_VERT,&scrollInfo,TRUE);
+        }
+      }
+    }
+  }
+
+  if ((oldlefttop.x != infoPtr->lefttop.x) || (oldlefttop.y != infoPtr->lefttop.y))
+    LISTVIEW_ScrollWindow(hwnd,(oldlefttop.x-infoPtr->lefttop.x)*LISTVIEW_SCROLL_DIV_SIZE,(oldlefttop.y-infoPtr->lefttop.y)*infoPtr->nItemHeight,uView);
 
   return TRUE;
@@ -3277 +3250 @@
           {
             /* get position of the new item index */
-            if (ListView_GetItemPosition(hwnd, nItem, &ptItem) == FALSE)
+            if (LISTVIEW_GetItemPosition(hwnd, nItem, &ptItem) == FALSE)
               return -1;
           }
@@ -3291 +3264 @@
         lvItem.iSubItem = 0;
         if (unicode)
-          ListView_GetItemW(hwnd, &lvItem);
+          LISTVIEW_GetItem(hwnd,&lvItem,TRUE,FALSE);//CB:todo
         else
-          ListView_GetItemA(hwnd,(LVITEMA*)&lvItem);
+          LISTVIEW_GetItem(hwnd,&lvItem,FALSE,FALSE);//CB:todo
         if (rc != FALSE)
         {
@@ -3679 +3652 @@
  * [IO] LPLVITEMW : item info
  * [I] internal : if true then we will use tricks that avoid copies
- *               but are not compatible with the regular interface
+ *                but are not compatible with the regular interface
+ *                the unicode parameter is only used for NULL strings,
+ *                the caller is responsible for ASCII/UNICODE translations
  *
  * RETURN:
@@ -3685 +3660 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetItem(HWND hwnd, LPLVITEMW lpLVItem,BOOL unicode)
+static LRESULT LISTVIEW_GetItem(HWND hwnd,LPLVITEMW lpLVItem,BOOL unicode,BOOL internal)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
   BOOL bResult = FALSE;
   NMLVDISPINFOW dispInfo;
-  LISTVIEW_SUBITEM *lpSubItem;
-  LISTVIEW_ITEM *lpItem;
-  HDPA hdpaSubItems;
-
-  //TRACE("(hwnd=%x, lpLVItem=%p)\n", hwnd, lpLVItem);
-
-  if (lpLVItem != NULL)
+
+  if (lpLVItem)
   {
     if ((lpLVItem->iItem >= 0) && (lpLVItem->iItem < GETITEMCOUNT(infoPtr)))
     {
-      ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOW));
-      hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
-      if (hdpaSubItems != NULL)
-      {
-        lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
-        if (lpItem != NULL)
+      HDPA hdpaSubItems;
+
+      ZeroMemory(&dispInfo,sizeof(NMLVDISPINFOW));
+      hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems,lpLVItem->iItem);
+      if (hdpaSubItems)
+      {
+        LISTVIEW_ITEM *lpItem = (LISTVIEW_ITEM*)DPA_GetPtr(hdpaSubItems,0);
+
+        if (lpItem)
         {
           bResult = TRUE;
@@ -3713 +3686 @@
             LPWSTR textW = NULL;
 
-            if ((lpItem->iImage == I_IMAGECALLBACK) &&
-                (lpLVItem->mask & LVIF_IMAGE))
-            {
+            if ((lpItem->iImage == I_IMAGECALLBACK) && (lpLVItem->mask & LVIF_IMAGE))
               dispInfo.item.mask |= LVIF_IMAGE;
-            }
-
-            if ((lpItem->pszText == LPSTR_TEXTCALLBACKW) &&
-                (lpLVItem->mask & LVIF_TEXT))
+
+            if ((lpItem->pszText == LPSTR_TEXTCALLBACKW) && (lpLVItem->mask & LVIF_TEXT))
             {
               dispInfo.item.mask |= LVIF_TEXT;
@@ -3754 +3723 @@
             {
               lpLVItem->iImage = dispInfo.item.iImage;
-            }
-            else if (lpLVItem->mask & LVIF_IMAGE)
-            {
-              lpLVItem->iImage = lpItem->iImage;
-            }
+              if (dispInfo.item.mask & LVIF_DI_SETITEM)
+                lpItem->iImage = dispInfo.item.iImage;
+            } else if (lpLVItem->mask & LVIF_IMAGE)
+                lpLVItem->iImage = lpItem->iImage;
 
             if (dispInfo.item.mask & LVIF_TEXT)
@@ -3771 +3739 @@
                   INT len = dispInfo.item.pszText ? lstrlenA((LPSTR)dispInfo.item.pszText):0;
 
-                  COMCTL32_Free(lpItem->pszText);
+                  if (lpItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(lpItem->pszText);
                   if (len > 0)
                   {
@@ -3783 +3751 @@
               if (dispInfo.item.pszText == NULL)
               {
-                if (unicode)
-                  lpLVItem->pszText[0] = L'\0';
-                else
-                  ((LPSTR)lpLVItem->pszText)[0] = '\0';
+                if (!internal)
+                {
+                  if (unicode)
+                    lpLVItem->pszText[0] = L'\0';
+                  else
+                    ((LPSTR)lpLVItem->pszText)[0] = '\0';
+                } else
+                {
+                  lpLVItem->pszText = NULL;
+                  ((LPLVINTERNALITEMW)lpLVItem)->unicode = unicode;
+                }
               } else
               {
-                if (unicode)
+                if (internal)
                 {
+                  lpLVItem->pszText = dispInfo.item.pszText;
                   if (isUnicodeNotify(&infoPtr->header))
-                    lstrcpynW(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
-                  else
-                    lstrcpynAtoW(lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
-                  lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  {
+                    ((LPLVINTERNALITEMW)lpLVItem)->unicode = TRUE;
+                    if (textW == dispInfo.item.pszText)
+                    {
+                      ((LPLVINTERNALITEMW)lpLVItem)->mustFree = TRUE;
+                      textW = NULL;
+                    } else ((LPLVINTERNALITEMW)lpLVItem)->mustFree = FALSE;
+                  } else
+                  {
+                    ((LPLVINTERNALITEMW)lpLVItem)->unicode = FALSE;
+                    if (textA == (LPSTR)dispInfo.item.pszText)
+                    {
+                      ((LPLVINTERNALITEMW)lpLVItem)->mustFree = TRUE;
+                      textA = NULL;
+                    } else ((LPLVINTERNALITEMW)lpLVItem)->mustFree = FALSE;
+                  }
                 } else
                 {
-                  if (isUnicodeNotify(&infoPtr->header))
-                    lstrcpynWtoA((LPSTR)lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
-                  else
-                    lstrcpynA((LPSTR)lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
-                  ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
+                  if (unicode)
+                  {
+                    if (isUnicodeNotify(&infoPtr->header))
+                      lstrcpynW(lpLVItem->pszText,dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    else
+                      lstrcpynAtoW(lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  } else
+                  {
+                    if (isUnicodeNotify(&infoPtr->header))
+                      lstrcpynWtoA((LPSTR)lpLVItem->pszText,dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    else
+                      lstrcpynA((LPSTR)lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
+                  }
                 }
               }
-            }
-            else if (lpLVItem->mask & LVIF_TEXT)
+            } else if (lpLVItem->mask & LVIF_TEXT)
             {
               if (lpItem->pszText != NULL)
               {
-                if (unicode)
+                if (internal)
                 {
-                  lstrcpynW(lpLVItem->pszText,lpItem->pszText,lpLVItem->cchTextMax);
-                  lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  lpLVItem->pszText = lpItem->pszText;
+                  ((LPLVINTERNALITEMW)lpLVItem)->unicode = TRUE;
                 } else
                 {
-                  lstrcpynWtoA((LPSTR)lpLVItem->pszText,lpItem->pszText,lpLVItem->cchTextMax);
-                  ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
+                  if (unicode)
+                  {
+                    lstrcpynW(lpLVItem->pszText,lpItem->pszText,lpLVItem->cchTextMax);
+                    lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  } else
+                  {
+                    lstrcpynWtoA((LPSTR)lpLVItem->pszText,lpItem->pszText,lpLVItem->cchTextMax);
+                    ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
+                  }
                 }
-              }
-              else
+              } else
               {
-                if (unicode)
-                  ZeroMemory(lpLVItem->pszText,sizeof(WCHAR)*lpLVItem->cchTextMax);
-                else
-                  ZeroMemory(lpLVItem->pszText,sizeof(CHAR)*lpLVItem->cchTextMax);
+                if (internal)
+                {
+                  lpLVItem->pszText = NULL;
+                  ((LPLVINTERNALITEMW)lpLVItem)->unicode = unicode;
+                } else
+                {
+                  if (unicode)
+                    lpLVItem->pszText[0] = 0;
+                  else
+                    ((CHAR*)lpLVItem->pszText)[0] = 0;
+                }
               }
             }
@@ -3835 +3845 @@
               lpLVItem->state |= (dispInfo.item.state &
                                   dispInfo.item.stateMask);
-            }
-            else if (lpLVItem->mask & LVIF_STATE)
-            {
-              lpLVItem->state = lpItem->state & lpLVItem->stateMask;
-            }
+            } else if (lpLVItem->mask & LVIF_STATE)
+                lpLVItem->state = lpItem->state & lpLVItem->stateMask;
 
             if (lpLVItem->mask & LVIF_PARAM)
-            {
               lpLVItem->lParam = lpItem->lParam;
-            }
 
             if (lpLVItem->mask & LVIF_INDENT)
-            {
               lpLVItem->iIndent = lpItem->iIndent;
-            }
+
             if (textA) COMCTL32_Free(textA);
             if (textW) COMCTL32_Free(textW);
-          }
-          else
+          } else //SubItem
           {
             CHAR* textA = NULL;
             WCHAR* textW = NULL;
-            lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems,
-                                               lpLVItem->iSubItem);
-            if (lpSubItem != NULL)
+            LISTVIEW_SUBITEM *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems,lpLVItem->iSubItem);
+
+            if (lpSubItem)
             {
-              if ((lpSubItem->iImage == I_IMAGECALLBACK) &&
-                  (lpLVItem->mask & LVIF_IMAGE))
-              {
+              if ((lpSubItem->iImage == I_IMAGECALLBACK) && (lpLVItem->mask & LVIF_IMAGE))
                 dispInfo.item.mask |= LVIF_IMAGE;
-              }
-
-              if ((lpSubItem->pszText == LPSTR_TEXTCALLBACKW) &&
-                  (lpLVItem->mask & LVIF_TEXT))
+
+              if ((lpSubItem->pszText == LPSTR_TEXTCALLBACKW) && (lpLVItem->mask & LVIF_TEXT))
               {
                 dispInfo.item.mask |= LVIF_TEXT;
@@ -3884 +3883 @@
                 }
               }
-            }
-            else
+            } else //lpSubItem == NULL
             {
               if (lpLVItem->mask & LVIF_IMAGE)
-              {
                 dispInfo.item.mask |= LVIF_IMAGE;
-              }
 
               if (lpLVItem->mask & LVIF_TEXT)
@@ -3915 +3911 @@
               dispInfo.item.iSubItem = lpLVItem->iSubItem;
               dispInfo.item.lParam = lpItem->lParam;
-              sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? LVN_GETDISPINFOW:LVN_GETDISPINFOW,&dispInfo.hdr);
+              sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? LVN_GETDISPINFOW:LVN_GETDISPINFOA,&dispInfo.hdr);
             }
 
@@ -3921 +3917 @@
             {
               lpLVItem->iImage = dispInfo.item.iImage;
-            }
-            else if (lpLVItem->mask & LVIF_IMAGE)
-            {
-              lpLVItem->iImage = lpItem->iImage;
-            }
+              if (dispInfo.item.mask & LVIF_DI_SETITEM)
+                lpSubItem->iImage = dispInfo.item.iImage;
+            } else if (lpLVItem->mask & LVIF_IMAGE)
+                lpLVItem->iImage = lpSubItem->iImage;
 
             if (dispInfo.item.mask & LVIF_PARAM)
-            {
-                lpLVItem->lParam = dispInfo.item.lParam;
-            }
+              lpLVItem->lParam = dispInfo.item.lParam;
             else if (lpLVItem->mask & LVIF_PARAM)
-            {
-                lpLVItem->lParam = lpItem->lParam;
-            }
+              lpLVItem->lParam = lpItem->lParam;
 
             if (dispInfo.item.mask & LVIF_TEXT)
             {
-              if (dispInfo.item.mask & LVIF_DI_SETITEM)
+              if ((dispInfo.item.mask & LVIF_DI_SETITEM) && lpSubItem)
               {
-                if (lpSubItem)
+                if (isUnicodeNotify(&infoPtr->header))
                 {
+                  Str_SetPtrW(&lpSubItem->pszText,dispInfo.item.pszText);
+                } else
+                {
+                  INT len = dispInfo.item.pszText ? lstrlenA((LPSTR)dispInfo.item.pszText):0;
+
+                  if (lpSubItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(lpSubItem->pszText);
+                  if (len > 0)
+                  {
+                    len++;
+                    lpSubItem->pszText = (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
+                    lstrcpyAtoW(lpSubItem->pszText,(LPSTR)dispInfo.item.pszText);
+                  } else lpSubItem->pszText = NULL;
+                }
+              }
+              /* Make sure the source string is valid */
+              if (dispInfo.item.pszText == NULL)
+              {
+                if (internal)
+                {
+                  lpLVItem->pszText = NULL;
+                  ((LPLVINTERNALITEMW)lpLVItem)->unicode = unicode;
+                } else
+                {
+                  if (unicode)
+                    lpLVItem->pszText[0] = L'\0';
+                  else
+                    ((LPSTR)lpLVItem->pszText)[0] = '\0';
+                }
+              } else
+              {
+                if (internal)
+                {
+                  lpLVItem->pszText = dispInfo.item.pszText;
                   if (isUnicodeNotify(&infoPtr->header))
                   {
-                    Str_SetPtrW(&lpSubItem->pszText,dispInfo.item.pszText);
+                    ((LPLVINTERNALITEMW)lpLVItem)->unicode = TRUE;
+                    if (textW == dispInfo.item.pszText)
+                    {
+                      ((LPLVINTERNALITEMW)lpLVItem)->mustFree = TRUE;
+                      textW = NULL;
+                    } else ((LPLVINTERNALITEMW)lpLVItem)->mustFree = FALSE;
                   } else
                   {
-                    INT len = dispInfo.item.pszText ? lstrlenA((LPSTR)dispInfo.item.pszText):0;
-
-                    COMCTL32_Free(lpSubItem->pszText);
-                    if (len > 0)
+                    ((LPLVINTERNALITEMW)lpLVItem)->unicode = FALSE;
+                    if (textA == (LPSTR)dispInfo.item.pszText)
                     {
-                      len++;
-                      lpSubItem->pszText = (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
-                      lstrcpyAtoW(lpSubItem->pszText,(LPSTR)dispInfo.item.pszText);
-                    } else lpSubItem->pszText = NULL;
+                      ((LPLVINTERNALITEMW)lpLVItem)->mustFree = TRUE;
+                      textA = NULL;
+                    } else ((LPLVINTERNALITEMW)lpLVItem)->mustFree = FALSE;
+                  }
+                } else
+                {
+                  if (unicode)
+                  {
+                    if (isUnicodeNotify(&infoPtr->header))
+                      lstrcpynW(lpLVItem->pszText,dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    else
+                      lstrcpynAtoW(lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  } else
+                  {
+                    if (isUnicodeNotify(&infoPtr->header))
+                      lstrcpynWtoA((LPSTR)lpLVItem->pszText,dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    else
+                      lstrcpynA((LPSTR)lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
+                    ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
                   }
                 }
               }
-              /* Make sure the source string is valid */
-
-              if (dispInfo.item.pszText == NULL)
+            } else if (lpLVItem->mask & LVIF_TEXT)
+            {
+              if (lpSubItem->pszText)
               {
-                if (unicode)
-                  lpLVItem->pszText[0] = L'\0';
-                else
-                  ((LPSTR)lpLVItem->pszText)[0] = '\0';
+                if (internal)
+                {
+                  lpLVItem->pszText = lpSubItem->pszText;
+                  ((LPLVINTERNALITEMW)lpLVItem)->unicode = TRUE;
+                } else
+                {
+                  if (unicode)
+                  {
+                    lstrcpynW(lpLVItem->pszText,lpSubItem->pszText,lpLVItem->cchTextMax);
+                    lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  } else
+                  {
+                    lstrcpynWtoA((LPSTR)lpLVItem->pszText,lpSubItem->pszText,lpLVItem->cchTextMax);
+                    ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
+                  }
+                }
               } else
               {
-                if (unicode)
+                if (internal)
                 {
-                  if (isUnicodeNotify(&infoPtr->header))
-                    lstrcpynW(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
-                  else
-                    lstrcpynAtoW(lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
-                  lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
+                  lpLVItem->pszText = NULL;
+                  ((LPLVINTERNALITEMW)lpLVItem)->unicode = unicode;
                 } else
                 {
-                  if (isUnicodeNotify(&infoPtr->header))
-                    lstrcpynWtoA((LPSTR)lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
+                  if (unicode)
+                    lpLVItem->pszText[0] = 0;
                   else
-                    lstrcpynA((LPSTR)lpLVItem->pszText,(LPSTR)dispInfo.item.pszText,lpLVItem->cchTextMax);
-                  ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
+                    ((CHAR*)lpLVItem->pszText)[0] = 0;
                 }
               }
             }
-            else if (lpLVItem->mask & LVIF_TEXT)
-            {
-              if (lpSubItem->pszText != NULL)
-              {
-                if (unicode)
-                {
-                  lstrcpynW(lpLVItem->pszText,lpSubItem->pszText,lpLVItem->cchTextMax);
-                  lpLVItem->pszText[lpLVItem->cchTextMax-1] = L'\0';
-                } else
-                {
-                  lstrcpynWtoA((LPSTR)lpLVItem->pszText,lpSubItem->pszText,lpLVItem->cchTextMax);
-                  ((LPSTR)lpLVItem->pszText)[lpLVItem->cchTextMax-1] = '\0';
-                }
-              }
-              else
-              {
-                if (unicode)
-                  ZeroMemory(lpLVItem->pszText,sizeof(WCHAR)*lpLVItem->cchTextMax);
-                else
-                  ZeroMemory(lpLVItem->pszText,sizeof(CHAR)*lpLVItem->cchTextMax);
-              }
-            }
+            if (textA) COMCTL32_Free(textA);
+            if (textW) COMCTL32_Free(textW);
           }
         }
@@ -4071 +4102 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem,
-                                     LPPOINT lpptPosition)
+static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem, LPPOINT lpptPosition)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
@@ -4091 +4121 @@
     {
       bResult = TRUE;
-      nItem = nItem - ListView_GetTopIndex(hwnd);
+      nItem = nItem - LISTVIEW_GetTopIndex(hwnd);
       nCountPerColumn = LISTVIEW_GetCountPerColumn(hwnd);
       if (nItem < 0)
@@ -4117 +4147 @@
       bResult = TRUE;
       lpptPosition->x = REPORT_MARGINX;
-      lpptPosition->y = ((nItem - ListView_GetTopIndex(hwnd)) *
+      lpptPosition->y = ((nItem - LISTVIEW_GetTopIndex(hwnd)) *
                          infoPtr->nItemHeight) + infoPtr->rcList.top;
     }
@@ -4137 +4167 @@
 
   return bResult;
+}
+
+//same as ListView_GetItemRect, but direct call
+static LRESULT LISTVIEW_GetItemRect(HWND hwnd,INT nItem,LPRECT lprc,INT code)
+{
+  if (lprc) lprc->left = code;
+  return LISTVIEW_GetItemRect(hwnd,nItem,lprc);
 }
 
@@ -4164 +4201 @@
   INT nLabelWidth;
   TEXTMETRICA tm;
-
-//  TRACE("(hwnd=%x, nItem=%d, lprc=%p)\n", hwnd, nItem, lprc);
-
+//CB: todo: LVS_REPORT view: clip text rect to header item width!
+//          large icon view: text rect is wrong!
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) && (lprc != NULL))
   {
-    if (ListView_GetItemPosition(hwnd, nItem, &ptItem) != FALSE)
+    if (LISTVIEW_GetItemPosition(hwnd, nItem, &ptItem) != FALSE)
     {
       switch(lprc->left)
@@ -4479 +4515 @@
 INT LISTVIEW_GetLabelWidth(HWND hwnd, INT nItem)
 {
-  WCHAR szDispText[DISP_TEXT_SIZE];
   INT nLabelWidth = 0;
-  LVITEMW lvItem;
-
-//  TRACE("(hwnd=%x, nItem=%d)\n", hwnd, nItem);
+  LVINTERNALITEMW lvItem;
 
   ZeroMemory(&lvItem, sizeof(LVITEMW));
-  lvItem.mask = LVIF_TEXT;
-  lvItem.iItem = nItem;
-  lvItem.cchTextMax = DISP_TEXT_SIZE;
-  lvItem.pszText = szDispText;
-  if (LISTVIEW_GetItem(hwnd,&lvItem,TRUE) != FALSE)
-  {
-    nLabelWidth = ListView_GetStringWidthW(hwnd,lvItem.pszText);
-  }
+  lvItem.header.mask = LVIF_TEXT;
+  lvItem.header.iItem = nItem;
+  lvItem.header.cchTextMax = DISP_TEXT_SIZE;
+  lvItem.header.pszText = NULL;
+  lvItem.mustFree = FALSE;
+  if (LISTVIEW_GetItem(hwnd,(LPLVITEMW)&lvItem,TRUE,TRUE))
+    nLabelWidth = LISTVIEW_GetStringWidth(hwnd,lvItem.header.pszText,lvItem.unicode);
+  if (lvItem.mustFree) COMCTL32_Free(lvItem.header.pszText);
 
   return nLabelWidth;
@@ -4551 +4584 @@
     lvItem.stateMask = uMask;
     lvItem.mask = LVIF_STATE;
-    if (LISTVIEW_GetItem(hwnd,&lvItem,TRUE) != FALSE)
+    if (LISTVIEW_GetItem(hwnd,&lvItem,TRUE,FALSE) != FALSE)
     {
       uState = lvItem.state;
@@ -4584 +4617 @@
       lpLVItem->mask = LVIF_TEXT;
       lpLVItem->iItem = nItem;
-      if (LISTVIEW_GetItem(hwnd,lpLVItem,unicode) != FALSE)
+      if (LISTVIEW_GetItem(hwnd,lpLVItem,unicode,FALSE) != FALSE) //CB: todo
       {
         nLength = unicode ? lstrlenW(lpLVItem->pszText):lstrlenA((LPSTR)lpLVItem->pszText);
@@ -4639 +4672 @@
         {
           nItem--;
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4647 +4680 @@
         lvFindInfo.flags = LVFI_NEARESTXY;
         lvFindInfo.vkDirection = VK_UP;
-        ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
-        {
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+        LISTVIEW_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
+        while ((nItem = LISTVIEW_FindItem(hwnd,nItem,&lvFindInfo,TRUE)) != -1)
+        {
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4662 +4695 @@
         {
           nItem++;
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4670 +4703 @@
         lvFindInfo.flags = LVFI_NEARESTXY;
         lvFindInfo.vkDirection = VK_DOWN;
-        ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
-        {
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+        LISTVIEW_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
+        while ((nItem = LISTVIEW_FindItem(hwnd,nItem,&lvFindInfo,TRUE)) != -1)
+        {
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4686 +4719 @@
         {
           nItem -= nCountPerColumn;
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4694 +4727 @@
         lvFindInfo.flags = LVFI_NEARESTXY;
         lvFindInfo.vkDirection = VK_LEFT;
-        ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
-        {
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+        LISTVIEW_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
+        while ((nItem = LISTVIEW_FindItem(hwnd,nItem,&lvFindInfo,TRUE)) != -1)
+        {
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4710 +4743 @@
         {
           nItem += nCountPerColumn;
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4718 +4751 @@
         lvFindInfo.flags = LVFI_NEARESTXY;
         lvFindInfo.vkDirection = VK_RIGHT;
-        ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
-        {
-          if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
+        LISTVIEW_GetItemPosition(hwnd,nItem,&lvFindInfo.pt);
+        while ((nItem = LISTVIEW_FindItem(hwnd,nItem,&lvFindInfo,TRUE)) != -1)
+        {
+          if ((LISTVIEW_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
             return nItem;
         }
@@ -4733 +4766 @@
       for (i = nItem; i < GETITEMCOUNT(infoPtr); i++)
       {
-        if ((ListView_GetItemState(hwnd, i, uMask) & uMask) == uMask)
+        if ((LISTVIEW_GetItemState(hwnd, i, uMask) & uMask) == uMask)
           return i;
       }
@@ -4758 +4791 @@
 static LRESULT LISTVIEW_GetOrigin(HWND hwnd, LPPOINT lpptOrigin)
 {
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = lStyle & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+  DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
   BOOL bResult = FALSE;
 
-//  TRACE("(hwnd=%x, lpptOrigin=%p)\n", hwnd, lpptOrigin);
-
   if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
   {
-    SCROLLINFO scrollInfo;
     ZeroMemory(lpptOrigin, sizeof(POINT));
-    ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
-    scrollInfo.cbSize = sizeof(SCROLLINFO);
-
-    if (lStyle & WS_HSCROLL)
-    {
-      scrollInfo.fMask = SIF_POS;
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
-      {
-        lpptOrigin->x = -scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE;
-      }
-    }
-
-    if (lStyle & WS_VSCROLL)
-    {
-      scrollInfo.fMask = SIF_POS;
-      if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
-      {
-        lpptOrigin->y = -scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE;
-      }
-    }
+
+    if (dwStyle & WS_HSCROLL)
+      lpptOrigin->x = -infoPtr->lefttop.x*LISTVIEW_SCROLL_DIV_SIZE;
+
+    if (dwStyle & WS_VSCROLL)
+      lpptOrigin->y = -infoPtr->lefttop.y*LISTVIEW_SCROLL_DIV_SIZE;
 
     bResult = TRUE;
@@ -4813 +4830 @@
   for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
   {
-    if (ListView_GetItemState(hwnd, i, LVIS_SELECTED) & LVIS_SELECTED)
+    if (LISTVIEW_GetItemState(hwnd, i, LVIS_SELECTED) & LVIS_SELECTED)
     {
       nSelectedCount++;
@@ -5032 +5049 @@
 static LRESULT LISTVIEW_InsertColumn(HWND hwnd,INT nColumn,LPLVCOLUMNW lpColumn,BOOL unicode)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
   HDITEMW hdi;
   INT nNewColumn = -1;
 
-//  TRACE("(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn,
-//        lpColumn);
-
   if (lpColumn != NULL)
   {
@@ -5053 +5067 @@
       {
         hdi.fmt |= HDF_LEFT;
-      }
-      else
+      } else
       {
         if (lpColumn->fmt & LVCFMT_LEFT)
-        {
           hdi.fmt |= HDF_LEFT;
-        }
         else if (lpColumn->fmt & LVCFMT_RIGHT)
-        {
           hdi.fmt |= HDF_RIGHT;
-        }
         else if (lpColumn->fmt & LVCFMT_CENTER)
-        {
           hdi.fmt |= HDF_CENTER;
-        }
       }
 
@@ -5123 +5130 @@
     infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
 
-    LISTVIEW_UpdateScroll(hwnd);
-    InvalidateRect(hwnd, NULL, TRUE);
+    infoPtr->refreshFlags |= RF_UPDATESCROLL;
+    LISTVIEW_QueueRefresh(hwnd);
   }
 
@@ -5172 +5179 @@
 static LRESULT LISTVIEW_InsertItem(HWND hwnd, LPLVITEMW lpLVItem,BOOL unicode)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = lStyle & LVS_TYPEMASK;
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
+  LONG lCtrlId = GetWindowLongA(hwnd,GWL_ID);
   NMLISTVIEW nmlv;
   INT nItem = -1;
@@ -5182 +5189 @@
   LISTVIEW_ITEM *lpItem = NULL;
 
-  if (lpLVItem != NULL)
+  if (lpLVItem)
   {
     /* make sure it's not a subitem; cannot insert a subitem */
@@ -5188 +5195 @@
     {
       lpItem = (LISTVIEW_ITEM *)COMCTL32_Alloc(sizeof(LISTVIEW_ITEM));
-      if (lpItem != NULL)
+      if (lpItem)
       {
         ZeroMemory(lpItem, sizeof(LISTVIEW_ITEM));
@@ -5200 +5207 @@
             if (nItem != -1)
             {
-              if ( ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
-                      && !(lStyle & LVS_OWNERDRAWFIXED)
+              if ( ((dwStyle & LVS_SORTASCENDING) || (dwStyle & LVS_SORTDESCENDING))
+                      && !(dwStyle & LVS_OWNERDRAWFIXED)
                       && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText) )
               {
@@ -5251 +5258 @@
                 if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
                 {
-                  if (lStyle & LVS_ALIGNLEFT)
+                  if (dwStyle & LVS_ALIGNLEFT)
                   {
                     LISTVIEW_AlignLeft(hwnd);
@@ -5261 +5268 @@
                 }
 
-                LISTVIEW_UpdateScroll(hwnd);
                 /* refresh client area */
-                InvalidateRect(hwnd, NULL, TRUE);
+                infoPtr->refreshFlags |= RF_UPDATESCROLL;
+                LISTVIEW_QueueRefresh(hwnd);
               }
             }
@@ -5274 +5281 @@
   /* free memory if unsuccessful */
   if ((nItem == -1) && (lpItem != NULL))
-  {
     COMCTL32_Free(lpItem);
-  }
 
   return nItem;
@@ -5298 +5303 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
   BOOL bResult = FALSE;
-  RECT rc;
 
   if (nFirst <= nLast)
@@ -5307 +5311 @@
       {
         /* bResult = */
-        InvalidateRect(hwnd, &rc, TRUE);
+        LISTVIEW_Refresh(hwnd);
       }
     }
@@ -5333 +5337 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
 
-  infoPtr->clrBk = clrBk;
-  InvalidateRect(hwnd, NULL, TRUE);
+  if (infoPtr->clrBk != clrBk)
+  {
+    infoPtr->clrBk = clrBk;
+    LISTVIEW_Refresh(hwnd);
+  }
 
   return TRUE;
@@ -5544 +5551 @@
     infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
 
-    InvalidateRect(hwnd, NULL, TRUE); // force redraw of the listview
+    LISTVIEW_QueueRefresh(hwnd); // force redraw of the listview
 
     return lret;
@@ -5646 +5653 @@
 }
 
-
 /***
  * DESCRIPTION:
@@ -5659 +5665 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetItemHandler(HWND hwnd,LPLVITEMW lpLVItem,BOOL unicode)
+static LRESULT LISTVIEW_SetItem(HWND hwnd,LPLVITEMW lpLVItem,BOOL unicode)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
   BOOL bResult = FALSE;
+  HDPA hdpaSubItems;
+  NMLISTVIEW nmlv;
 
   if (lpLVItem != NULL)
@@ -5670 +5678 @@
       if (lpLVItem->iSubItem == 0)
       {
-        bResult = LISTVIEW_SetItem(hwnd,lpLVItem,unicode);
-      }
-      else
-      {
-        bResult = LISTVIEW_SetSubItem(hwnd,lpLVItem,unicode);
-      }
-    }
-  }
-
+        hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
+        if (hdpaSubItems)
+        {
+          LISTVIEW_ITEM *lpItem;
+
+          lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, lpLVItem->iSubItem);
+          if (lpItem)
+          {
+            UINT uChanged;
+
+            ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
+            nmlv.lParam = lpItem->lParam;
+            uChanged = LISTVIEW_GetItemChanges(lpItem,lpLVItem,unicode);
+            if (uChanged != 0)
+            {
+              if (uChanged & LVIF_STATE)
+              {
+                nmlv.uNewState = lpLVItem->state & lpLVItem->stateMask;
+                nmlv.uOldState = lpItem->state & lpLVItem->stateMask;
+              }
+
+              nmlv.uChanged = uChanged;
+              nmlv.iItem = lpLVItem->iItem;
+              nmlv.lParam = lpItem->lParam;
+              /* send LVN_ITEMCHANGING notification */
+              sendNotify(hwnd,LVN_ITEMCHANGING,&nmlv.hdr);
+
+              /* copy information */
+              bResult = LISTVIEW_InitItem(hwnd, lpItem, lpLVItem,unicode);
+
+              /* send LVN_ITEMCHANGED notification */
+              sendNotify(hwnd,LVN_ITEMCHANGED,&nmlv.hdr);
+
+              LISTVIEW_RefreshItem(hwnd,lpLVItem->iItem);
+            } else
+                bResult = TRUE;
+          }
+        }
+      } else //sub-item
+      {
+        hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems,lpLVItem->iItem);
+        if (hdpaSubItems)
+        {
+          /* set subitem only if column is present */
+          if (Header_GetItemCount(infoPtr->hwndHeader) > lpLVItem->iSubItem)
+          {
+            LISTVIEW_SUBITEM *lpSubItem;
+
+            lpSubItem = LISTVIEW_GetSubItem(hdpaSubItems,lpLVItem->iSubItem);
+            if (lpSubItem)
+              bResult = LISTVIEW_InitSubItem(hwnd,lpSubItem,lpLVItem,unicode);
+            else
+              bResult = LISTVIEW_AddSubItem(hwnd,lpLVItem,unicode);
+
+            LISTVIEW_RefreshSubItem(hwnd,lpLVItem->iItem,lpLVItem->iSubItem);
+          }
+        }
+      }
+    }
+  }
 
   return bResult;
@@ -5742 +5801 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_SetItemPosition(HWND hwnd, INT nItem,
-                                     INT nPosX, INT nPosY)
+static BOOL LISTVIEW_SetItemPosition(HWND hwnd, INT nItem, INT nPosX, INT nPosY)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
@@ -5751 +5809 @@
   BOOL bResult = FALSE;
 
-//  TRACE("(hwnd=%x,nItem=%d,X=%d,Y=%d)\n", hwnd, nItem, nPosX, nPosY);
-
   if ((nItem >= 0) || (nItem < GETITEMCOUNT(infoPtr)))
   {
@@ -5776 +5832 @@
 /* LISTVIEW_SetItemPosition32 */
 
+//replaces ListView_SetItemState macro
+static LRESULT LISTVIEW_SetItemState(HWND hwnd,INT nItem,DWORD data,DWORD mask)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  LVITEMW lvItem;
+  BOOL bResult;
+
+  ZeroMemory(&lvItem, sizeof(LVITEMW));
+  lvItem.mask = LVIF_STATE;
+  lvItem.stateMask = mask;
+  lvItem.state = data;
+
+  if (nItem == -1)
+  {
+    bResult = TRUE;
+
+    /* apply to all items */
+    for (INT i = 0; i< GETITEMCOUNT(infoPtr); i++)
+    {
+      lvItem.iItem = i;
+      if (!LISTVIEW_SetItem(hwnd,&lvItem,TRUE))
+        bResult = FALSE;
+    }
+  } else
+  {
+    lvItem.iItem = nItem;
+    bResult = LISTVIEW_SetItem(hwnd,&lvItem,TRUE);
+  }
+
+  return bResult;
+}
+
 /***
  * DESCRIPTION:
@@ -5789 +5877 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetItemState(HWND hwnd, INT nItem, LPLVITEMW lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+static LRESULT LISTVIEW_SetItemState(HWND hwnd,INT nItem,LPLVITEMW lpLVItem)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
   BOOL bResult = FALSE;
   LVITEMW lvItem;
   INT i;
 
+  ZeroMemory(&lvItem, sizeof(LVITEMW));
+  lvItem.mask = LVIF_STATE;
+  lvItem.state = lpLVItem->state;
+  lvItem.stateMask = lpLVItem->stateMask;
+
   if (nItem == -1)
   {
     bResult = TRUE;
-    ZeroMemory(&lvItem, sizeof(LVITEMW));
-    lvItem.mask = LVIF_STATE;
-    lvItem.state = lpLVItem->state;
-    lvItem.stateMask = lpLVItem->stateMask ;
 
     /* apply to all items */
@@ -5808 +5897 @@
     {
       lvItem.iItem = i;
-      if (ListView_SetItemW(hwnd,&lvItem) == FALSE)
-      {
+      if (!LISTVIEW_SetItem(hwnd,&lvItem,TRUE))
         bResult = FALSE;
-      }
-    }
-  }
-  else
-  {
-    ZeroMemory(&lvItem, sizeof(LVITEMW));
-    lvItem.mask = LVIF_STATE;
-    lvItem.state = lpLVItem->state;
-    lvItem.stateMask = lpLVItem->stateMask;
+    }
+  } else
+  {
     lvItem.iItem = nItem;
-    bResult = ListView_SetItemW(hwnd, &lvItem);
+    bResult = LISTVIEW_SetItem(hwnd,&lvItem,TRUE);
   }
 
@@ -5853 +5935 @@
     lvItem.iItem = nItem;
     lvItem.iSubItem = lpLVItem->iSubItem;
-    if (unicode)
-      bResult = ListView_SetItemW(hwnd,&lvItem);
-    else
-      bResult = ListView_SetItemA(hwnd,&lvItem);
+    bResult = LISTVIEW_SetItem(hwnd,&lvItem,unicode);
   }
 
@@ -5897 +5976 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
 
-  infoPtr->clrTextBk = clrTextBk;
-  InvalidateRect(hwnd, NULL, TRUE);
+  if (infoPtr->clrTextBk != clrTextBk)
+  {
+    infoPtr->clrTextBk = clrTextBk;
+    LISTVIEW_Refresh(hwnd);
+  }
 
   return TRUE;
@@ -5919 +6001 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
 
-  infoPtr->clrText = clrText;
-  InvalidateRect(hwnd, NULL, TRUE);
+  if (infoPtr->clrText != clrText)
+  {
+    infoPtr->clrText = clrText;
+    LISTVIEW_Refresh(hwnd);
+  }
 
   return TRUE;
@@ -6057 +6142 @@
         ((lStyle & LVS_TYPEMASK)  == LVS_SMALLICON)))
     {
-      ListView_Arrange(hwnd, 0);
+      LISTVIEW_Arrange(hwnd, 0);
     }
     else
     {
       /* get item bounding rectangle */
-      ListView_GetItemRect(hwnd,nItem,&rc,LVIR_BOUNDS);
-      InvalidateRect(hwnd, &rc, TRUE);
+
+      LISTVIEW_GetItemRect(hwnd,nItem,&rc,LVIR_BOUNDS);
+      InvalidateRect(hwnd,&rc,TRUE);
     }
   }
@@ -6215 +6301 @@
  * [I] HWND : window handle
  * [I] INT : scroll code
- * [I] SHORT : current scroll position if scroll code is SB_THIMBPOSITION
+ * [I] SHORT : current scroll position if scroll code is SB_THUMBPOSITION
  *             or SB_THUMBTRACK.
  * [I] HWND : scrollbar control window handle
@@ -6222 +6308 @@
  * Zero
  */
-static LRESULT LISTVIEW_VScroll(HWND hwnd, INT nScrollCode, SHORT nCurrentPos,
-                                HWND hScrollWnd)
-{
-  SCROLLINFO scrollInfo;
-
-  ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
-  scrollInfo.cbSize = sizeof(SCROLLINFO);
-  scrollInfo.fMask = SIF_PAGE | SIF_POS | SIF_RANGE;
-
-  if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
-  {
-    INT nOldScrollPos = scrollInfo.nPos;
-    switch (nScrollCode)
-    {
+static LRESULT LISTVIEW_VScroll(HWND hwnd,INT nScrollCode,SHORT nCurrentPos,HWND hScrollWnd)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
+  INT maxY = infoPtr->maxScroll.y-infoPtr->scrollPage.y,oldY = infoPtr->lefttop.y;
+
+  switch (nScrollCode)
+  {
     case SB_LINEUP:
-      if (scrollInfo.nPos > scrollInfo.nMin)
-      {
-        scrollInfo.nPos--;
-      }
-    break;
+      if (infoPtr->lefttop.y > 0)
+        infoPtr->lefttop.y--;
+      break;
 
     case SB_LINEDOWN:
-      if (scrollInfo.nPos < scrollInfo.nMax)
-      {
-        scrollInfo.nPos++;
-      }
+      if (infoPtr->lefttop.y < maxY)
+        infoPtr->lefttop.y++;
       break;
 
     case SB_PAGEUP:
-      if (scrollInfo.nPos > scrollInfo.nMin)
-      {
-
-        if (scrollInfo.nPos >= scrollInfo.nPage)
-        {
-          scrollInfo.nPos -= scrollInfo.nPage;
-        }
+      if (infoPtr->lefttop.y > 0)
+      {
+        if (infoPtr->lefttop.y >= infoPtr->scrollPage.y)
+          infoPtr->lefttop.y -= infoPtr->scrollPage.y;
         else
-        {
-          scrollInfo.nPos = scrollInfo.nMin;
-        }
+          infoPtr->lefttop.y = 0;
       }
       break;
 
     case SB_PAGEDOWN:
-      if (scrollInfo.nPos < scrollInfo.nMax)
-      {
-        if (scrollInfo.nPos <= scrollInfo.nMax - scrollInfo.nPage)
-        {
-          scrollInfo.nPos += scrollInfo.nPage;
-        }
+      if (infoPtr->lefttop.y < maxY)
+      {
+        if (infoPtr->lefttop.y <= maxY-infoPtr->scrollPage.y)
+          infoPtr->lefttop.y += infoPtr->scrollPage.y;
         else
-        {
-          scrollInfo.nPos = scrollInfo.nMax;
-        }
+          infoPtr->lefttop.y = maxY;
       }
       break;
 
     case SB_THUMBTRACK:
-        scrollInfo.nPos = nCurrentPos;
-        if (scrollInfo.nPos > scrollInfo.nMax)
-            scrollInfo.nPos=scrollInfo.nMax;
-
-        if (scrollInfo.nPos < scrollInfo.nMin)
-            scrollInfo.nPos=scrollInfo.nMin;
-
+      infoPtr->lefttop.y = nCurrentPos;
+      if (infoPtr->lefttop.y > maxY)
+        infoPtr->lefttop.y = maxY;
+
+      if (infoPtr->lefttop.y < 0)
+        infoPtr->lefttop.y = 0;
       break;
-    }
-
-    if (nOldScrollPos != scrollInfo.nPos)
-    {
-      scrollInfo.fMask = SIF_POS;
-      SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
-      InvalidateRect(hwnd, NULL, TRUE);
-    }
-  }
-
-  return 0;
+  }
+
+  if (oldY != infoPtr->lefttop.y)
+  {
+    SCROLLINFO scrollInfo;
+    RECT rect;
+    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+    UINT uView =  dwStyle & LVS_TYPEMASK;
+    INT yScroll = (oldY-infoPtr->lefttop.y)*infoPtr->nItemHeight;
+
+    ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
+    scrollInfo.cbSize = sizeof(SCROLLINFO);
+    scrollInfo.nPos   = infoPtr->lefttop.y;
+    scrollInfo.fMask  = SIF_POS;
+    SetScrollInfo(hwnd,SB_VERT,&scrollInfo,TRUE);
+
+    LISTVIEW_ScrollWindow(hwnd,0,yScroll,uView);
+
+    return TRUE;
+  }
+
+  return FALSE;
 }
 
@@ -6315 +6391 @@
  * Zero
  */
-static LRESULT LISTVIEW_HScroll(HWND hwnd, INT nScrollCode, SHORT nCurrentPos,
-                                HWND hScrollWnd)
+static LRESULT LISTVIEW_HScroll(HWND hwnd,INT nScrollCode,SHORT nCurrentPos,HWND hScrollWnd)
 {
   SCROLLINFO scrollInfo;
-
+//CB: todo
   ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
   scrollInfo.cbSize = sizeof(SCROLLINFO);
@@ -6395 +6470 @@
           LISTVIEW_UpdateHeaderSize(hwnd, scrollInfo.nPos);
       }
-      InvalidateRect(hwnd, NULL, TRUE);
+      LISTVIEW_Refresh(hwnd);
     }
   }
@@ -6404 +6479 @@
 static LRESULT LISTVIEW_MouseWheel(HWND hwnd, INT wheelDelta)
 {
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
     INT gcWheelDelta = 0;
     UINT pulScrollLines = 3;
-    SCROLLINFO scrollInfo;
-
-    UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+    UINT uView = dwStyle & LVS_TYPEMASK;
 
     SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0);
     gcWheelDelta -= wheelDelta;
 
-    ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
-    scrollInfo.cbSize = sizeof(SCROLLINFO);
-    scrollInfo.fMask = SIF_POS | SIF_RANGE;
-
     switch(uView)
     {
-    case LVS_ICON:
-    case LVS_SMALLICON:
+      case LVS_ICON:
+      case LVS_SMALLICON:
        /*
         *  listview should be scrolled by a multiple of 37 dependently on its dimension or its visible item number
         *  should be fixed in the future.
         */
-        if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
-            LISTVIEW_VScroll(hwnd, SB_THUMBPOSITION, scrollInfo.nPos + (gcWheelDelta < 0) ? 37 : -37, 0);
+        if (dwStyle & WS_VSCROLL)
+          LISTVIEW_VScroll(hwnd,SB_THUMBPOSITION,infoPtr->lefttop.y+(gcWheelDelta < 0) ? 37:-37,0);
         break;
 
-    case LVS_REPORT:
+      case LVS_REPORT:
         if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines)
         {
-            if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
-            {
-                int cLineScroll = min(LISTVIEW_GetCountPerColumn(hwnd), pulScrollLines);
-                cLineScroll *= (gcWheelDelta / WHEEL_DELTA);
-                LISTVIEW_VScroll(hwnd, SB_THUMBPOSITION, scrollInfo.nPos + cLineScroll, 0);
-            }
+          if (dwStyle & WS_VSCROLL)
+          {
+            int cLineScroll = min(LISTVIEW_GetCountPerColumn(hwnd), pulScrollLines);
+
+            cLineScroll *= (gcWheelDelta / WHEEL_DELTA);
+            LISTVIEW_VScroll(hwnd,SB_THUMBPOSITION,infoPtr->lefttop.y+cLineScroll,0);
+          }
         }
         break;
 
-    case LVS_LIST:
-        LISTVIEW_HScroll(hwnd, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0, 0);
+      case LVS_LIST:
+        LISTVIEW_HScroll(hwnd,(gcWheelDelta < 0) ? SB_LINELEFT:SB_LINERIGHT,0,0);
         break;
     }
@@ -6501 +6573 @@
 
   case VK_LEFT:
-    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TOLEFT);
+    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TOLEFT);
     break;
 
   case VK_UP:
-    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_ABOVE);
+    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_ABOVE);
     break;
 
   case VK_RIGHT:
-    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TORIGHT);
+    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TORIGHT);
     break;
 
   case VK_DOWN:
-    nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_BELOW);
+    nItem = LISTVIEW_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_BELOW);
     break;
 
@@ -6526 +6598 @@
 
   if ((nItem != -1) && (nItem != infoPtr->nFocusedItem))
-  {
-    bRedraw = LISTVIEW_KeySelection(hwnd, nItem);
-    if (bRedraw != FALSE)
-    {
-      /* refresh client area */
-      InvalidateRect(hwnd, NULL, TRUE);
-      UpdateWindow(hwnd);
-    }
-  }
+    LISTVIEW_KeySelection(hwnd, nItem);
 
   return 0;
@@ -6574 +6638 @@
     LISTVIEW_INFO *infoPtr = NULL;
     INT nItem = -1;
-    BOOL bRedraw;
     INT nSize = 0;
     INT idx = 0;
@@ -6625 +6688 @@
                 {   /* get item */
                     LISTVIEW_InitLvItemStruct( item, idx, TEXT );
-                    ListView_GetItemA( hwnd, &item );
+                    LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                     /* compare items */
@@ -6641 +6704 @@
                 {
                     LISTVIEW_InitLvItemStruct( item, idx, TEXT );
-                    ListView_GetItemA( hwnd, &item );
+                    LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                     if ( strncasecmp( &( item.pszText[ 0 ] ), szCharCode, 1 ) == 0 )
@@ -6658 +6721 @@
 
                 LISTVIEW_InitLvItemStruct( item, infoPtr->nFocusedItem + 1, TEXT );
-                ListView_GetItemA( hwnd, &item );
+                LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                 if ( strncasecmp( &( item.pszText[ 0 ] ), szCharCode, 1 ) == 0 )
@@ -6670 +6733 @@
                     {
                         LISTVIEW_InitLvItemStruct( item, idx, TEXT );
-                        ListView_GetItemA( hwnd, &item );
+                        LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                         if ( strncasecmp( &( item.pszText[ 0 ] ), szCharCode, 1 ) == 0 )
@@ -6684 +6747 @@
                         {
                             LISTVIEW_InitLvItemStruct( item,idx, TEXT );
-                            ListView_GetItemA( hwnd, &item );
+                            LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                             if ( strncasecmp( &( item.pszText[ 0 ] ), szCharCode, 1 ) == 0 )
@@ -6708 +6771 @@
                 {
                     LISTVIEW_InitLvItemStruct( item,idx, TEXT );
-                    ListView_GetItemA( hwnd, &item );
+                    LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                     if ( strncasecmp( &( item.pszText[ 0 ] ), szCharCode, 1 ) == 0 )
@@ -6724 +6787 @@
                 {
                     LISTVIEW_InitLvItemStruct( item,idx, TEXT );
-                    ListView_GetItemA( hwnd, &item );
+                    LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                     if ( strncasecmp( &( item.pszText[ 0 ] ), szCharCode, 1 ) == 0 )
@@ -6745 +6808 @@
                 {   /* get item */
                     LISTVIEW_InitLvItemStruct( item, idx, TEXT );
-                    ListView_GetItemA( hwnd, &item );
+                    LISTVIEW_GetItem(hwnd,(LVITEMW*)&item,FALSE,FALSE);//CB:todo
 
                     /* compare items */
@@ -6761 +6824 @@
         return 0;
 
-    bRedraw = LISTVIEW_KeySelection(hwnd, nItem );
-    if (bRedraw != FALSE)
-    {
-        /* refresh client area */
-        InvalidateRect(hwnd, NULL, TRUE);
-        UpdateWindow(hwnd);
-    }
+    LISTVIEW_KeySelection(hwnd, nItem );
 
     /* Store the WM_CHAR for next time */
@@ -6799 +6856 @@
   infoPtr->bFocus = FALSE;
 
-  /* NEED drawing optimization ; redraw the selected items */
-  InvalidateRect(hwnd, NULL, TRUE);
+  /* redraw the selected items */
+  if (infoPtr->nFocusedItem != -1)
+    LISTVIEW_RefreshItem(hwnd,infoPtr->nFocusedItem);
 
   return 0;
@@ -6863 +6921 @@
   INT nItem;
 
-//  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX,
-//        wPosY);
-
   /* send NM_RELEASEDCAPTURE notification */
   sendNotify(hwnd,NM_RELEASEDCAPTURE);
@@ -6884 +6939 @@
     if (lStyle & LVS_SINGLESEL)
     {
-      if ((ListView_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED)
-          && infoPtr->bDoEditLabel != TRUE)
+      if ((LISTVIEW_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED) && infoPtr->bDoEditLabel != TRUE)
       {
           infoPtr->bDoEditLabel = TRUE;
@@ -6917 +6971 @@
       else
       {
-        if (ListView_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED
-            && infoPtr->bDoEditLabel != TRUE)
+        if ((LISTVIEW_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED) && (infoPtr->bDoEditLabel != TRUE))
         {
           infoPtr->bDoEditLabel = TRUE;
@@ -6934 +6987 @@
     LISTVIEW_RemoveSelections(hwnd, 0, GETITEMCOUNT(infoPtr));
   }
-
-  //InvalidateRect(hwnd, NULL, TRUE);
 
   return 0;
@@ -7069 +7120 @@
     {
       infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
-      InvalidateRect(hwnd, NULL, TRUE);
+      LISTVIEW_Refresh(hwnd);
     }
     else if((lpnmh->code ==  HDN_ITEMCLICKA) || (lpnmh->code ==  HDN_ITEMCLICKW))
@@ -7094 +7145 @@
       infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
       LISTVIEW_UpdateScroll(hwnd);
-      InvalidateRect(hwnd, NULL, TRUE);
+      LISTVIEW_Refresh(hwnd);
     }
 
@@ -7115 +7166 @@
 static LRESULT LISTVIEW_Paint(HWND hwnd, HDC hdc)
 {
-  PAINTSTRUCT ps;
-
-//   TRACE("(hwnd=%x,hdc=%x)\n", hwnd, hdc);
-
-  if (hdc == 0)
-  {
-    hdc = BeginPaint(hwnd, &ps);
-    LISTVIEW_Draw(hwnd, hdc);
-    EndPaint(hwnd, &ps);
-  }
-  else
-  {
-    LISTVIEW_Draw(hwnd, hdc);
-  }
+  if (!hdc)
+  {
+    PAINTSTRUCT ps;
+
+    hdc = BeginPaint(hwnd,&ps);
+    LISTVIEW_Draw(hwnd, hdc,&ps.rcPaint);
+    EndPaint(hwnd,&ps);
+  } else
+      LISTVIEW_Draw(hwnd,hdc,NULL);
 
   return 0;
@@ -7274 +7320 @@
   infoPtr->bFocus = TRUE;
 
-  InvalidateRect(hwnd, NULL, TRUE);
-  UpdateWindow(hwnd);
+  if (infoPtr->nFocusedItem != -1)
+    LISTVIEW_RefreshItem(hwnd,infoPtr->nFocusedItem);
 
   return 0;
@@ -7316 +7362 @@
 
   /* invalidate listview control client area */
-  InvalidateRect(hwnd, NULL, TRUE);
-
-  if (fRedraw != FALSE)
-  {
+  LISTVIEW_Refresh(hwnd);
+
+  if (fRedraw)
     UpdateWindow(hwnd);
-  }
 
   return 0;
@@ -7340 +7384 @@
 static LRESULT LISTVIEW_SetRedraw(HWND hwnd, BOOL bRedraw)
 {
-    LRESULT lResult;
-    lResult = DefWindowProcA(hwnd, WM_SETREDRAW, bRedraw, 0);
-    if(bRedraw)
-    {
-        RedrawWindow(hwnd, NULL, 0,
-            RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN | RDW_ERASENOW);
-    }
-    return lResult;
+  LRESULT lResult;
+//CB:todo
+  lResult = DefWindowProcA(hwnd, WM_SETREDRAW, bRedraw, 0);
+  //if (bRedraw)
+  //  RedrawWindow(hwnd,NULL,0,RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN | RDW_ERASENOW);
+
+  return lResult;
 }
 
@@ -7387 +7430 @@
 
   /* invalidate client area + erase background */
-  InvalidateRect(hwnd, NULL, TRUE);
+  LISTVIEW_Refresh(hwnd);//CB:tocheck
 
   return 0;
@@ -7557 +7600 @@
 
     /* invalidate client area + erase background */
-    InvalidateRect(hwnd, NULL, TRUE);
+    LISTVIEW_Refresh(hwnd);//CB:todo
 
     /* print the list of unsupported window styles */
@@ -7575 +7618 @@
 
   return 0;
-}
-
-/***
- * DESCRIPTION:
- * Window procedure of the listview control.
- *
- */
-static LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
-                                   LPARAM lParam)
-{
-  switch (uMsg)
-  {
-  case LVM_APPROXIMATEVIEWRECT:
-    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam,
-                                        LOWORD(lParam), HIWORD(lParam));
-  case LVM_ARRANGE:
-    return LISTVIEW_Arrange(hwnd, (INT)wParam);
-
-/* case LVM_CREATEDRAGIMAGE: */
-
-  case LVM_DELETEALLITEMS:
-    return LISTVIEW_DeleteAllItems(hwnd);
-
-  case LVM_DELETECOLUMN:
-    return LISTVIEW_DeleteColumn(hwnd, (INT)wParam);
-
-  case LVM_DELETEITEM:
-    return LISTVIEW_DeleteItem(hwnd, (INT)wParam);
-
-  case LVM_EDITLABELA:
-    return LISTVIEW_EditLabel(hwnd,(INT)wParam,FALSE);
-
-  case LVM_EDITLABELW:
-    return LISTVIEW_EditLabel(hwnd,(INT)wParam,TRUE);
-
-  case LVM_ENSUREVISIBLE:
-    return LISTVIEW_EnsureVisible(hwnd, (INT)wParam, (BOOL)lParam);
-
-  case LVM_FINDITEMA:
-    return LISTVIEW_FindItem(hwnd,(INT)wParam,(LPLVFINDINFOW)lParam,FALSE);
-
-  case LVM_FINDITEMW:
-    return LISTVIEW_FindItem(hwnd,(INT)wParam,(LPLVFINDINFOW)lParam,TRUE);
-
-  case LVM_GETBKCOLOR:
-    return LISTVIEW_GetBkColor(hwnd);
-
-/*      case LVM_GETBKIMAGE: */
-
-  case LVM_GETCALLBACKMASK:
-    return LISTVIEW_GetCallbackMask(hwnd);
-
-  case LVM_GETCOLUMNA:
-    return LISTVIEW_GetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,FALSE);
-
-  case LVM_GETCOLUMNW:
-    return LISTVIEW_GetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,TRUE);
-
-
-  case LVM_GETCOLUMNORDERARRAY:
-    return LISTVIEW_GetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
-
-  case LVM_GETCOLUMNWIDTH:
-    return LISTVIEW_GetColumnWidth(hwnd, (INT)wParam);
-
-  case LVM_GETCOUNTPERPAGE:
-    return LISTVIEW_GetCountPerPage(hwnd);
-
-  case LVM_GETEDITCONTROL:
-    return LISTVIEW_GetEditControl(hwnd);
-
-  case LVM_GETEXTENDEDLISTVIEWSTYLE:
-    return LISTVIEW_GetExtendedListViewStyle(hwnd);
-
-  case LVM_GETHEADER:
-    return LISTVIEW_GetHeader(hwnd);
-
-/*      case LVM_GETHOTCURSOR: */
-
-  case LVM_GETHOTITEM:
-    return LISTVIEW_GetHotItem(hwnd);
-
-/*      case LVM_GETHOVERTIME: */
-
-  case LVM_GETIMAGELIST:
-    return LISTVIEW_GetImageList(hwnd, (INT)wParam);
-
-/*      case LVM_GETISEARCHSTRING: */
-
-  case LVM_GETITEMA:
-    return LISTVIEW_GetItem(hwnd,(LPLVITEMW)lParam,FALSE);
-
-  case LVM_GETITEMW:
-    return LISTVIEW_GetItem(hwnd,(LPLVITEMW)lParam,TRUE);
-
-
-  case LVM_GETITEMCOUNT:
-    return LISTVIEW_GetItemCount(hwnd);
-
-  case LVM_GETITEMPOSITION:
-    return LISTVIEW_GetItemPosition(hwnd, (INT)wParam, (LPPOINT)lParam);
-
-  case LVM_GETITEMRECT:
-    return LISTVIEW_GetItemRect(hwnd, (INT)wParam, (LPRECT)lParam);
-
-  case LVM_GETITEMSPACING:
-    return LISTVIEW_GetItemSpacing(hwnd, (BOOL)wParam);
-
-  case LVM_GETITEMSTATE:
-    return LISTVIEW_GetItemState(hwnd, (INT)wParam, (UINT)lParam);
-
-  case LVM_GETITEMTEXTA:
-    LISTVIEW_GetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,FALSE);
-    break;
-
-  case LVM_GETITEMTEXTW:
-    LISTVIEW_GetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,TRUE);
-    break;
-
-
-  case LVM_GETNEXTITEM:
-    return LISTVIEW_GetNextItem(hwnd, (INT)wParam, LOWORD(lParam));
-
-/*      case LVM_GETNUMBEROFWORKAREAS: */
-
-  case LVM_GETORIGIN:
-    return LISTVIEW_GetOrigin(hwnd, (LPPOINT)lParam);
-
-  case LVM_GETSELECTEDCOUNT:
-    return LISTVIEW_GetSelectedCount(hwnd);
-
-  case LVM_GETSELECTIONMARK:
-    return LISTVIEW_GetSelectionMark(hwnd);
-
-  case LVM_GETSTRINGWIDTHA:
-    return LISTVIEW_GetStringWidth(hwnd,(LPWSTR)lParam,FALSE);
-
-  case LVM_GETSTRINGWIDTHW:
-    return LISTVIEW_GetStringWidth(hwnd,(LPWSTR)lParam,TRUE);
-
-/*      case LVM_GETSUBITEMRECT: */
-
-  case LVM_GETTEXTBKCOLOR:
-    return LISTVIEW_GetTextBkColor(hwnd);
-
-  case LVM_GETTEXTCOLOR:
-    return LISTVIEW_GetTextColor(hwnd);
-
-/*      case LVM_GETTOOLTIPS: */
-
-  case LVM_GETTOPINDEX:
-    return LISTVIEW_GetTopIndex(hwnd);
-
-/*      case LVM_GETUNICODEFORMAT: */
-
-  case LVM_GETVIEWRECT:
-    return LISTVIEW_GetViewRect(hwnd, (LPRECT)lParam);
-
-/*      case LVM_GETWORKAREAS: */
-
-  case LVM_HITTEST:
-    return LISTVIEW_HitTest(hwnd, (LPLVHITTESTINFO)lParam);
-
-  case LVM_INSERTCOLUMNA:
-    return LISTVIEW_InsertColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,FALSE);
-
-  case LVM_INSERTCOLUMNW:
-    return LISTVIEW_InsertColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,TRUE);
-
-  case LVM_INSERTITEMA:
-    return LISTVIEW_InsertItem(hwnd,(LPLVITEMW)lParam,FALSE);
-
-  case LVM_INSERTITEMW:
-    return LISTVIEW_InsertItem(hwnd,(LPLVITEMW)lParam,TRUE);
-
-  case LVM_REDRAWITEMS:
-    return LISTVIEW_RedrawItems(hwnd, (INT)wParam, (INT)lParam);
-
-/*   case LVM_SCROLL:  */
-/*     return LISTVIEW_Scroll(hwnd, (INT)wParam, (INT)lParam); */
-
-  case LVM_SETBKCOLOR:
-    return LISTVIEW_SetBkColor(hwnd, (COLORREF)lParam);
-
-/*      case LVM_SETBKIMAGE: */
-
-  case LVM_SETCALLBACKMASK:
-    return LISTVIEW_SetCallbackMask(hwnd, (UINT)wParam);
-
-  case LVM_SETCOLUMNA:
-    return LISTVIEW_SetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,FALSE);
-
-  case LVM_SETCOLUMNW:
-    return LISTVIEW_SetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,TRUE);
-
-  case LVM_SETCOLUMNORDERARRAY:
-    return LISTVIEW_SetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
-
-  case LVM_SETCOLUMNWIDTH:
-    return LISTVIEW_SetColumnWidth(hwnd, (INT)wParam, (INT)lParam);
-
-  case LVM_SETEXTENDEDLISTVIEWSTYLE:
-    return LISTVIEW_SetExtendedListViewStyle(hwnd, (DWORD)wParam, (DWORD)lParam);
-
-/*      case LVM_SETHOTCURSOR: */
-
-  case LVM_SETHOTITEM:
-    return LISTVIEW_SetHotItem(hwnd, (INT)wParam);
-
-/*      case LVM_SETHOVERTIME: */
-/*      case LVM_SETICONSPACING: */
-
-  case LVM_SETIMAGELIST:
-    return LISTVIEW_SetImageList(hwnd, (INT)wParam, (HIMAGELIST)lParam);
-
-  case LVM_SETITEMA:
-    return LISTVIEW_SetItemHandler(hwnd,(LPLVITEMW)lParam,FALSE);
-
-  case LVM_SETITEMW:
-    return LISTVIEW_SetItemHandler(hwnd,(LPLVITEMW)lParam,TRUE);
-
-  case LVM_SETITEMCOUNT:
-    return LISTVIEW_SetItemCount(hwnd, (INT)wParam, (DWORD)lParam);
-
-  case LVM_SETITEMPOSITION:
-    return LISTVIEW_SetItemPosition(hwnd, (INT)wParam, (INT)LOWORD(lParam),
-                                    (INT)HIWORD(lParam));
-
-/*      case LVM_SETITEMPOSITION32: */
-
-  case LVM_SETITEMSTATE:
-    return LISTVIEW_SetItemState(hwnd, (INT)wParam, (LPLVITEMW)lParam);
-
-  case LVM_SETITEMTEXTA:
-    return LISTVIEW_SetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,FALSE);
-
-  case LVM_SETITEMTEXTW:
-    return LISTVIEW_SetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,TRUE);
-
-  case LVM_SETSELECTIONMARK:
-    return LISTVIEW_SetSelectionMark(hwnd, (INT)lParam);
-
-  case LVM_SETTEXTBKCOLOR:
-    return LISTVIEW_SetTextBkColor(hwnd, (COLORREF)lParam);
-
-  case LVM_SETTEXTCOLOR:
-    return LISTVIEW_SetTextColor(hwnd, (COLORREF)lParam);
-
-/*      case LVM_SETTOOLTIPS: */
-/*      case LVM_SETUNICODEFORMAT: */
-/*      case LVM_SETWORKAREAS: */
-
-  case LVM_SORTITEMS:
-    return LISTVIEW_SortItems(hwnd, wParam, lParam);
-
-/*      case LVM_SUBITEMHITTEST: */
-
-  case LVM_UPDATE:
-    return LISTVIEW_Update(hwnd, (INT)wParam);
-
-  case WM_CHAR:
-    return LISTVIEW_ProcessLetterKeys( hwnd, wParam, lParam );
-
-  case WM_COMMAND:
-    return LISTVIEW_Command(hwnd, wParam, lParam);
-
-  case WM_CREATE:
-    return LISTVIEW_Create(hwnd, wParam, lParam);
-
-  case WM_ERASEBKGND:
-    return LISTVIEW_EraseBackground(hwnd, wParam, lParam);
-
-  case WM_GETDLGCODE:
-    return DLGC_WANTCHARS | DLGC_WANTARROWS;
-
-  case WM_GETFONT:
-    return LISTVIEW_GetFont(hwnd);
-
-  case WM_HSCROLL:
-    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam),
-                            (INT)HIWORD(wParam), (HWND)lParam);
-
-  case WM_KEYDOWN:
-    return LISTVIEW_KeyDown(hwnd, (INT)wParam, (LONG)lParam);
-
-  case WM_KILLFOCUS:
-    return LISTVIEW_KillFocus(hwnd);
-
-  case WM_LBUTTONDBLCLK:
-    return LISTVIEW_LButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
-                                HIWORD(lParam));
-
-  case WM_LBUTTONDOWN:
-    return LISTVIEW_LButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
-                                HIWORD(lParam));
-  case WM_LBUTTONUP:
-    return LISTVIEW_LButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
-                              HIWORD(lParam));
-
-/*      case WM_MOUSEMOVE: */
-/*          return LISTVIEW_MouseMove (hwnd, wParam, lParam); */
-
-  case WM_NCCREATE:
-    return LISTVIEW_NCCreate(hwnd, wParam, lParam);
-
-  case WM_NCDESTROY:
-    return LISTVIEW_NCDestroy(hwnd);
-
-  case WM_NOTIFY:
-    return LISTVIEW_Notify(hwnd, (INT)wParam, (LPNMHDR)lParam);
-
-  case WM_PAINT:
-    return LISTVIEW_Paint(hwnd, (HDC)wParam);
-
-  case WM_RBUTTONDBLCLK:
-    return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
-                                  HIWORD(lParam));
-
-  case WM_RBUTTONDOWN:
-    return LISTVIEW_RButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
-                                HIWORD(lParam));
-
-  case WM_RBUTTONUP:
-    return LISTVIEW_RButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
-                              HIWORD(lParam));
-
-  case WM_SETFOCUS:
-    return LISTVIEW_SetFocus(hwnd, (HWND)wParam);
-
-  case WM_SETFONT:
-    return LISTVIEW_SetFont(hwnd, (HFONT)wParam, (WORD)lParam);
-
-  case WM_SETREDRAW:
-    return LISTVIEW_SetRedraw(hwnd, (BOOL)wParam);
-
-  case WM_SIZE:
-    return LISTVIEW_Size(hwnd, (int)SLOWORD(lParam), (int)SHIWORD(lParam));
-
-  case WM_STYLECHANGED:
-    return LISTVIEW_StyleChanged(hwnd, wParam, (LPSTYLESTRUCT)lParam);
-
-/*      case WM_TIMER: */
-
-  case WM_VSCROLL:
-    return LISTVIEW_VScroll(hwnd, (INT)LOWORD(wParam),
-                            (INT)HIWORD(wParam), (HWND)lParam);
-
-  case WM_MOUSEWHEEL:
-      if (wParam & (MK_SHIFT | MK_CONTROL))
-          return DefWindowProcA( hwnd, uMsg, wParam, lParam );
-      return LISTVIEW_MouseWheel(hwnd, (short int)HIWORD(wParam));
-
-/*      case WM_WINDOWPOSCHANGED: */
-/*      case WM_WININICHANGE: */
-
-  default:
-    //if (uMsg >= WM_USER)
-    //{
-    //  ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam,
-    //      lParam);
-    //}
-
-    /* call default window procedure */
-    return defComCtl32ProcA(hwnd, uMsg, wParam, lParam);
-  }
-
-  return 0;
-}
-
-/***
- * DESCRIPTION:
- * Registers the window class.
- *
- * PARAMETER(S):
- * None
- *
- * RETURN:
- * None
- */
-VOID LISTVIEW_Register(VOID)
-{
-  WNDCLASSA wndClass;
-
-  ZeroMemory(&wndClass, sizeof(WNDCLASSA));
-  wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS;
-  wndClass.lpfnWndProc = (WNDPROC)LISTVIEW_WindowProc;
-  wndClass.cbClsExtra = 0;
-  wndClass.cbWndExtra = sizeof(LISTVIEW_INFO *);
-  wndClass.hCursor = LoadCursorA(0, IDC_ARROWA);
-  wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-  wndClass.lpszClassName = WC_LISTVIEWA;
-  RegisterClassA(&wndClass);
-}
-
-/***
- * DESCRIPTION:
- * Unregisters the window class.
- *
- * PARAMETER(S):
- * None
- *
- * RETURN:
- * None
- */
-VOID LISTVIEW_Unregister(VOID)
-{
-  UnregisterClassA(WC_LISTVIEWA, (HINSTANCE)NULL);
 }
 
@@ -8196 +7832 @@
     return hedit;
 }
+
+/***
+ * DESCRIPTION:
+ * Window procedure of the listview control.
+ *
+ */
+static LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
+                                   LPARAM lParam)
+{
+  switch (uMsg)
+  {
+  case LVM_APPROXIMATEVIEWRECT:
+    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam,
+                                        LOWORD(lParam), HIWORD(lParam));
+  case LVM_ARRANGE:
+    return LISTVIEW_Arrange(hwnd, (INT)wParam);
+
+/* case LVM_CREATEDRAGIMAGE: */
+
+  case LVM_DELETEALLITEMS:
+    return LISTVIEW_DeleteAllItems(hwnd);
+
+  case LVM_DELETECOLUMN:
+    return LISTVIEW_DeleteColumn(hwnd, (INT)wParam);
+
+  case LVM_DELETEITEM:
+    return LISTVIEW_DeleteItem(hwnd, (INT)wParam);
+
+  case LVM_EDITLABELA:
+    return LISTVIEW_EditLabel(hwnd,(INT)wParam,FALSE);
+
+  case LVM_EDITLABELW:
+    return LISTVIEW_EditLabel(hwnd,(INT)wParam,TRUE);
+
+  case LVM_ENSUREVISIBLE:
+    return LISTVIEW_EnsureVisible(hwnd,(INT)wParam,(BOOL)lParam);
+
+  case LVM_FINDITEMA:
+    return LISTVIEW_FindItem(hwnd,(INT)wParam,(LPLVFINDINFOW)lParam,FALSE);
+
+  case LVM_FINDITEMW:
+    return LISTVIEW_FindItem(hwnd,(INT)wParam,(LPLVFINDINFOW)lParam,TRUE);
+
+  case LVM_GETBKCOLOR:
+    return LISTVIEW_GetBkColor(hwnd);
+
+/*      case LVM_GETBKIMAGE: */
+
+  case LVM_GETCALLBACKMASK:
+    return LISTVIEW_GetCallbackMask(hwnd);
+
+  case LVM_GETCOLUMNA:
+    return LISTVIEW_GetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,FALSE);
+
+  case LVM_GETCOLUMNW:
+    return LISTVIEW_GetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,TRUE);
+
+
+  case LVM_GETCOLUMNORDERARRAY:
+    return LISTVIEW_GetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
+
+  case LVM_GETCOLUMNWIDTH:
+    return LISTVIEW_GetColumnWidth(hwnd, (INT)wParam);
+
+  case LVM_GETCOUNTPERPAGE:
+    return LISTVIEW_GetCountPerPage(hwnd);
+
+  case LVM_GETEDITCONTROL:
+    return LISTVIEW_GetEditControl(hwnd);
+
+  case LVM_GETEXTENDEDLISTVIEWSTYLE:
+    return LISTVIEW_GetExtendedListViewStyle(hwnd);
+
+  case LVM_GETHEADER:
+    return LISTVIEW_GetHeader(hwnd);
+
+/*      case LVM_GETHOTCURSOR: */
+
+  case LVM_GETHOTITEM:
+    return LISTVIEW_GetHotItem(hwnd);
+
+/*      case LVM_GETHOVERTIME: */
+
+  case LVM_GETIMAGELIST:
+    return LISTVIEW_GetImageList(hwnd, (INT)wParam);
+
+/*      case LVM_GETISEARCHSTRING: */
+
+  case LVM_GETITEMA:
+    return LISTVIEW_GetItem(hwnd,(LPLVITEMW)lParam,FALSE,FALSE);
+
+  case LVM_GETITEMW:
+    return LISTVIEW_GetItem(hwnd,(LPLVITEMW)lParam,TRUE,FALSE);
+
+
+  case LVM_GETITEMCOUNT:
+    return LISTVIEW_GetItemCount(hwnd);
+
+  case LVM_GETITEMPOSITION:
+    return LISTVIEW_GetItemPosition(hwnd, (INT)wParam, (LPPOINT)lParam);
+
+  case LVM_GETITEMRECT:
+    return LISTVIEW_GetItemRect(hwnd, (INT)wParam, (LPRECT)lParam);
+
+  case LVM_GETITEMSPACING:
+    return LISTVIEW_GetItemSpacing(hwnd, (BOOL)wParam);
+
+  case LVM_GETITEMSTATE:
+    return LISTVIEW_GetItemState(hwnd, (INT)wParam, (UINT)lParam);
+
+  case LVM_GETITEMTEXTA:
+    LISTVIEW_GetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,FALSE);
+    break;
+
+  case LVM_GETITEMTEXTW:
+    LISTVIEW_GetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,TRUE);
+    break;
+
+
+  case LVM_GETNEXTITEM:
+    return LISTVIEW_GetNextItem(hwnd, (INT)wParam, LOWORD(lParam));
+
+/*      case LVM_GETNUMBEROFWORKAREAS: */
+
+  case LVM_GETORIGIN:
+    return LISTVIEW_GetOrigin(hwnd, (LPPOINT)lParam);
+
+  case LVM_GETSELECTEDCOUNT:
+    return LISTVIEW_GetSelectedCount(hwnd);
+
+  case LVM_GETSELECTIONMARK:
+    return LISTVIEW_GetSelectionMark(hwnd);
+
+  case LVM_GETSTRINGWIDTHA:
+    return LISTVIEW_GetStringWidth(hwnd,(LPWSTR)lParam,FALSE);
+
+  case LVM_GETSTRINGWIDTHW:
+    return LISTVIEW_GetStringWidth(hwnd,(LPWSTR)lParam,TRUE);
+
+/*      case LVM_GETSUBITEMRECT: */
+
+  case LVM_GETTEXTBKCOLOR:
+    return LISTVIEW_GetTextBkColor(hwnd);
+
+  case LVM_GETTEXTCOLOR:
+    return LISTVIEW_GetTextColor(hwnd);
+
+/*      case LVM_GETTOOLTIPS: */
+
+  case LVM_GETTOPINDEX:
+    return LISTVIEW_GetTopIndex(hwnd);
+
+  case LVM_GETVIEWRECT:
+    return LISTVIEW_GetViewRect(hwnd, (LPRECT)lParam);
+
+/*      case LVM_GETWORKAREAS: */
+
+  case LVM_HITTEST:
+    return LISTVIEW_HitTest(hwnd, (LPLVHITTESTINFO)lParam);
+
+  case LVM_INSERTCOLUMNA:
+    return LISTVIEW_InsertColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,FALSE);
+
+  case LVM_INSERTCOLUMNW:
+    return LISTVIEW_InsertColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,TRUE);
+
+  case LVM_INSERTITEMA:
+    return LISTVIEW_InsertItem(hwnd,(LPLVITEMW)lParam,FALSE);
+
+  case LVM_INSERTITEMW:
+    return LISTVIEW_InsertItem(hwnd,(LPLVITEMW)lParam,TRUE);
+
+  case LVM_REDRAWITEMS:
+    return LISTVIEW_RedrawItems(hwnd, (INT)wParam, (INT)lParam);
+
+/*   case LVM_SCROLL:  */
+/*     return LISTVIEW_Scroll(hwnd, (INT)wParam, (INT)lParam); */
+
+  case LVM_SETBKCOLOR:
+    return LISTVIEW_SetBkColor(hwnd, (COLORREF)lParam);
+
+/*      case LVM_SETBKIMAGE: */
+
+  case LVM_SETCALLBACKMASK:
+    return LISTVIEW_SetCallbackMask(hwnd, (UINT)wParam);
+
+  case LVM_SETCOLUMNA:
+    return LISTVIEW_SetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,FALSE);
+
+  case LVM_SETCOLUMNW:
+    return LISTVIEW_SetColumn(hwnd,(INT)wParam,(LPLVCOLUMNW)lParam,TRUE);
+
+  case LVM_SETCOLUMNORDERARRAY:
+    return LISTVIEW_SetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
+
+  case LVM_SETCOLUMNWIDTH:
+    return LISTVIEW_SetColumnWidth(hwnd, (INT)wParam, (INT)lParam);
+
+  case LVM_SETEXTENDEDLISTVIEWSTYLE:
+    return LISTVIEW_SetExtendedListViewStyle(hwnd, (DWORD)wParam, (DWORD)lParam);
+
+/*      case LVM_SETHOTCURSOR: */
+
+  case LVM_SETHOTITEM:
+    return LISTVIEW_SetHotItem(hwnd, (INT)wParam);
+
+/*      case LVM_SETHOVERTIME: */
+/*      case LVM_SETICONSPACING: */
+
+  case LVM_SETIMAGELIST:
+    return LISTVIEW_SetImageList(hwnd, (INT)wParam, (HIMAGELIST)lParam);
+
+  case LVM_SETITEMA:
+    return LISTVIEW_SetItem(hwnd,(LPLVITEMW)lParam,FALSE);
+
+  case LVM_SETITEMW:
+    return LISTVIEW_SetItem(hwnd,(LPLVITEMW)lParam,TRUE);
+
+  case LVM_SETITEMCOUNT:
+    return LISTVIEW_SetItemCount(hwnd, (INT)wParam, (DWORD)lParam);
+
+  case LVM_SETITEMPOSITION:
+    return LISTVIEW_SetItemPosition(hwnd, (INT)wParam, (INT)LOWORD(lParam),
+                                    (INT)HIWORD(lParam));
+
+/*      case LVM_SETITEMPOSITION32: */
+
+  case LVM_SETITEMSTATE:
+    return LISTVIEW_SetItemState(hwnd, (INT)wParam, (LPLVITEMW)lParam);
+
+  case LVM_SETITEMTEXTA:
+    return LISTVIEW_SetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,FALSE);
+
+  case LVM_SETITEMTEXTW:
+    return LISTVIEW_SetItemText(hwnd,(INT)wParam,(LPLVITEMW)lParam,TRUE);
+
+  case LVM_SETSELECTIONMARK:
+    return LISTVIEW_SetSelectionMark(hwnd, (INT)lParam);
+
+  case LVM_SETTEXTBKCOLOR:
+    return LISTVIEW_SetTextBkColor(hwnd, (COLORREF)lParam);
+
+  case LVM_SETTEXTCOLOR:
+    return LISTVIEW_SetTextColor(hwnd, (COLORREF)lParam);
+
+/*      case LVM_SETTOOLTIPS: */
+/*      case LVM_SETWORKAREAS: */
+
+  case LVM_SORTITEMS:
+    return LISTVIEW_SortItems(hwnd, wParam, lParam);
+
+/*      case LVM_SUBITEMHITTEST: */
+
+  case LVM_UPDATE:
+    return LISTVIEW_Update(hwnd, (INT)wParam);
+
+  case WM_CHAR:
+    return LISTVIEW_ProcessLetterKeys( hwnd, wParam, lParam );
+
+  case WM_COMMAND:
+    return LISTVIEW_Command(hwnd, wParam, lParam);
+
+  case WM_CREATE:
+    return LISTVIEW_Create(hwnd, wParam, lParam);
+
+  case WM_ERASEBKGND:
+    return LISTVIEW_EraseBackground(hwnd, wParam, lParam);
+
+  case WM_GETDLGCODE:
+    return DLGC_WANTCHARS | DLGC_WANTARROWS;
+
+  case WM_GETFONT:
+    return LISTVIEW_GetFont(hwnd);
+
+  case WM_HSCROLL:
+    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam),
+                            (INT)HIWORD(wParam), (HWND)lParam);
+
+  case WM_KEYDOWN:
+    return LISTVIEW_KeyDown(hwnd, (INT)wParam, (LONG)lParam);
+
+  case WM_KILLFOCUS:
+    return LISTVIEW_KillFocus(hwnd);
+
+  case WM_LBUTTONDBLCLK:
+    return LISTVIEW_LButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
+                                HIWORD(lParam));
+
+  case WM_LBUTTONDOWN:
+    return LISTVIEW_LButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
+                                HIWORD(lParam));
+  case WM_LBUTTONUP:
+    return LISTVIEW_LButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
+                              HIWORD(lParam));
+
+/*      case WM_MOUSEMOVE: */
+/*          return LISTVIEW_MouseMove (hwnd, wParam, lParam); */
+
+  case WM_NCCREATE:
+    return LISTVIEW_NCCreate(hwnd, wParam, lParam);
+
+  case WM_NCDESTROY:
+    return LISTVIEW_NCDestroy(hwnd);
+
+  case WM_NOTIFY:
+    return LISTVIEW_Notify(hwnd, (INT)wParam, (LPNMHDR)lParam);
+
+  case WM_PAINT:
+    return LISTVIEW_Paint(hwnd, (HDC)wParam);
+
+  case WM_RBUTTONDBLCLK:
+    return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
+                                  HIWORD(lParam));
+
+  case WM_RBUTTONDOWN:
+    return LISTVIEW_RButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
+                                HIWORD(lParam));
+
+  case WM_RBUTTONUP:
+    return LISTVIEW_RButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
+                              HIWORD(lParam));
+
+  case WM_SETFOCUS:
+    return LISTVIEW_SetFocus(hwnd, (HWND)wParam);
+
+  case WM_SETFONT:
+    return LISTVIEW_SetFont(hwnd, (HFONT)wParam, (WORD)lParam);
+
+  case WM_SETREDRAW:
+    return LISTVIEW_SetRedraw(hwnd, (BOOL)wParam);
+
+  case WM_SIZE:
+    return LISTVIEW_Size(hwnd, (int)SLOWORD(lParam), (int)SHIWORD(lParam));
+
+  case WM_STYLECHANGED:
+    return LISTVIEW_StyleChanged(hwnd, wParam, (LPSTYLESTRUCT)lParam);
+
+  case WM_TIMER:
+    return LISTVIEW_Timer(hwnd,wParam,lParam);
+
+  case WM_VSCROLL:
+    return LISTVIEW_VScroll(hwnd,(INT)LOWORD(wParam),(INT)HIWORD(wParam),(HWND)lParam);
+
+  case WM_MOUSEWHEEL:
+      if (wParam & (MK_SHIFT | MK_CONTROL))
+          return DefWindowProcA( hwnd, uMsg, wParam, lParam );
+      return LISTVIEW_MouseWheel(hwnd, (short int)HIWORD(wParam));
+
+/*      case WM_WINDOWPOSCHANGED: */
+/*      case WM_WININICHANGE: */
+
+  default:
+    //if (uMsg >= WM_USER)
+    //{
+    //  ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam,
+    //      lParam);
+    //}
+
+    /* call default window procedure */
+    return defComCtl32ProcA(hwnd, uMsg, wParam, lParam);
+  }
+
+  return 0;
+}
+
+/***
+ * DESCRIPTION:
+ * Registers the window class.
+ *
+ * PARAMETER(S):
+ * None
+ *
+ * RETURN:
+ * None
+ */
+VOID LISTVIEW_Register(VOID)
+{
+  WNDCLASSA wndClass;
+
+  ZeroMemory(&wndClass, sizeof(WNDCLASSA));
+  wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS;
+  wndClass.lpfnWndProc = (WNDPROC)LISTVIEW_WindowProc;
+  wndClass.cbClsExtra = 0;
+  wndClass.cbWndExtra = sizeof(LISTVIEW_INFO *);
+  wndClass.hCursor = LoadCursorA(0, IDC_ARROWA);
+  wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+  wndClass.lpszClassName = WC_LISTVIEWA;
+  RegisterClassA(&wndClass);
+}
+
+/***
+ * DESCRIPTION:
+ * Unregisters the window class.
+ *
+ * PARAMETER(S):
+ * None
+ *
+ * RETURN:
+ * None
+ */
+VOID LISTVIEW_Unregister(VOID)
+{
+  UnregisterClassA(WC_LISTVIEWA, (HINSTANCE)NULL);
+}

trunk/src/comctl32/nativefont.cpp

@@ -1 @@
-/* $Id: nativefont.cpp,v 1.2 2000-03-17 17:13:23 cbratschi Exp $ */
+/* $Id: nativefont.cpp,v 1.3 2000-03-21 17:30:43 cbratschi Exp $ */
 /*
  * Native Font control
@@ -5 +5 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 2000 Christoph Bratschi
  *
  * NOTES
@@ -53 +54 @@
 }
 
+static VOID NATIVEFONT_Draw(HWND hwnd,HDC hdc,RECT *updateRect)
+{
+  drawStubControl(hwnd,hdc);
+}
 
+static LRESULT NATIVEFONT_Paint(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  HDC hdc = (HDC)wParam;
 
-static LRESULT WINAPI
-NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+  if (!hdc)
+  {
+    PAINTSTRUCT ps;
+
+    hdc = BeginPaint(hwnd,&ps);
+    NATIVEFONT_Draw(hwnd, hdc,&ps.rcPaint);
+    EndPaint(hwnd,&ps);
+  } else
+      NATIVEFONT_Draw(hwnd,hdc,NULL);
+
+  return 0;
+}
+
+static LRESULT WINAPI NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    switch (uMsg)
-    {
+  switch (uMsg)
+  {
+    case WM_CREATE:
+      return NATIVEFONT_Create(hwnd,wParam,lParam);
 
-        case WM_CREATE:
-            return NATIVEFONT_Create (hwnd, wParam, lParam);
+    case WM_DESTROY:
+      return NATIVEFONT_Destroy(hwnd,wParam,lParam);
 
-        case WM_DESTROY:
-            return NATIVEFONT_Destroy (hwnd, wParam, lParam);
+    case WM_PAINT:
+      return NATIVEFONT_Paint(hwnd,wParam,lParam);
 
-        default:
-//          ERR (nativefont, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
-    }
-    return 0;
+    default:
+      return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
+  }
+  return 0;
 }
 

trunk/src/comctl32/pager.cpp

@@ -1 @@
-/* $Id: pager.cpp,v 1.2 2000-03-17 17:13:23 cbratschi Exp $ */
+/* $Id: pager.cpp,v 1.3 2000-03-21 17:30:44 cbratschi Exp $ */
 /*
  * Pager control
@@ -201 +201 @@
     /* allocate memory for info structure */
     infoPtr = (PAGER_INFO*)initControl(hwnd,sizeof(PAGER_INFO));
-    SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
     /* set default settings */
@@ -277 +276 @@
 }
 
-
+static VOID PAGER_Draw(HWND hwnd,HDC hdc,RECT *updateRect)
+{
+  drawStubControl(hwnd,hdc);
+}
+
+static LRESULT PAGER_Paint(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  HDC hdc = (HDC)wParam;
+
+  if (!hdc)
+  {
+    PAINTSTRUCT ps;
+
+    hdc = BeginPaint(hwnd,&ps);
+    PAGER_Draw(hwnd, hdc,&ps.rcPaint);
+    EndPaint(hwnd,&ps);
+  } else
+      PAGER_Draw(hwnd,hdc,NULL);
+
+  return 0;
+}
 
 static LRESULT WINAPI
@@ -338 +357 @@
             return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
 
-/*      case WM_PAINT: */
-/*          return PAGER_Paint (hwnd, wParam); */
+        case WM_PAINT:
+          return PAGER_Paint(hwnd,wParam,lParam);
 
         case WM_SIZE:
@@ -345 +364 @@
 
         default:
-//          if (uMsg >= WM_USER)
-//              ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
+          //if (uMsg >= WM_USER)
+          //    ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
+          //         uMsg, wParam, lParam);
+          return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;

trunk/src/comctl32/rsrc.orc

@@ +1 @@
+/* $Id: rsrc.orc,v 1.3 2000-03-21 17:30:44 cbratschi Exp $ */
 #include "winuser.h"
 #include "comctl32.h"
@@ -950 +951 @@
             VALUE "FileVersion", "4.72.3110.1\0"
             VALUE "InternalName", "COMCTL32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "COMCTL32.DLL\0"

trunk/src/comctl32/toolbar.cpp

@@ -1 @@
-/* $Id: toolbar.cpp,v 1.3 2000-03-18 16:17:31 cbratschi Exp $ */
+/* $Id: toolbar.cpp,v 1.4 2000-03-21 17:30:44 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -759 +759 @@
 
     tbNotify.iItem    = pos;
-    tbNotify.tbButton = (TBBUTTON*)btnPtr;
+    tbNotify.tbButton.iBitmap   = btnPtr->iBitmap;
+    tbNotify.tbButton.idCommand = btnPtr->idCommand;
+    tbNotify.tbButton.fsState   = btnPtr->fsState;
+    tbNotify.tbButton.fsStyle   = btnPtr->fsStyle;
+    tbNotify.tbButton.dwData    = btnPtr->dwData;
+    tbNotify.tbButton.iString   = btnPtr->iString;
+
     tbNotify.cchText  = MAXTOOLNAME;
     if (unicode)
@@ -843 +849 @@
 
     tbNotify.iItem    = i;
-    tbNotify.tbButton = (TBBUTTON*)btnPtr;
+    tbNotify.tbButton.iBitmap   = btnPtr->iBitmap;
+    tbNotify.tbButton.idCommand = btnPtr->idCommand;
+    tbNotify.tbButton.fsState   = btnPtr->fsState;
+    tbNotify.tbButton.fsStyle   = btnPtr->fsStyle;
+    tbNotify.tbButton.dwData    = btnPtr->dwData;
+    tbNotify.tbButton.iString   = btnPtr->iString;
     tbNotify.cchText  = 0;
     tbNotify.pszText  = NULL;

trunk/src/comctl32/tooltips.cpp

@@ -1 @@
-/* $Id: tooltips.cpp,v 1.4 2000-03-18 16:17:32 cbratschi Exp $ */
+/* $Id: tooltips.cpp,v 1.5 2000-03-21 17:30:45 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -79 +79 @@
 }
 
-
-static VOID
-TOOLTIPS_GetTipText(HWND hwnd,TOOLTIPS_INFO *infoPtr,INT nTool)
+static VOID TOOLTIPS_GetCallbackText(HWND hwnd,TOOLTIPS_INFO *infoPtr,TTTOOL_INFO *toolPtr)
+{
+  if (isUnicodeNotify(&infoPtr->header))
+  {
+    NMTTDISPINFOW ttnmdi;
+
+    /* fill NMHDR struct */
+    ZeroMemory (&ttnmdi,sizeof(NMTTDISPINFOW));
+    ttnmdi.hdr.hwndFrom = hwnd;
+    ttnmdi.hdr.idFrom = toolPtr->uId;
+    ttnmdi.hdr.code = TTN_GETDISPINFOW;
+    ttnmdi.lpszText = (WCHAR*)&ttnmdi.szText;
+    ttnmdi.uFlags = toolPtr->uFlags;
+    ttnmdi.lParam = toolPtr->lParam;
+    SendMessageA(toolPtr->hwnd,WM_NOTIFY,(WPARAM)toolPtr->uId,(LPARAM)&ttnmdi);
+
+    if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.lpszText) == 0))
+    {
+      LoadStringW(ttnmdi.hinst,(UINT)ttnmdi.lpszText,infoPtr->szTipText,INFOTIPSIZE);
+      if (ttnmdi.uFlags & TTF_DI_SETITEM)
+      {
+        toolPtr->hinst = ttnmdi.hinst;
+        toolPtr->lpszText = (LPWSTR)ttnmdi.lpszText;
+      }
+    } else
+    {
+      if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKW)
+      {
+        if (!HIWORD(ttnmdi.lpszText) && (ttnmdi.lpszText != NULL))
+        {
+          //error
+          infoPtr->szTipText[0] = '\0';
+          return;
+        }
+        lstrcpynW(infoPtr->szTipText,ttnmdi.lpszText,INFOTIPSIZE);
+        if (ttnmdi.uFlags & TTF_DI_SETITEM)
+        {
+          INT len = lstrlenW(ttnmdi.lpszText);
+          toolPtr->hinst = 0;
+          toolPtr->lpszText = (WCHAR*)COMCTL32_Alloc((len+1)*sizeof(WCHAR));
+          lstrcpyW(toolPtr->lpszText,ttnmdi.lpszText);
+        }
+      } else
+      {
+        //ERR (tooltips, "recursive text callback!\n");
+        infoPtr->szTipText[0] = '\0';
+      }
+    }
+  } else
+  {
+    NMTTDISPINFOA ttnmdi;
+
+    /* fill NMHDR struct */
+    ZeroMemory (&ttnmdi,sizeof(NMTTDISPINFOA));
+    ttnmdi.hdr.hwndFrom = hwnd;
+    ttnmdi.hdr.idFrom = toolPtr->uId;
+    ttnmdi.hdr.code = TTN_GETDISPINFOA;
+    ttnmdi.lpszText = (CHAR*)&ttnmdi.szText;
+    ttnmdi.uFlags = toolPtr->uFlags;
+    ttnmdi.lParam = toolPtr->lParam;
+    SendMessageA(toolPtr->hwnd,WM_NOTIFY,(WPARAM)toolPtr->uId,(LPARAM)&ttnmdi);
+
+    if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.lpszText) == 0))
+    {
+      LoadStringW(ttnmdi.hinst,(UINT)ttnmdi.lpszText,infoPtr->szTipText,INFOTIPSIZE);
+      if (ttnmdi.uFlags & TTF_DI_SETITEM)
+      {
+        toolPtr->hinst = ttnmdi.hinst;
+        toolPtr->lpszText = (LPWSTR)ttnmdi.lpszText;
+      }
+    } else
+    {
+      if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA)
+      {
+        if (!HIWORD(ttnmdi.lpszText) && (ttnmdi.lpszText != NULL))
+        {
+          //error
+          infoPtr->szTipText[0] = '\0';
+          return;
+        }
+        lstrcpynAtoW(infoPtr->szTipText,ttnmdi.lpszText,INFOTIPSIZE);
+        if (ttnmdi.uFlags & TTF_DI_SETITEM)
+        {
+          INT len = lstrlenA(ttnmdi.lpszText);
+          toolPtr->hinst = 0;
+          toolPtr->lpszText = (WCHAR*)COMCTL32_Alloc((len+1)*sizeof(WCHAR));
+          lstrcpyAtoW(toolPtr->lpszText,ttnmdi.lpszText);
+        }
+      } else
+      {
+        //ERR (tooltips, "recursive text callback!\n");
+        infoPtr->szTipText[0] = '\0';
+      }
+    }
+  }
+}
+
+static VOID TOOLTIPS_GetTipText(HWND hwnd,TOOLTIPS_INFO *infoPtr,INT nTool)
 {
     TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool];
@@ -93 +188 @@
     {
       if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW)
-      {
-        NMTTDISPINFOA ttnmdi;
-
-        /* fill NMHDR struct */
-        ZeroMemory (&ttnmdi,sizeof(NMTTDISPINFOA));
-        ttnmdi.hdr.hwndFrom = hwnd;
-        ttnmdi.hdr.idFrom = toolPtr->uId;
-        ttnmdi.hdr.code = TTN_GETDISPINFOA;
-        ttnmdi.lpszText = (LPSTR)&ttnmdi.szText;
-        ttnmdi.uFlags = toolPtr->uFlags;
-        ttnmdi.lParam = toolPtr->lParam;
-        SendMessageA (toolPtr->hwnd,WM_NOTIFY,(WPARAM)toolPtr->uId,(LPARAM)&ttnmdi);
-
-        if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.szText) == 0))
-        {
-          LoadStringW (ttnmdi.hinst,(UINT)ttnmdi.szText,infoPtr->szTipText,INFOTIPSIZE);
-          if (ttnmdi.uFlags & TTF_DI_SETITEM)
-          {
-            toolPtr->hinst = ttnmdi.hinst;
-            toolPtr->lpszText = (LPWSTR)ttnmdi.szText;
-          }
-        } else if (ttnmdi.szText[0])
-        {
-          lstrcpynAtoW(infoPtr->szTipText,ttnmdi.szText,INFOTIPSIZE);
-          if (ttnmdi.uFlags & TTF_DI_SETITEM)
-          {
-            INT len = lstrlenA(ttnmdi.szText);
-            toolPtr->hinst = 0;
-            toolPtr->lpszText = (WCHAR*)COMCTL32_Alloc((len+1)* sizeof(WCHAR));
-            lstrcpyAtoW(toolPtr->lpszText,ttnmdi.szText);
-          }
-        } else if (ttnmdi.lpszText == 0)
-        {
-          /* no text available */
-          infoPtr->szTipText[0] = '\0';
-        } else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA)
-        {
-          lstrcpynAtoW(infoPtr->szTipText,ttnmdi.lpszText,INFOTIPSIZE);
-          if (ttnmdi.uFlags & TTF_DI_SETITEM)
-          {
-            INT len = lstrlenA(ttnmdi.lpszText);
-            toolPtr->hinst = 0;
-            toolPtr->lpszText = (WCHAR*)COMCTL32_Alloc((len+1)*sizeof(WCHAR));
-            lstrcpyAtoW(toolPtr->lpszText,ttnmdi.lpszText);
-          }
-        } else
-        {
-          //ERR (tooltips, "recursive text callback!\n");
-          infoPtr->szTipText[0] = '\0';
-        }
-      } else
+        TOOLTIPS_GetCallbackText(hwnd,infoPtr,toolPtr);
+      else
       {
         /* the item is a usual (unicode) text */
         lstrcpynW(infoPtr->szTipText,toolPtr->lpszText,INFOTIPSIZE);
       }
-    }
-    else
+    } else
     {
       /* no text available */
       infoPtr->szTipText[0] = '\0';
     }
-
-//    TRACE (tooltips, "\"%s\"\n", debugstr_w(infoPtr->szTipText));
 }
 
@@ -626 +669 @@
     }
 
-//    TRACE (tooltips, "tool %d\n", nTool);
-
     return nTool;
 }
@@ -638 +679 @@
 
     infoPtr->bActive = (BOOL)wParam;
-
-//    if (infoPtr->bActive)
-//      TRACE (tooltips, "activate!\n");
 
     if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1))
@@ -1228 +1266 @@
     if (nTool == -1) return 0;
 
-    TOOLTIPS_GetTipText(hwnd,infoPtr,nTool); //CB: get text
+    TOOLTIPS_GetTipText(hwnd,infoPtr,nTool);
 
     lstrcpyWtoA(lpToolInfo->lpszText,infoPtr->szTipText);
@@ -1251 +1289 @@
     if (nTool == -1) return 0;
 
-    TOOLTIPS_GetTipText(hwnd,infoPtr,nTool); //CB: get text
+    TOOLTIPS_GetTipText(hwnd,infoPtr,nTool);
 
     lstrcpyW(lpToolInfo->lpszText,infoPtr->szTipText);

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.3 2000-03-18 16:17:34 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.4 2000-03-21 17:30:46 cbratschi Exp $ */
 /* Treeview control
  *
@@ -66 +66 @@
 static BOOL    TREEVIEW_SendTreeviewNotify (HWND hwnd, UINT code, UINT action, HTREEITEM oldItem, HTREEITEM newItem);
 static BOOL    TREEVIEW_SendTreeviewDnDNotify (HWND hwnd, UINT code, HTREEITEM dragItem, POINT pt);
-static BOOL    TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem, UINT code, UINT what);
+static INT     TREEVIEW_CallbackChildren(HWND hwnd,TREEVIEW_ITEM *wineItem);
+static INT     TREEVIEW_CallbackImage(HWND hwnd,TREEVIEW_ITEM *wineItem);
+static INT     TREEVIEW_CallbackSelectedImage(HWND hwnd,TREEVIEW_ITEM *wineItem);
+static WCHAR*  TREEVIEW_CallbackText(HWND hwnd,TREEVIEW_ITEM *wineItem,BOOL *mustFree);
 static BOOL    TREEVIEW_SendCustomDrawNotify (HWND hwnd, DWORD dwDrawStage, HDC hdc, RECT rc);
 static BOOL    TREEVIEW_SendCustomDrawItemNotify (HWND hwnd, HDC hdc, TREEVIEW_ITEM *tvItem, UINT uItemDrawState);
@@ -73 +76 @@
 static LRESULT TREEVIEW_DoSelectItem(HWND hwnd,INT action,HTREEITEM newSelect,INT cause);
 static void    TREEVIEW_Refresh(HWND hwnd);
+static void    TREEVIEW_RefreshItem(HWND hwnd,TREEVIEW_ITEM *item,BOOL wholeLine);
 static void    TREEVIEW_Draw(HWND hwnd,HDC hdc,RECT *updateRect);
 static BOOL    TREEVIEW_UnqueueRefresh(HWND hwnd,BOOL calc,BOOL refresh);
@@ -127 +131 @@
    {
       if (wineItem->cChildren == I_CHILDRENCALLBACK)
-      {
-         TREEVIEW_ITEM tempItem;
-
-         tempItem.hItem  = wineItem->hItem;
-         tempItem.state  = wineItem->state;
-         tempItem.lParam = wineItem->lParam;
-
-         TREEVIEW_SendDispInfoNotify(hwnd, &tempItem, TVN_GETDISPINFO, TVIF_CHILDREN);
-         cChildren = tempItem.cChildren;
-      }
+        cChildren = TREEVIEW_CallbackChildren(hwnd,wineItem);
       else
-         cChildren = wineItem->cChildren;
+        cChildren = wineItem->cChildren;
    }
    else if ( wineItem->firstChild )
@@ -328 +323 @@
       COMCTL32_Free (killItem->pszText);
     killItem->pszText = NULL;
-    TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)kill, 0);
+    TREEVIEW_SendTreeviewNotify (hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_DELETEITEMW:TVN_DELETEITEMA, 0, (HTREEITEM)kill, 0);
     if (killItem->firstChild)
       TREEVIEW_RemoveAllChildren (hwnd, killItem);
@@ -356 +351 @@
  wineItem->pszText = NULL;
 
- TREEVIEW_SendTreeviewNotify (hwnd, TVN_DELETEITEM, 0, (HTREEITEM)iItem, 0);
+ TREEVIEW_SendTreeviewNotify (hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_DELETEITEMW:TVN_DELETEITEMA, 0, (HTREEITEM)iItem, 0);
 
  if (wineItem->firstChild)
@@ -403 +398 @@
                 killItem->pszText = NULL;
 
-                TREEVIEW_SendTreeviewNotify
-                                        (hwnd, TVN_DELETEITEM, 0, killItem->hItem, 0);
+                TREEVIEW_SendTreeviewNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_DELETEITEMW:TVN_DELETEITEMA, 0, killItem->hItem, 0);
                 }
 
@@ -474 +468 @@
   if (!(GetWindowLongA(hwnd, GWL_STYLE) & TVS_NONEVENHEIGHT))
     if (infoPtr->uItemHeight & 0x1) infoPtr->uItemHeight++;
+
+  if (prevHeight != infoPtr->uItemHeight)
+  {
+    infoPtr->uInternalStatus |= TV_CALCALL;
+    TREEVIEW_QueueRefresh(hwnd);
+  }
 
   return prevHeight;
@@ -808 +808 @@
       /* The item is curently selected */
       if (item->iSelectedImage == I_IMAGECALLBACK)
-        TREEVIEW_SendDispInfoNotify(hwnd, item, TVN_GETDISPINFO, TVIF_SELECTEDIMAGE);
-
-      imageIndex = item->iSelectedImage;
+        imageIndex = TREEVIEW_CallbackSelectedImage(hwnd,item);
+      else
+        imageIndex = item->iSelectedImage;
     } else
     {
       /* The item is not selected */
       if (item->iImage == I_IMAGECALLBACK)
-        TREEVIEW_SendDispInfoNotify(hwnd, item, TVN_GETDISPINFO, TVIF_IMAGE);
-
-      imageIndex = item->iImage;
+        imageIndex = TREEVIEW_CallbackImage(hwnd,item);
+      else
+        imageIndex = item->iImage;
     }
 
@@ -844 +844 @@
       HBRUSH   hbrBk = 0;
       BOOL     inFocus = GetFocus() == hwnd;
+      WCHAR* text;
+      BOOL mustFree = FALSE;
 
       oldBkMode = SetBkMode(hdc, TRANSPARENT);
@@ -879 +881 @@
 
       if (item->pszText == LPSTR_TEXTCALLBACKW)
-        TREEVIEW_SendDispInfoNotify (hwnd, item, TVN_GETDISPINFO, TVIF_TEXT);
+        text = TREEVIEW_CallbackText(hwnd,item,&mustFree);
+      else
+        text = item->pszText;
 
       if (hbrBk)
@@ -890 +894 @@
 
       /* Draw it */
-      DrawTextW ( hdc,
-        item->pszText,
-        lstrlenW(item->pszText),
-        &item->text,
-        uTextJustify | DT_VCENTER | DT_SINGLELINE | DT_NOPREFIX);
+      DrawTextW(hdc,text,lstrlenW(text),&item->text,uTextJustify | DT_VCENTER | DT_SINGLELINE | DT_NOPREFIX);
+      if (mustFree) COMCTL32_Free(text);
 
       item->text.left -= 2;
@@ -1028 +1029 @@
   TVITEMEXW *tvItem;
   INT iItem,len;
+  BOOL mustRefresh = FALSE;
+  BOOL mustRepaint = FALSE;
 
   if (infoPtr->hwndEdit) SetFocus(hwnd);
@@ -1034 +1037 @@
   iItem = (INT)tvItem->hItem;
 
-  wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)iItem);
+  wineItem = TREEVIEW_ValidItem(infoPtr,(HTREEITEM)iItem);
   if (!wineItem) return FALSE;
 
-  if (tvItem->mask & TVIF_CHILDREN)
+  if ((tvItem->mask & TVIF_CHILDREN) && (wineItem->cChildren != tvItem->cChildren))
+  {
     wineItem->cChildren = tvItem->cChildren;
-
-  if (tvItem->mask & TVIF_IMAGE)
+    mustRefresh = TRUE;
+  }
+
+  if ((tvItem->mask & TVIF_IMAGE) && (wineItem->iImage != tvItem->iImage))
+  {
     wineItem->iImage = tvItem->iImage;
-
-  if (tvItem->mask & TVIF_INTEGRAL)
+    mustRepaint = TRUE;
+  }
+
+  if ((tvItem->mask & TVIF_INTEGRAL) && (wineItem->iIntegral != tvItem->iIntegral))
+  {
     wineItem->iIntegral = tvItem->iIntegral;
+    mustRefresh = TRUE;
+  }
 
   if (tvItem->mask & TVIF_PARAM)
     wineItem->lParam = tvItem->lParam;
 
-  if (tvItem->mask & TVIF_SELECTEDIMAGE)
+  if ((tvItem->mask & TVIF_SELECTEDIMAGE) && (wineItem->iSelectedImage != tvItem->iSelectedImage))
+  {
     wineItem->iSelectedImage = tvItem->iSelectedImage;
+    mustRepaint = TRUE;
+  }
 
   if (tvItem->mask & TVIF_STATE)
   {
+    DWORD oldState = wineItem->state,oldMask = wineItem->stateMask;
+
     wineItem->state &= ~tvItem->stateMask;
     wineItem->state |= (tvItem->state & tvItem->stateMask);
     wineItem->stateMask |= tvItem->stateMask;
+    mustRepaint = (oldState != wineItem->state) || (oldMask != wineItem->stateMask);
   }
 
@@ -1066 +1084 @@
       {
         len = lstrlenW(tvItem->pszText)+1;
+
         if (len > wineItem->cchTextMax)
         {
-          wineItem->pszText= (WCHAR*)COMCTL32_ReAlloc(wineItem->pszText,len*sizeof(WCHAR));
+          if (wineItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(wineItem->pszText);
+          wineItem->pszText= (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
           wineItem->cchTextMax = len;
         }
-        lstrcpynW(wineItem->pszText,tvItem->pszText,len);
+        lstrcpyW(wineItem->pszText,tvItem->pszText);
       } else
       {
         if (wineItem->cchTextMax)
         {
-          COMCTL32_Free (wineItem->pszText);
+          if (wineItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free (wineItem->pszText);
           wineItem->cchTextMax = 0;
         }
@@ -1083 +1103 @@
     } else
     {
-      LPTVITEMEXA tvItem;
-
-      tvItem = (LPTVITEMEXA)lParam;
-
-      if (tvItem->pszText != LPSTR_TEXTCALLBACKA)
-      {
-        len = lstrlenA (tvItem->pszText) + 1;
+      if ((LPSTR)tvItem->pszText != LPSTR_TEXTCALLBACKA)
+      {
+        len = lstrlenA((LPSTR)tvItem->pszText)+1;
         if (len > wineItem->cchTextMax)
         {
-          wineItem->pszText = (WCHAR*)COMCTL32_ReAlloc(wineItem->pszText,len*sizeof(WCHAR));
+          if (wineItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(wineItem->pszText);
+          wineItem->pszText = (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
           wineItem->cchTextMax = len;
         }
-        lstrcpynAtoW(wineItem->pszText,tvItem->pszText,len);
+        lstrcpyAtoW(wineItem->pszText,(LPSTR)tvItem->pszText);
       } else
       {
         if (wineItem->cchTextMax)
         {
-          COMCTL32_Free (wineItem->pszText);
+          if (wineItem->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(wineItem->pszText);
           wineItem->cchTextMax = 0;
         }
@@ -1106 +1123 @@
       }
     }
-  }
-
-  wineItem->mask |= tvItem->mask;
-  wineItem->calculated = FALSE;
-  TREEVIEW_QueueRefresh(hwnd);
+    mustRepaint = TRUE;
+  }
+
+  if (wineItem->mask != (wineItem->mask | tvItem->mask))
+  {
+    wineItem->mask |= tvItem->mask;
+    mustRepaint = TRUE;
+  }
+
+  if (mustRepaint || mustRefresh)
+  {
+    wineItem->calculated = FALSE;
+    if (mustRefresh)
+      TREEVIEW_QueueRefresh(hwnd);
+    else
+      TREEVIEW_RefreshItem(hwnd,wineItem,FALSE);
+  }
 
   return TRUE;
@@ -1153 +1182 @@
 
       //redraw text and image
-      if (((item->mask & (TVIF_IMAGE | TVIF_SELECTEDIMAGE)) || (dwStyle & TVS_CHECKBOXES)) && (item->iSelectedImage != item->iImage))
+      if ((((item->mask & (TVIF_IMAGE | TVIF_SELECTEDIMAGE)) == (TVIF_IMAGE | TVIF_SELECTEDIMAGE)) || (dwStyle & TVS_CHECKBOXES)) && (item->iSelectedImage != item->iImage))
       {
         rect.left += TREEVIEW_LEFT_MARGIN;
@@ -1265 +1294 @@
     UINT  uTextJustify = DT_LEFT;
     HFONT hOldFont;
+    WCHAR* text;
+    BOOL mustFree = FALSE;
 
     r.left += 3;
@@ -1275 +1306 @@
 
     if (item->pszText == LPSTR_TEXTCALLBACKW)
-      TREEVIEW_SendDispInfoNotify (hwnd, item, TVN_GETDISPINFO, TVIF_TEXT);
+      text = TREEVIEW_CallbackText(hwnd,item,&mustFree);
+    else
+      text = item->pszText;
 
     if (!hdc)
@@ -1289 +1322 @@
 
     /* Obtain the text coordinate */
-    DrawTextW (
-            hdc,
-            item->pszText,
-            lstrlenW(item->pszText),
-            &item->text,
-            uTextJustify | DT_VCENTER | DT_SINGLELINE | DT_CALCRECT | DT_NOPREFIX);
+    DrawTextW (hdc,text,lstrlenW(text),&item->text,uTextJustify | DT_VCENTER | DT_SINGLELINE | DT_CALCRECT | DT_NOPREFIX);
+    if (mustFree) COMCTL32_Free(text);
 
     SelectObject(hdc,hOldFont);
@@ -1583 +1612 @@
           TREEVIEW_DrawItem(hwnd,hdc,item,dwStyle,infoPtr);
           visFound = TRUE;
-        }
+        } else if (updateRect && (item->rect.top >= updateRect->bottom)) break;
       } else if (visFound) break;
       if (!visFound && (dwStyle & TVS_HASLINES) && (dwStyle & TVS_LINESATROOT))
@@ -1691 +1720 @@
     infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
     if (calc) TREEVIEW_CalcItems(hwnd,0,infoPtr);
-    if (refresh) TREEVIEW_Refresh(hwnd);
+    if (refresh)
+    {
+      TREEVIEW_Refresh(hwnd);
+      UpdateWindow(hwnd);
+    }
 
     return TRUE;
@@ -1720 +1753 @@
 
   if (tvItem->mask & TVIF_IMAGE)
-    tvItem->iImage = wineItem->iImage;
+  {
+    if (wineItem->iImage == I_IMAGECALLBACK)
+      tvItem->iImage = TREEVIEW_CallbackImage(hwnd,wineItem);
+    else
+      tvItem->iImage = wineItem->iImage;
+  }
 
   if (tvItem->mask & TVIF_INTEGRAL)
@@ -1730 +1768 @@
 
   if (tvItem->mask & TVIF_SELECTEDIMAGE)
-    tvItem->iSelectedImage = wineItem->iSelectedImage;
+  {
+    if (wineItem->iSelectedImage == I_IMAGECALLBACK)
+      tvItem->iSelectedImage = TREEVIEW_CallbackSelectedImage(hwnd,wineItem);
+    else
+      tvItem->iSelectedImage = wineItem->iSelectedImage;
+  }
 
   if (tvItem->mask & TVIF_STATE)
@@ -1737 +1780 @@
   if (tvItem->mask & TVIF_TEXT)
   {
+    WCHAR* text;
+    BOOL mustFree = FALSE;
+
     if (wineItem->pszText == LPSTR_TEXTCALLBACKW)
-      TREEVIEW_SendDispInfoNotify(hwnd,wineItem,TVN_GETDISPINFO,TVIF_TEXT);
+      text = TREEVIEW_CallbackText(hwnd,wineItem,&mustFree);
+    else
+      text = wineItem->pszText;
+
     if (unicode)
-    {
-      if (wineItem->pszText == LPSTR_TEXTCALLBACKW)
-        tvItem->pszText = LPSTR_TEXTCALLBACKW;
-      else if (wineItem->pszText)
-        lstrcpynW(tvItem->pszText,wineItem->pszText,tvItem->cchTextMax);
-    } else
-    {
-      LPTVITEMEXA tvItem = (LPTVITEMEXA)lParam;
-
-      if (wineItem->pszText == LPSTR_TEXTCALLBACKW)
-        tvItem->pszText = LPSTR_TEXTCALLBACKA;
-      else if (wineItem->pszText)
-        lstrcpynWtoA(tvItem->pszText, wineItem->pszText,tvItem->cchTextMax);
-    }
+      lstrcpynW(tvItem->pszText,text,tvItem->cchTextMax);
+    else
+      lstrcpynWtoA((LPSTR)tvItem->pszText,text,tvItem->cchTextMax);
+    if (mustFree) COMCTL32_Free(text);
   }
 
@@ -1974 +2013 @@
   WCHAR *txt1,*txt2;
   TREEVIEW_ITEM *item;
-
-  item = (TREEVIEW_ITEM *) first;
+  INT res;
+  BOOL mustFree1 = FALSE,mustFree2 = FALSE;
+
+  item = (TREEVIEW_ITEM*)first;
   if (item->pszText == LPSTR_TEXTCALLBACKW)
-    TREEVIEW_SendDispInfoNotify (hwnd, item, TVN_GETDISPINFO, TVIF_TEXT);
-
-  txt1 = item->pszText;
-
-  item = (TREEVIEW_ITEM *) second;
+    txt1 = TREEVIEW_CallbackText(hwnd,item,&mustFree1);
+  else
+    txt1 = item->pszText;
+
+  item = (TREEVIEW_ITEM*)second;
   if (item->pszText == LPSTR_TEXTCALLBACKW)
-    TREEVIEW_SendDispInfoNotify (hwnd, item, TVN_GETDISPINFO, TVIF_TEXT);
-
-  txt2 = item->pszText;
-
-  return lstrcmpiW(txt1,txt2); //CB: or lstrcmpW?
+    txt2 = TREEVIEW_CallbackText(hwnd,item,&mustFree2);
+  else
+    txt2 = item->pszText;
+
+  res = lstrcmpiW(txt1,txt2); //CB: or lstrcmpW?
+  if (mustFree1) COMCTL32_Free(txt1);
+  if (mustFree2) COMCTL32_Free(txt2);
+
+  return res;
 }
 
@@ -2149 +2194 @@
 static LRESULT
 TREEVIEW_InsertItem(HWND hwnd,WPARAM wParam,LPARAM lParam,BOOL unicode)
-
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2218 +2262 @@
    */
   tvItem = &ptdi->itemex;
-  wineItem=& infoPtr->items[iItem];
+  wineItem = &infoPtr->items[iItem];
 
   if ((ptdi->hParent==TVI_ROOT) || (ptdi->hParent==0)) {
@@ -2252 +2296 @@
       if (tvItem->pszText != LPSTR_TEXTCALLBACKW)
       {
-        //TRACE (treeview,"(%p,%s)\n", &tvItem->pszText, tvItem->pszText);
         len = lstrlenW(tvItem->pszText)+1;
         wineItem->pszText = (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
@@ -2259 +2302 @@
       } else
       {
-        //TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
         wineItem->pszText = LPSTR_TEXTCALLBACKW;
         wineItem->cchTextMax = 0;
@@ -2265 +2307 @@
     } else
     {
-      TVITEMEXA *tvItemA = (LPTVITEMEXA)tvItem;
-
-      if (tvItemA->pszText != LPSTR_TEXTCALLBACKA)
-      {
-        //TRACE (treeview,"(%p,%s)\n", &tvItem->pszText, tvItem->pszText);
-        len = lstrlenA(tvItemA->pszText)+1;
-        wineItem->pszText= (WCHAR*)COMCTL32_Alloc (len*sizeof(WCHAR));
-        lstrcpyAtoW (wineItem->pszText, tvItemA->pszText);
+      if ((LPSTR)tvItem->pszText != LPSTR_TEXTCALLBACKA)
+      {
+        len = lstrlenA((LPSTR)tvItem->pszText)+1;
+        wineItem->pszText = (WCHAR*)COMCTL32_Alloc(len*sizeof(WCHAR));
+        lstrcpyAtoW (wineItem->pszText,(LPSTR)tvItem->pszText);
         wineItem->cchTextMax = len;
       } else
       {
-        //TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
         wineItem->pszText = LPSTR_TEXTCALLBACKW;
         wineItem->cchTextMax = 0;
@@ -2309 +2347 @@
     {
       TREEVIEW_ITEM *aChild;
-
       TREEVIEW_ITEM *previousChild = NULL;
       BOOL bItemInserted           = FALSE;
+      WCHAR* text;
+      BOOL mustFree = FALSE;
 
       if (parentItem)
@@ -2319 +2358 @@
 
       /* lookup the text if using LPSTR_TEXTCALLBACKs */
-      if (wineItem->pszText==LPSTR_TEXTCALLBACKW) {
-        TREEVIEW_SendDispInfoNotify (hwnd, wineItem, TVN_GETDISPINFO, TVIF_TEXT);
-      }
+      if (wineItem->pszText == LPSTR_TEXTCALLBACKW)
+        text = TREEVIEW_CallbackText(hwnd,wineItem,&mustFree);
+      else
+        text = wineItem->pszText;
 
       /* Iterate the parent children to see where we fit in */
@@ -2327 +2367 @@
       {
         INT comp;
+        WCHAR* text2;
+        BOOL mustFree2 = FALSE;
 
         /* lookup the text if using LPSTR_TEXTCALLBACKs */
-        if (aChild->pszText==LPSTR_TEXTCALLBACKW) {
-          TREEVIEW_SendDispInfoNotify (hwnd, aChild, TVN_GETDISPINFO, TVIF_TEXT);
-        }
-
-        comp = lstrcmpW(wineItem->pszText, aChild->pszText);
+        if (aChild->pszText == LPSTR_TEXTCALLBACKW)
+          text2 = TREEVIEW_CallbackText(hwnd,aChild,&mustFree2);
+        else
+          text2 = aChild->pszText;
+
+        comp = lstrcmpW(text,text2);
+        if (mustFree2) COMCTL32_Free(text2);
         if ( comp < 0 )  /* we are smaller than the current one */
         {
@@ -2361 +2405 @@
         }
       }
+      if (mustFree) COMCTL32_Free(text);
 
       /*
@@ -2481 +2526 @@
   if (newIndent != infoPtr->uIndent)
   {
-    infoPtr->uIndent=newIndent;
+    infoPtr->uIndent = newIndent;
     infoPtr->uInternalStatus |= TV_CALCALL;
     TREEVIEW_QueueRefresh(hwnd);
@@ -2780 +2825 @@
 TREEVIEW_Paint (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    HDC hdc;
+  HDC hdc = (HDC)wParam;
+
+  if (!hdc)
+  {
     PAINTSTRUCT ps;
 
-    hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
-    TREEVIEW_Draw(hwnd,hdc,&ps.rcPaint);
-    if(!wParam)
-        EndPaint (hwnd, &ps);
-
-    return 0;
+    hdc = BeginPaint(hwnd,&ps);
+    TREEVIEW_Draw(hwnd, hdc,&ps.rcPaint);
+    EndPaint(hwnd,&ps);
+  } else
+      TREEVIEW_Draw(hwnd,hdc,NULL);
+
+  return 0;
 }
 
@@ -2853 +2902 @@
 
 static BOOL
-TREEVIEW_SendTreeviewNotify (HWND hwnd, UINT code, UINT action,
-                        HTREEITEM oldItem, HTREEITEM newItem)
+TREEVIEW_SendTreeviewNotify (HWND hwnd,UINT code,UINT action,HTREEITEM oldItem,HTREEITEM newItem)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2875 +2923 @@
     if (!isUnicodeNotify(&infoPtr->header))
     {
-      if (!wineItem->pszText) nmhdr.itemOld.pszText = NULL; else
+      if (!wineItem->pszText || (wineItem->pszText == LPSTR_TEXTCALLBACKW)) nmhdr.itemOld.pszText = NULL; else
       {
         INT len = lstrlenW(wineItem->pszText)+1;
@@ -2901 +2949 @@
     if (!isUnicodeNotify(&infoPtr->header))
     {
-      if (!wineItem->pszText) nmhdr.itemNew.pszText = NULL; else
+      if (!wineItem->pszText || (wineItem->pszText == LPSTR_TEXTCALLBACKW)) nmhdr.itemNew.pszText = NULL; else
       {
         INT len = lstrlenW(wineItem->pszText)+1;
@@ -2950 +2998 @@
 }
 
-static BOOL
-TREEVIEW_SendDispInfoNotify (HWND hwnd, TREEVIEW_ITEM *wineItem, UINT code, UINT what)
+static INT TREEVIEW_CallbackImage(HWND hwnd,TREEVIEW_ITEM *wineItem)
+{
+  NMTVDISPINFOW tvdi;
+  BOOL retval;
+
+  tvdi.item.mask   = TVIF_IMAGE;
+  tvdi.item.hItem  = wineItem->hItem;
+  tvdi.item.state  = wineItem->state;
+  tvdi.item.lParam = wineItem->lParam;
+  tvdi.item.iImage = 0;
+
+  retval = (BOOL)sendNotify(hwnd,isUnicodeNotify(hwnd) ? TVN_GETDISPINFOW:TVN_GETDISPINFOA,&tvdi.hdr);
+
+  if (tvdi.item.mask & TVIF_DI_SETITEM)
+    wineItem->iImage = tvdi.item.iImage;
+
+  return tvdi.item.iImage;
+}
+
+static INT TREEVIEW_CallbackSelectedImage(HWND hwnd,TREEVIEW_ITEM *wineItem)
+{
+  NMTVDISPINFOW tvdi;
+  BOOL retval;
+
+  tvdi.item.mask           = TVIF_SELECTEDIMAGE;
+  tvdi.item.hItem          = wineItem->hItem;
+  tvdi.item.state          = wineItem->state;
+  tvdi.item.lParam         = wineItem->lParam;
+  tvdi.item.iSelectedImage = 0;
+
+  retval = (BOOL)sendNotify(hwnd,isUnicodeNotify(hwnd) ? TVN_GETDISPINFOW:TVN_GETDISPINFOA,&tvdi.hdr);
+
+  if (tvdi.item.mask & TVIF_DI_SETITEM)
+    wineItem->iSelectedImage = tvdi.item.iSelectedImage;
+
+  return tvdi.item.iSelectedImage;
+}
+
+static WCHAR* TREEVIEW_CallbackText(HWND hwnd,TREEVIEW_ITEM *wineItem,BOOL *mustFree)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2958 +3043 @@
   WCHAR *buf;
 
-  tvdi.item.mask        = what;
+  tvdi.item.mask        = TVIF_TEXT;
   tvdi.item.hItem       = wineItem->hItem;
   tvdi.item.state       = wineItem->state;
   tvdi.item.lParam      = wineItem->lParam;
-  tvdi.item.pszText     = (WCHAR*)COMCTL32_Alloc(128*(isUnicodeNotify(&infoPtr->header) ? sizeof(WCHAR):sizeof(char)));
-  tvdi.item.cchTextMax = 128;
+  tvdi.item.pszText     = (WCHAR*)COMCTL32_Alloc(128*(isUnicodeNotify(&infoPtr->header) ? sizeof(WCHAR):sizeof(CHAR)));
+  tvdi.item.cchTextMax  = 128;
   buf = tvdi.item.pszText;
 
-  retval = (BOOL)sendNotify(hwnd,code,&tvdi.hdr);
-
-  /* Ignore posible changes */
-  if (code == TVN_BEGINLABELEDIT)
-      return retval;
-
-  if (what & TVIF_TEXT)
-  {
-    if (isUnicodeNotify(&infoPtr->header))
+  retval = (BOOL)sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_GETDISPINFOW:TVN_GETDISPINFOA,&tvdi.hdr);
+
+  if (tvdi.item.pszText == LPSTR_TEXTCALLBACKW)
+  {
+    *mustFree = FALSE;
+    return NULL;
+  }
+
+  if (isUnicodeNotify(&infoPtr->header))
+  {
+    if (tvdi.item.mask & TVIF_DI_SETITEM)
     {
       wineItem->pszText = tvdi.item.pszText;
@@ -2982 +3069 @@
       } else
       {
-        //TRACE (treeview,"user-supplied buffer\n");
+        //user-supplied buffer
         COMCTL32_Free(buf);
         wineItem->cchTextMax = 0;
       }
+      *mustFree = FALSE;
+      return wineItem->pszText;
     } else
     {
+      if (buf != tvdi.item.pszText)
+      {
+        COMCTL32_Free(buf);
+        *mustFree = FALSE;
+      } else *mustFree = TRUE;
+      return tvdi.item.pszText;
+    }
+  } else
+  {
+    if (tvdi.item.mask & TVIF_DI_SETITEM)
+    {
       if (buf == tvdi.item.pszText)
       {
-        COMCTL32_Free(wineItem->pszText);
         wineItem->cchTextMax = 128;
         wineItem->pszText = (WCHAR*)COMCTL32_Alloc(128*sizeof(WCHAR));
@@ -2997 +3096 @@
       } else
       {
-        //TRACE (treeview,"user-supplied buffer\n");
+        //user-supplied buffer
         COMCTL32_Free(buf);
         wineItem->cchTextMax = 0;
       }
+      *mustFree = FALSE;
+      return wineItem->pszText;
+    } else
+    {
+      INT len = lstrlenA((LPSTR)tvdi.item.pszText);
+      WCHAR* textW = (WCHAR*)COMCTL32_Alloc((len+1)*sizeof(WCHAR));
+
+      lstrcpyAtoW(textW,(LPSTR)tvdi.item.pszText);
+      COMCTL32_Free(buf);
+      *mustFree = TRUE;
+      return textW;
     }
   }
-
-  if (what & TVIF_SELECTEDIMAGE)
-    wineItem->iSelectedImage = tvdi.item.iSelectedImage;
-  if (what & TVIF_IMAGE)
-    wineItem->iImage         = tvdi.item.iImage;
-  if (what & TVIF_CHILDREN)
-    wineItem->cChildren      = tvdi.item.cChildren;
-
-  return retval;
+}
+
+static INT TREEVIEW_CallbackChildren(HWND hwnd,TREEVIEW_ITEM *wineItem)
+{
+  NMTVDISPINFOW tvdi;
+  BOOL retval;
+
+  tvdi.item.mask      = TVIF_CHILDREN;
+  tvdi.item.hItem     = wineItem->hItem;
+  tvdi.item.state     = wineItem->state;
+  tvdi.item.lParam    = wineItem->lParam;
+  tvdi.item.cChildren = 0;
+
+  retval = (BOOL)sendNotify(hwnd,isUnicodeNotify(hwnd) ? TVN_GETDISPINFOW:TVN_GETDISPINFOA,&tvdi.hdr);
+
+  if (tvdi.item.mask & TVIF_DI_SETITEM)
+    wineItem->cChildren = tvdi.item.cChildren;
+
+  return tvdi.item.cChildren;
 }
 
@@ -3162 +3282 @@
 
         /* this item has never been expanded */
-        if (TREEVIEW_SendTreeviewNotify(hwnd,TVN_ITEMEXPANDING,TVE_EXPAND,0,(HTREEITEM)expand))
+        if (TREEVIEW_SendTreeviewNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_ITEMEXPANDINGW:TVN_ITEMEXPANDINGA,TVE_EXPAND,0,(HTREEITEM)expand))
           return FALSE;
 
@@ -3186 +3306 @@
         //TRACE(treeview, "  TVN_ITEMEXPANDING sent...\n");
 
-        TREEVIEW_SendTreeviewNotify (
-          hwnd,
-          TVN_ITEMEXPANDED,
-          TVE_EXPAND,
-          0,
-          (HTREEITEM)expand);
+        TREEVIEW_SendTreeviewNotify (hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_ITEMEXPANDEDW:TVN_ITEMEXPANDEDA,TVE_EXPAND,0,(HTREEITEM)expand);
 
         //TRACE(treeview, "  TVN_ITEMEXPANDED sent...\n");
@@ -3321 +3436 @@
   HFONT hOldFont = 0;
   TEXTMETRICA textMetric;
+  WCHAR* textW;
+  CHAR* textA = NULL;
+  BOOL mustFree = FALSE;
+  NMTVDISPINFOW tvdi;
 
   if (!editItem)
@@ -3333 +3452 @@
 
   if (editItem->pszText == LPSTR_TEXTCALLBACKW)
-    TREEVIEW_SendDispInfoNotify (hwnd, editItem, TVN_GETDISPINFO, TVIF_TEXT);
+    textW = TREEVIEW_CallbackText(hwnd,editItem,&mustFree);
+  else
+    textW = editItem->pszText;
 
   hdc = GetDC(hwnd);
@@ -3343 +3464 @@
 
   /*Get String Lenght in pixels */
-  GetTextExtentPoint32W(hdc, editItem->pszText, lstrlenW(editItem->pszText), &sz);
+  GetTextExtentPoint32W(hdc,textW,lstrlenW(textW),&sz);
 
   /*Add Extra spacing for the next character */
@@ -3372 +3493 @@
                   (DWORD) TREEVIEW_Edit_SubclassProc);
 
-  if (TREEVIEW_SendDispInfoNotify (hwnd, editItem, TVN_BEGINLABELEDIT,
-           editItem->mask & (TVIF_HANDLE|TVIF_TEXT|TVIF_STATE|TVIF_PARAM)))
+  tvdi.item.mask        = TVIF_HANDLE | TVIF_TEXT | TVIF_STATE | TVIF_PARAM;
+  tvdi.item.hItem       = editItem->hItem;
+  tvdi.item.state       = editItem->state;
+  tvdi.item.lParam      = editItem->lParam;
+  if (isUnicodeNotify(&infoPtr->header))
+  {
+    tvdi.item.pszText     = textW;
+  } else
+  {
+    textA = HEAP_strdupWtoA(GetProcessHeap(),0,textW);
+    tvdi.item.pszText = (LPWSTR)textA;
+  }
+
+  if (sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_BEGINLABELEDITW:TVN_BEGINLABELEDITA,&tvdi.hdr))
   {
      DestroyWindow(infoPtr->hwndEdit);
      infoPtr->hwndEdit = 0;
+     if (mustFree) COMCTL32_Free(textW);
+     if (textA) COMCTL32_Free(textA);
 
      return (HWND)0;
   }
+  if (textA) HeapFree(GetProcessHeap(),0,textA);
 
   infoPtr->editItem = hItem;
-  SetWindowTextW(infoPtr->hwndEdit, editItem->pszText);
+  SetWindowTextW(infoPtr->hwndEdit,textW);
   SetFocus(infoPtr->hwndEdit);
   SendMessageA(infoPtr->hwndEdit, EM_SETSEL, 0, -1);
   ShowWindow(infoPtr->hwndEdit, SW_SHOW);
+  if (mustFree) COMCTL32_Free(textW);
 
   return infoPtr->hwndEdit;
@@ -3392 +3529 @@
 
 LRESULT WINAPI
-TREEVIEW_EndEditLabelNow (HWND hwnd, BOOL bCancel)
+TREEVIEW_EndEditLabelNow(HWND hwnd,BOOL bCancel)
 {
   TREEVIEW_INFO *infoPtr    = TREEVIEW_GetInfoPtr(hwnd);
@@ -3416 +3553 @@
     iLength = GetWindowTextW(infoPtr->hwndEdit,textW,1023);
 
-    //if (iLength >= 1023)
-    //{
-    //  ERR("Insuficient space to retrieve new item label.");
-    //}
-
     if (isUnicodeNotify(&infoPtr->header)) tvdi.item.pszText = textW; else
     {
       INT len = iLength+1;
 
-      textA = (CHAR*)COMCTL32_Alloc(len);
+      textA = (CHAR*)COMCTL32_Alloc(len*sizeof(CHAR));
       lstrcpynWtoA(textA,textW,len);
       tvdi.item.pszText = (WCHAR*)textA;
     }
     tvdi.item.cchTextMax  = iLength + 1;
-  }
-  else
-  {
-      tvdi.item.pszText = NULL;
-      tvdi.item.cchTextMax  = 0;
-  }
-
-  bCommit = (BOOL)sendNotify(hwnd,TVN_ENDLABELEDIT,&tvdi.hdr);
+  } else
+  {
+    tvdi.item.pszText = NULL;
+    tvdi.item.cchTextMax  = 0;
+  }
+
+  bCommit = (BOOL)sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_ENDLABELEDITW:TVN_ENDLABELEDITA,&tvdi.hdr);
 
   if (!bCancel && bCommit) /* Apply the changes */
   {
+    WCHAR* text;
+    BOOL mustFree = FALSE;
+
     if (!isUnicodeNotify(&infoPtr->header))
       lstrcpynAtoW(textW,textA,iLength+1);
-    if (lstrcmpW(textW,editedItem->pszText) != 0)
-    {
-      if(NULL == COMCTL32_ReAlloc(editedItem->pszText,(iLength+1)*sizeof(WCHAR)))
-      {
-        //ERR("OutOfMemory, cannot allocate space for label");
-        DestroyWindow(infoPtr->hwndEdit);
-        infoPtr->hwndEdit = 0;
-        if (textA) COMCTL32_Free(textA);
-        if (textW) COMCTL32_Free(textW);
-
-        return FALSE;
-      }
-      else
-      {
-        editedItem->cchTextMax = iLength + 1;
-        lstrcpyW( editedItem->pszText,textW);
+
+    if (editedItem->pszText == LPSTR_TEXTCALLBACKW)
+      text = TREEVIEW_CallbackText(hwnd,editedItem,&mustFree);
+    else
+      text = editedItem->pszText;
+
+    if (lstrcmpW(textW,text) != 0)
+    {
+      if (editedItem->pszText == LPSTR_TEXTCALLBACKW)
+      {
+        NMTVDISPINFOW tvdi;
+        BOOL retval;
+
+        tvdi.item.mask        = TVIF_TEXT;
+        tvdi.item.hItem       = editedItem->hItem;
+        tvdi.item.state       = editedItem->state;
+        tvdi.item.lParam      = editedItem->lParam;
+        if (isUnicodeNotify(&infoPtr->header))
+        {
+          tvdi.item.pszText     = textW;
+          tvdi.item.cchTextMax  = lstrlenW(textW);
+        } else
+        {
+          tvdi.item.pszText     = (LPWSTR)textA;
+          tvdi.item.cchTextMax  = lstrlenA(textA);
+        }
+
+        retval = (BOOL)sendNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_SETDISPINFOW:TVN_SETDISPINFOA,&tvdi.hdr);
+      } else
+      {
+        if(NULL == COMCTL32_ReAlloc(text,(iLength+1)*sizeof(WCHAR)))
+        {
+          //ERR("OutOfMemory, cannot allocate space for label");
+          DestroyWindow(infoPtr->hwndEdit);
+          infoPtr->hwndEdit = 0;
+          if (textA) COMCTL32_Free(textA);
+          if (textW) COMCTL32_Free(textW);
+          if (mustFree) COMCTL32_Free(text);
+
+          return FALSE;
+        } else
+        {
+          editedItem->cchTextMax = iLength + 1;
+          lstrcpyW(editedItem->pszText,textW);
+        }
       }
     }
+    if (mustFree) COMCTL32_Free(text);
   }
 
@@ -3580 +3744 @@
       DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
       LPWSTR text;
+      BOOL mustFree = FALSE;
       TTTOOLINFOW ti;
       POINT pt;
@@ -3586 +3751 @@
       {
         NMTVGETINFOTIPW tvgit;
-
-        tvgit.pszText    = (WCHAR*)COMCTL32_Alloc(isUnicodeNotify(&infoPtr->header) ? INFOTIPSIZE*sizeof(WCHAR):INFOTIPSIZE*sizeof(CHAR));
+        WCHAR* buf = (WCHAR*)COMCTL32_Alloc(isUnicodeNotify(&infoPtr->header) ? INFOTIPSIZE*sizeof(WCHAR):INFOTIPSIZE*sizeof(CHAR));
+
+        tvgit.pszText    = buf;
         tvgit.cchTextMax = INFOTIPSIZE;
         tvgit.hItem      = item->hItem;
@@ -3595 +3761 @@
         if (isUnicodeNotify(&infoPtr->header))
         {
+          if (buf != tvgit.pszText) COMCTL32_Free(buf); else mustFree = TRUE;
           text = tvgit.pszText;
         } else
@@ -3600 +3767 @@
           text = (WCHAR*)COMCTL32_Alloc(tvgit.cchTextMax*sizeof(WCHAR));
           lstrcpyAtoW(text,(LPSTR)tvgit.pszText);
+          COMCTL32_Free(buf);
         }
       } else
       {
         if (item->pszText == LPSTR_TEXTCALLBACKW)
-          TREEVIEW_SendDispInfoNotify(hwnd,item,TVN_GETDISPINFO,TVIF_TEXT);
-
-        text = item->pszText;
+          text = TREEVIEW_CallbackText(hwnd,item,&mustFree);
+        else
+          text = item->pszText;
       }
 #if 0 //CB: not yet
@@ -3622 +3790 @@
       SendMessageA(infoPtr->hwndToolTip,TTM_TRACKACTIVATE,(WPARAM)TRUE,(LPARAM)&ti);
 #endif
-      if (text != item->pszText) COMCTL32_Free(text);
+      if (mustFree) COMCTL32_Free(text);
     }
 
@@ -3673 +3841 @@
     if (TREEVIEW_TrackMouse(hwnd, ht.pt))
     {
-      TREEVIEW_SendTreeviewDnDNotify (hwnd, TVN_BEGINDRAG, ht.hItem, ht.pt);
+      TREEVIEW_SendTreeviewDnDNotify (hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_BEGINDRAGW:TVN_BEGINDRAGA, ht.hItem, ht.pt);
       infoPtr->dropItem = ht.hItem;
       return 0;
@@ -3745 +3913 @@
       if (ht.hItem)
       {
-         TREEVIEW_SendTreeviewDnDNotify (hwnd, TVN_BEGINRDRAG, ht.hItem, ht.pt);
+         TREEVIEW_SendTreeviewDnDNotify (hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_BEGINRDRAGW:TVN_BEGINDRAGA, ht.hItem, ht.pt);
          infoPtr->dropItem = ht.hItem;
       }
@@ -3784 +3952 @@
 TREEVIEW_CreateDragImage (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
- TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TREEVIEW_ITEM *dragItem;
- INT cx,cy;
- HDC    hdc,htopdc;
- HWND hwtop;
- HBITMAP hbmp,hOldbmp;
- SIZE  size;
- RECT  rc;
- HFONT hOldFont;
- WCHAR    *itemtxt;
-
-// TRACE (treeview,"\n");
- if (!(infoPtr->himlNormal))  return 0;
- dragItem=TREEVIEW_ValidItem (infoPtr, (HTREEITEM) lParam);
-
- if (!dragItem) return 0;
-
- if (dragItem->pszText==LPSTR_TEXTCALLBACKW) {
-     TREEVIEW_SendDispInfoNotify (hwnd, dragItem, TVN_GETDISPINFO, TVIF_TEXT);
- }
- itemtxt=dragItem->pszText;
-
- hwtop=GetDesktopWindow ();
- htopdc= GetDC (hwtop);
- hdc=CreateCompatibleDC (htopdc);
-
- hOldFont=SelectObject (hdc, infoPtr->hFont);
- GetTextExtentPoint32W (hdc, itemtxt, lstrlenW (itemtxt), &size);
-
- hbmp=CreateCompatibleBitmap (htopdc, size.cx, size.cy);
- hOldbmp=SelectObject (hdc, hbmp);
-
- ImageList_GetIconSize (infoPtr->himlNormal, &cx, &cy);
- size.cx+=cx;
- if (cy>size.cy) size.cy=cy;
-
- infoPtr->dragList=ImageList_Create (size.cx, size.cy, ILC_COLOR, 10, 10);
- ImageList_Draw (infoPtr->himlNormal, dragItem->iImage, hdc, 0, 0, ILD_NORMAL);
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  TREEVIEW_ITEM *dragItem;
+  INT cx,cy;
+  HDC    hdc,htopdc;
+  HWND hwtop;
+  HBITMAP hbmp,hOldbmp;
+  SIZE  size;
+  RECT  rc;
+  HFONT hOldFont;
+  WCHAR *itemtxt;
+  BOOL mustFree = FALSE;
+
+  if (!(infoPtr->himlNormal))  return 0;
+  dragItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM) lParam);
+
+  if (!dragItem) return 0;
+
+  if (dragItem->pszText == LPSTR_TEXTCALLBACKW)
+    itemtxt = TREEVIEW_CallbackText(hwnd,dragItem,&mustFree);
+  else
+    itemtxt = dragItem->pszText;
+
+  hwtop = GetDesktopWindow();
+  htopdc = GetDC(hwtop);
+  hdc = CreateCompatibleDC(htopdc);
+
+  hOldFont = SelectObject (hdc, infoPtr->hFont);
+  GetTextExtentPoint32W (hdc, itemtxt, lstrlenW (itemtxt), &size);
+
+  hbmp = CreateCompatibleBitmap (htopdc, size.cx, size.cy);
+  hOldbmp = SelectObject (hdc, hbmp);
+
+  ImageList_GetIconSize (infoPtr->himlNormal, &cx, &cy);
+  size.cx += cx;
+  if (cy > size.cy) size.cy = cy;
+
+  infoPtr->dragList = ImageList_Create (size.cx, size.cy, ILC_COLOR, 10, 10);
+  ImageList_Draw (infoPtr->himlNormal, dragItem->iImage, hdc, 0, 0, ILD_NORMAL);
 
 /*
@@ -3828 +3996 @@
 */
 
-/* draw item text */
-
- SetRect (&rc, cx, 0, size.cx,size.cy);
- DrawTextW (hdc, itemtxt, lstrlenW (itemtxt), &rc, DT_LEFT);
- SelectObject (hdc, hOldFont);
- SelectObject (hdc, hOldbmp);
-
- ImageList_Add (infoPtr->dragList, hbmp, 0);
-
- DeleteDC (hdc);
- DeleteObject (hbmp);
- ReleaseDC (hwtop, htopdc);
-
- return (LRESULT)infoPtr->dragList;
+  /* draw item text */
+
+  SetRect (&rc, cx, 0, size.cx,size.cy);
+  DrawTextW (hdc, itemtxt, lstrlenW (itemtxt), &rc, DT_LEFT);
+  SelectObject (hdc, hOldFont);
+  SelectObject (hdc, hOldbmp);
+
+  ImageList_Add (infoPtr->dragList, hbmp, 0);
+
+  DeleteDC (hdc);
+  DeleteObject (hbmp);
+  ReleaseDC (hwtop, htopdc);
+  if (mustFree) COMCTL32_Free(itemtxt);
+
+  return (LRESULT)infoPtr->dragList;
 }
 
@@ -3878 +4047 @@
         return FALSE;
 
-      prevItem= TREEVIEW_ValidItem (infoPtr, (HTREEITEM)prevSelect);
+      prevItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)prevSelect);
 
       if (newSelect)
-        if (TREEVIEW_SendTreeviewNotify(hwnd,TVN_SELCHANGING,cause,(HTREEITEM)prevSelect,(HTREEITEM)newSelect))
+        if (TREEVIEW_SendTreeviewNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_SELCHANGINGW:TVN_SELCHANGINGA,cause,(HTREEITEM)prevSelect,(HTREEITEM)newSelect))
           return FALSE;       /* FIXME: OK? */
 
@@ -3906 +4075 @@
       TREEVIEW_RefreshItem(hwnd,wineItem,FALSE);
 
-      TREEVIEW_SendTreeviewNotify(hwnd,TVN_SELCHANGED,cause,(HTREEITEM)prevSelect,(HTREEITEM)newSelect);
+      TREEVIEW_SendTreeviewNotify(hwnd,isUnicodeNotify(&infoPtr->header) ? TVN_SELCHANGEDW:TVN_SELCHANGEDA,cause,(HTREEITEM)prevSelect,(HTREEITEM)newSelect);
 
       break;
 
     case TVGN_DROPHILITE:
-      prevItem= TREEVIEW_ValidItem (infoPtr, infoPtr->dropItem);
+      prevItem = TREEVIEW_ValidItem (infoPtr, infoPtr->dropItem);
 
       if (prevItem)
@@ -4007 +4176 @@
 
 static LRESULT
-TREEVIEW_VScroll (HWND hwnd, WPARAM wParam, LPARAM lParam)
+TREEVIEW_VScroll(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -4420 +4589 @@
 static BOOL TREEVIEW_Compare(HWND hwnd,TREEVIEW_ITEM *item,LPWSTR text,INT textlen)
 {
+  WCHAR* itemtext;
+  BOOL mustFree = FALSE,res;
+
   if (item->pszText == LPSTR_TEXTCALLBACKW)
-    TREEVIEW_SendDispInfoNotify(hwnd,item,TVN_GETDISPINFO,TVIF_TEXT);
-  if (item->pszText == LPSTR_TEXTCALLBACKW) return FALSE;
+    itemtext = TREEVIEW_CallbackText(hwnd,item,&mustFree);
+  else
+    itemtext = item->pszText;
 
   //simulate lstrcmpniW
-  return CompareStringW(LOCALE_SYSTEM_DEFAULT,NORM_IGNORECASE,item->pszText,MIN(lstrlenW(item->pszText),textlen),text,textlen) == 2;
+  res = (CompareStringW(LOCALE_SYSTEM_DEFAULT,NORM_IGNORECASE,itemtext,MIN(lstrlenW(itemtext),textlen),text,textlen) == 2);
+  if (mustFree) COMCTL32_Free(itemtext);
+
+  return res;
 }
 
@@ -4573 +4749 @@
 
         case TVM_DELETEITEM:
-                return TREEVIEW_DeleteItem (hwnd, wParam, lParam);
+          return TREEVIEW_DeleteItem (hwnd, wParam, lParam);
 
         case TVM_EXPAND:
-                return TREEVIEW_Expand (hwnd, wParam, lParam);
+          return TREEVIEW_Expand (hwnd, wParam, lParam);
 
         case TVM_GETITEMRECT:
-                return TREEVIEW_GetItemRect (hwnd, wParam, lParam);
+          return TREEVIEW_GetItemRect (hwnd, wParam, lParam);
 
         case TVM_GETCOUNT:
-                return TREEVIEW_GetCount (hwnd, wParam, lParam);
+          return TREEVIEW_GetCount (hwnd, wParam, lParam);
 
         case TVM_GETINDENT:
-                return TREEVIEW_GetIndent (hwnd);
+          return TREEVIEW_GetIndent (hwnd);
 
         case TVM_SETINDENT:
-                return TREEVIEW_SetIndent (hwnd, wParam);
+          return TREEVIEW_SetIndent (hwnd, wParam);
 
         case TVM_GETIMAGELIST:
-                return TREEVIEW_GetImageList (hwnd, wParam, lParam);
+          return TREEVIEW_GetImageList (hwnd, wParam, lParam);
 
         case TVM_SETIMAGELIST:
-                return TREEVIEW_SetImageList (hwnd, wParam, lParam);
+          return TREEVIEW_SetImageList (hwnd, wParam, lParam);
 
         case TVM_GETNEXTITEM:
-                return TREEVIEW_GetNextItem (hwnd, wParam, lParam);
+          return TREEVIEW_GetNextItem (hwnd, wParam, lParam);
 
         case TVM_SELECTITEM:
-                return TREEVIEW_SelectItem (hwnd, wParam, lParam);
+          return TREEVIEW_SelectItem (hwnd, wParam, lParam);
 
         case TVM_GETITEMA:
-                return TREEVIEW_GetItem(hwnd,wParam,lParam,FALSE);
+          return TREEVIEW_GetItem(hwnd,wParam,lParam,FALSE);
 
         case TVM_GETITEMW:
-                return TREEVIEW_GetItem(hwnd,wParam,lParam,TRUE);
+          return TREEVIEW_GetItem(hwnd,wParam,lParam,TRUE);
 
         case TVM_SETITEMA:
-                return TREEVIEW_SetItem(hwnd,wParam,lParam,FALSE);
+          return TREEVIEW_SetItem(hwnd,wParam,lParam,FALSE);
 
         case TVM_SETITEMW:
-                return TREEVIEW_SetItem(hwnd,wParam,lParam,TRUE);
+          return TREEVIEW_SetItem(hwnd,wParam,lParam,TRUE);
 
         case TVM_EDITLABELA:
-                return TREEVIEW_EditLabel(hwnd,(HTREEITEM)lParam,FALSE);
+          return TREEVIEW_EditLabel(hwnd,(HTREEITEM)lParam,FALSE);
 
         case TVM_EDITLABELW:
-                return TREEVIEW_EditLabel(hwnd,(HTREEITEM)lParam,TRUE);
+          return TREEVIEW_EditLabel(hwnd,(HTREEITEM)lParam,TRUE);
 
         case TVM_GETEDITCONTROL:
-                return TREEVIEW_GetEditControl (hwnd);
+          return TREEVIEW_GetEditControl (hwnd);
 
         case TVM_GETVISIBLECOUNT:
-                return TREEVIEW_GetVisibleCount (hwnd, wParam, lParam);
+          return TREEVIEW_GetVisibleCount (hwnd, wParam, lParam);
 
         case TVM_HITTEST:
-                return TREEVIEW_HitTest(hwnd,(LPTVHITTESTINFO)lParam);
+          return TREEVIEW_HitTest(hwnd,(LPTVHITTESTINFO)lParam);
 
         case TVM_CREATEDRAGIMAGE:
-                return TREEVIEW_CreateDragImage (hwnd, wParam, lParam);
+          return TREEVIEW_CreateDragImage (hwnd, wParam, lParam);
 
         case TVM_SORTCHILDREN:
-                return TREEVIEW_SortChildren(hwnd, wParam, lParam);
+          return TREEVIEW_SortChildren(hwnd, wParam, lParam);
 
         case TVM_ENSUREVISIBLE:
-                return TREEVIEW_EnsureVisible(hwnd,(HTREEITEM)lParam);
+          return TREEVIEW_EnsureVisible(hwnd,(HTREEITEM)lParam);
 
         case TVM_SORTCHILDRENCB:
-                return TREEVIEW_SortChildrenCB(hwnd, wParam, lParam);
+          return TREEVIEW_SortChildrenCB(hwnd, wParam, lParam);
 
         case TVM_ENDEDITLABELNOW:
-                return TREEVIEW_EndEditLabelNow (hwnd,(BOOL)wParam);
+          return TREEVIEW_EndEditLabelNow (hwnd,(BOOL)wParam);
 
         case TVM_GETISEARCHSTRINGA:
-                return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,FALSE);
+          return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,FALSE);
 
         case TVM_GETISEARCHSTRINGW:
-                return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,TRUE);
+          return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,TRUE);
 
         case TVM_GETTOOLTIPS:
-                return TREEVIEW_GetToolTips (hwnd);
+          return TREEVIEW_GetToolTips (hwnd);
 
         case TVM_SETTOOLTIPS:
-                return TREEVIEW_SetToolTips (hwnd, wParam);
+          return TREEVIEW_SetToolTips (hwnd, wParam);
 
         case TVM_SETINSERTMARK:
-                return TREEVIEW_SetInsertMark (hwnd,wParam, lParam);
+          return TREEVIEW_SetInsertMark (hwnd,wParam, lParam);
 
         case TVM_SETITEMHEIGHT:
-                return TREEVIEW_SetItemHeight (hwnd, wParam);
+          return TREEVIEW_SetItemHeight (hwnd, wParam);
 
         case TVM_GETITEMHEIGHT:
-                return TREEVIEW_GetItemHeight (hwnd);
+          return TREEVIEW_GetItemHeight (hwnd);
 
         case TVM_SETBKCOLOR:
-                return TREEVIEW_SetBkColor (hwnd, wParam, lParam);
+          return TREEVIEW_SetBkColor (hwnd, wParam, lParam);
 
         case TVM_SETTEXTCOLOR:
-                return TREEVIEW_SetTextColor (hwnd, wParam, lParam);
+          return TREEVIEW_SetTextColor (hwnd, wParam, lParam);
 
         case TVM_GETBKCOLOR:
-                return TREEVIEW_GetBkColor (hwnd);
+          return TREEVIEW_GetBkColor (hwnd);
 
         case TVM_GETTEXTCOLOR:
-                return TREEVIEW_GetTextColor (hwnd);
+          return TREEVIEW_GetTextColor (hwnd);
 
         case TVM_SETSCROLLTIME:
-                return TREEVIEW_SetScrollTime (hwnd, (UINT)wParam);
+          return TREEVIEW_SetScrollTime (hwnd, (UINT)wParam);
 
         case TVM_GETSCROLLTIME:
-                return TREEVIEW_GetScrollTime (hwnd);
+          return TREEVIEW_GetScrollTime (hwnd);
 
         case TVM_GETITEMSTATE:
-                return TREEVIEW_GetItemState (hwnd,wParam, lParam);
+          return TREEVIEW_GetItemState (hwnd,wParam, lParam);
 
         case TVM_GETLINECOLOR:
-                return TREEVIEW_GetLineColor (hwnd,wParam, lParam);
+          return TREEVIEW_GetLineColor (hwnd,wParam, lParam);
 
         case TVM_SETLINECOLOR:
-                return TREEVIEW_SetLineColor (hwnd,wParam, lParam);
+          return TREEVIEW_SetLineColor (hwnd,wParam, lParam);
 
         case TVM_SETINSERTMARKCOLOR:
-                return TREEVIEW_SetInsertMarkColor (hwnd,wParam, lParam);
+          return TREEVIEW_SetInsertMarkColor (hwnd,wParam, lParam);
 
         case TVM_GETINSERTMARKCOLOR:
-                return TREEVIEW_GetInsertMarkColor (hwnd,wParam, lParam);
+          return TREEVIEW_GetInsertMarkColor (hwnd,wParam, lParam);
 
         case WM_COMMAND:
-                return TREEVIEW_Command (hwnd, wParam, lParam);
+          return TREEVIEW_Command (hwnd, wParam, lParam);
 
         case WM_DESTROY:
-                return TREEVIEW_Destroy (hwnd);
+          return TREEVIEW_Destroy (hwnd);
 
         case WM_ENABLE:
-                return TREEVIEW_Enable(hwnd,wParam,lParam);
+          return TREEVIEW_Enable(hwnd,wParam,lParam);
 
         case WM_ERASEBKGND:
-                return TREEVIEW_EraseBackground (hwnd, wParam, lParam);
+          return TREEVIEW_EraseBackground (hwnd, wParam, lParam);
 
         case WM_GETDLGCODE:
-                return TREEVIEW_GetDlgCode(hwnd,wParam,lParam);
+          return TREEVIEW_GetDlgCode(hwnd,wParam,lParam);
 
         case WM_PAINT:
-                return TREEVIEW_Paint (hwnd, wParam, lParam);
+          return TREEVIEW_Paint (hwnd, wParam, lParam);
 
         case WM_GETFONT:
-                return TREEVIEW_GetFont (hwnd, wParam, lParam);
+          return TREEVIEW_GetFont (hwnd, wParam, lParam);
 
         case WM_SETFONT:
-                return TREEVIEW_SetFont (hwnd, wParam, lParam);
+          return TREEVIEW_SetFont (hwnd, wParam, lParam);
 
         case WM_KEYDOWN:
-                return TREEVIEW_KeyDown (hwnd, wParam, lParam);
+          return TREEVIEW_KeyDown (hwnd, wParam, lParam);
 
         case WM_CHAR:
-                return TREEVIEW_Char(hwnd,wParam,lParam);
+          return TREEVIEW_Char(hwnd,wParam,lParam);
 
         case WM_SETFOCUS:
-                return TREEVIEW_SetFocus (hwnd, wParam, lParam);
+          return TREEVIEW_SetFocus (hwnd, wParam, lParam);
 
         case WM_KILLFOCUS:
-                return TREEVIEW_KillFocus (hwnd, wParam, lParam);
+          return TREEVIEW_KillFocus (hwnd, wParam, lParam);
 
         case WM_MOUSEMOVE:
-                return TREEVIEW_MouseMove(hwnd,wParam,lParam);
+          return TREEVIEW_MouseMove(hwnd,wParam,lParam);
 
         case WM_LBUTTONDOWN:
-                return TREEVIEW_LButtonDown (hwnd, wParam, lParam);
+          return TREEVIEW_LButtonDown (hwnd, wParam, lParam);
 
         case WM_LBUTTONDBLCLK:
-                return TREEVIEW_LButtonDoubleClick (hwnd, wParam, lParam);
+          return TREEVIEW_LButtonDoubleClick (hwnd, wParam, lParam);
 
         case WM_RBUTTONDOWN:
-                return TREEVIEW_RButtonDown (hwnd, wParam, lParam);
+          return TREEVIEW_RButtonDown (hwnd, wParam, lParam);
 
         case WM_RBUTTONDBLCLK:
-                return TREEVIEW_RButtonDoubleClick(hwnd,wParam,lParam);
+          return TREEVIEW_RButtonDoubleClick(hwnd,wParam,lParam);
 
         case WM_STYLECHANGED:
-                return TREEVIEW_StyleChanged (hwnd, wParam, lParam);
+          return TREEVIEW_StyleChanged (hwnd, wParam, lParam);
 
         case WM_SYSCOLORCHANGE:
-                return TREEVIEW_SysColorChange(hwnd,wParam,lParam);
+          return TREEVIEW_SysColorChange(hwnd,wParam,lParam);
 
         case WM_SETCURSOR:
-                return TREEVIEW_SetCursor(hwnd,wParam,lParam);
+          return TREEVIEW_SetCursor(hwnd,wParam,lParam);
 
         case WM_SETREDRAW:
-                return TREEVIEW_SetRedraw(hwnd,wParam,lParam);
+          return TREEVIEW_SetRedraw(hwnd,wParam,lParam);
 
         case WM_TIMER:
-                return TREEVIEW_HandleTimer (hwnd, wParam, lParam);
+          return TREEVIEW_HandleTimer (hwnd, wParam, lParam);
 
         case WM_SIZE:
-                return TREEVIEW_Size (hwnd, wParam,lParam);
+          return TREEVIEW_Size (hwnd, wParam,lParam);
 
         case WM_HSCROLL:
-                return TREEVIEW_HScroll (hwnd, wParam, lParam);
+          return TREEVIEW_HScroll (hwnd, wParam, lParam);
 
         case WM_VSCROLL:
-                return TREEVIEW_VScroll (hwnd, wParam, lParam);
+          return TREEVIEW_VScroll (hwnd, wParam, lParam);
 
         case WM_MOUSEWHEEL:
-                return TREEVIEW_MouseWheel (hwnd, wParam, lParam);
+          return TREEVIEW_MouseWheel (hwnd, wParam, lParam);
 
         case WM_DRAWITEM:
-                //printf ("drawItem\n");
-                return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+          //printf ("drawItem\n");
+           return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 
         default:
-              //if (uMsg >= WM_USER)
-              //  FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
-              //     uMsg, wParam, lParam);
-            return defComCtl32ProcA(hwnd,uMsg,wParam,lParam);
+          return defComCtl32ProcA(hwnd,uMsg,wParam,lParam);
       }
     return 0;