Changeset 8382 for trunk/src/comctl32

Timestamp:

May 8, 2002, 1:26:30 PM (23 years ago)

Author:

sandervl

Message:

merge with latest Wine

Location:

trunk/src/comctl32

Files:

• CCBase.cpp (modified) (2 diffs)
• LICENSE.TXT (modified) (1 diff)
• animate.c (modified) (20 diffs)
• comboex.c (modified) (91 diffs)
• comctl32.def (modified) (3 diffs)
• comctl32.h (modified) (6 diffs)
• comctl32dbg.def (modified) (2 diffs)
• comctl32undoc.c (modified) (9 diffs)
• commctrl.c (modified) (8 diffs)
• dbgwrap.cpp (modified) (2 diffs)
• flatsb.c (modified) (18 diffs)
• imagelist.c (modified) (10 diffs)
• imagelist.h (added)
• ipaddress.c (modified) (5 diffs)
• listview.c (modified) (548 diffs)
• nativefont.c (added)
• nativefont.cpp (deleted)
• pager.c (modified) (15 diffs)
• progress.c (added)
• progress.cpp (deleted)
• rebar.c (modified) (13 diffs)
• rsrc.orc (modified) (3 diffs)
• tab.c (modified) (2 diffs)
• toolbar.c (modified) (85 diffs)
• tooltips.cpp (modified) (1 diff)
• updown.c (added)
• updown.cpp (deleted)

trunk/src/comctl32/CCBase.cpp

@@ -1 @@
-/* $Id: CCBase.cpp,v 1.9 2000-04-16 18:52:38 cbratschi Exp $ */
+/* $Id: CCBase.cpp,v 1.10 2002-05-08 11:24:58 sandervl Exp $ */
 /*
  * COMCTL32 Base Functions and Macros for all Controls
@@ -7 +7 @@
  * parts from WINE code
  */
+#include <winuser.h>
 #include <string.h>
 #include <wcstr.h>
 #include "winbase.h"
 #include "comctl32.h"
+#include <commctrl.h>
 #include "ccbase.h"
 

trunk/src/comctl32/LICENSE.TXT

@@ -1 @@
-$Id: LICENSE.TXT,v 1.2 2001-07-21 09:07:16 sandervl Exp $
-@c This is an additional Odin license agreement.
-@c It supercedes the main Odin license, but is only valid in 
-@c the source directory in which it is present.
+$Id: LICENSE.TXT,v 1.3 2002-05-08 11:24:58 sandervl Exp $
+This is an additional Odin license agreement.
+It supercedes the main Odin license, but is only valid in 
+the source directory in which it is present.
 
-@c This file is processed by GNU's TeXinfo
-@c If you modify it or move it to another location, make sure that
-@c TeXinfo works (type `make' in directory documentation).
-
-Copyright (c) 1993-2000 the Wine project authors (see the file AUTHORS
+Copyright (c) 1993-2002 the Wine project authors (see the file AUTHORS
 for a complete list)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Wine is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version. 
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+A copy of the GNU Lesser General Public License is included in the
+Wine distribution in the file COPYING.LIB. If you did not receive this
+copy, write to the Free Software Foundation, Inc., 59 Temple Place,
+Suite 330, Boston, MA 02111-1307 USA.

trunk/src/comctl32/animate.c

@@ -5 +5 @@
  * Copyright 1998, 1999 Eric Kohl
  *                 1999 Eric Pouech
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -20 +34 @@
 #include "vfw.h"
 #include "mmsystem.h"
-#include "debugtools.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(animate);
+
+static struct {
+    HMODULE     hModule;
 #ifdef __WIN32OS2__
-#include "ccbase.h"
+    HIC         (* WINAPI fnICOpen)(DWORD, DWORD, UINT);
+    LRESULT     (* WINAPI fnICClose)(HIC);
+    LRESULT     (* WINAPI fnICSendMessage)(HIC, UINT, DWORD, DWORD);
+    DWORD       (* WINAPIV fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
+#else
+    HIC         (WINAPI *fnICOpen)(DWORD, DWORD, UINT);
+    LRESULT     (WINAPI *fnICClose)(HIC);
+    LRESULT     (WINAPI *fnICSendMessage)(HIC, UINT, DWORD, DWORD);
+    DWORD       (WINAPIV *fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
 #endif
-
-DEFAULT_DEBUG_CHANNEL(animate);
+} fnIC;
 
 typedef struct
 {
-#ifdef __WIN32OS2__
-   COMCTL32_HEADER      header;
-#endif
    /* reference to input stream (file or resource) */
    HGLOBAL              hRes;
@@ -71 +94 @@
 }
 
-#ifdef __WIN32OS2__
-static BOOL ANIMATE_LoadRes(ANIMATE_INFO *infoPtr,HINSTANCE hInst,LPWSTR lpName,BOOL unicode)
-#else
 static BOOL ANIMATE_LoadResA(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPSTR lpName)
-#endif
 {
     HRSRC       hrsrc;
@@ -81 +100 @@
     LPVOID      lpAvi;
     
-#ifdef __WIN32OS2__
-    if (unicode)
-      hrsrc = FindResourceW(hInst,lpName,(LPWSTR)L"AVI");
-    else
-      hrsrc = FindResourceA(hInst,(LPCSTR)lpName,"AVI");
-#else
     hrsrc = FindResourceA(hInst, lpName, "AVI");
-#endif
     if (!hrsrc)
         return FALSE;
@@ -114 +126 @@
 
 
-#ifdef __WIN32OS2__
-static BOOL ANIMATE_LoadFile(ANIMATE_INFO *infoPtr,LPWSTR lpName,BOOL unicode)
-#else
 static BOOL ANIMATE_LoadFileA(ANIMATE_INFO *infoPtr, LPSTR lpName)
-#endif
-{
-#ifdef __WIN32OS2__
-    if (unicode)
-      infoPtr->hMMio = mmioOpenW(lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
-    else
-      infoPtr->hMMio = mmioOpenA((LPSTR)lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
-#else
+{
     infoPtr->hMMio = mmioOpenA((LPSTR)lpName, NULL,
                                MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
-#endif
+    
     if (!infoPtr->hMMio)
         return FALSE;
@@ -174 +176 @@
         }
         if (infoPtr->hic) {
-            ICClose(infoPtr->hic);
+            fnIC.fnICClose(infoPtr->hic);
             infoPtr->hic = 0;
         }
@@ -348 +350 @@
     
     if (infoPtr->hic &&
-        ICDecompress(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata, 
+        fnIC.fnICDecompress(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata, 
                      infoPtr->outbih, infoPtr->outdata) != ICERR_OK) {
         LeaveCriticalSection(&infoPtr->cs);
@@ -636 +638 @@
     /* check uncompressed AVI */
     if ((infoPtr->ash.fccHandler == mmioFOURCC('D', 'I', 'B', ' ')) ||
-       (infoPtr->ash.fccHandler == mmioFOURCC('R', 'L', 'E', ' ')))
+       (infoPtr->ash.fccHandler == mmioFOURCC('R', 'L', 'E', ' ')) ||
+       (infoPtr->ash.fccHandler == mmioFOURCC(0, 0, 0, 0)))
     {
         infoPtr->hic = 0;             
@@ -643 +646 @@
 
     /* try to get a decompressor for that type */
-    infoPtr->hic = ICOpen(ICTYPE_VIDEO, infoPtr->ash.fccHandler, ICMODE_DECOMPRESS);
+    infoPtr->hic = fnIC.fnICOpen(ICTYPE_VIDEO, infoPtr->ash.fccHandler, ICMODE_DECOMPRESS);
     if (!infoPtr->hic) {
         WARN("Can't load codec for the file\n");
@@ -649 +652 @@
     }
     
-    outSize = ICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
+    outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
                             (DWORD)infoPtr->inbih, 0L);
 
@@ -658 +661 @@
     }
 
-    if (ICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
+    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
                       (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) {
         WARN("Can't get output BIH\n");
@@ -670 +673 @@
     }
 
-    if (ICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, 
+    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, 
                       (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) {
         WARN("Can't begin decompression\n");
@@ -679 +682 @@
 }
 
-#ifdef __WIN32OS2__
-static LRESULT ANIMATE_Open(HWND hWnd, WPARAM wParam, LPARAM lParam,BOOL unicode)
-#else
 static LRESULT ANIMATE_OpenA(HWND hWnd, WPARAM wParam, LPARAM lParam)
-#endif
 {
     ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(hWnd);
@@ -689 +688 @@
 
     ANIMATE_Free(infoPtr);
+    infoPtr->hWnd = hWnd;
 
     if (!lParam) {
@@ -698 +698 @@
        hInstance = GetWindowLongA(hWnd, GWL_HINSTANCE);
 
-#ifdef __WIN32OS2__
-    if (HIWORD(lParam)) {
-        //TRACE("(\"%s\");\n", (LPSTR)lParam);
-
-        if (!ANIMATE_LoadRes(infoPtr, hInstance, (LPWSTR)lParam,unicode)) {
-            TRACE("No AVI resource found!\n");
-            if (!ANIMATE_LoadFile(infoPtr, (LPWSTR)lParam,unicode)) {
-                WARN("No AVI file found!\n");
-                return FALSE;
-            }
-        }
-    } else {
-        //TRACE("(%u);\n", (WORD)LOWORD(lParam));
-
-        if (!ANIMATE_LoadRes(infoPtr,hInstance,unicode ? MAKEINTRESOURCEW((INT)lParam):(LPWSTR)MAKEINTRESOURCEA((INT)lParam),unicode)) {
-            WARN("No AVI resource found!\n");
-            return FALSE;
-        }
-    }
-#else
     if (HIWORD(lParam)) {
         TRACE("(\"%s\");\n", (LPSTR)lParam);
@@ -737 +717 @@
         }
     }
-#endif
+
     if (!ANIMATE_GetAviInfo(infoPtr)) {
         WARN("Can't get AVI information\n");
@@ -782 +762 @@
     ANIMATE_INFO*       infoPtr;
 
+    if (!fnIC.hModule) /* FIXME: not thread safe */
+    {
+        /* since there's a circular dep between msvfw32 and comctl32, we could either:
+         * - fix the build chain to allow this circular dep
+         * - handle it by hand
+         * AJ wants the latter :-(
+         */
+        fnIC.hModule = LoadLibraryA("msvfw32.dll");
+        if (!fnIC.hModule) return FALSE;
+
+        fnIC.fnICOpen        = (void*)GetProcAddress(fnIC.hModule, "ICOpen");
+        fnIC.fnICClose       = (void*)GetProcAddress(fnIC.hModule, "ICClose");
+        fnIC.fnICSendMessage = (void*)GetProcAddress(fnIC.hModule, "ICSendMessage");
+        fnIC.fnICDecompress  = (void*)GetProcAddress(fnIC.hModule, "ICDecompress");
+    }
+
     /* allocate memory for info structure */
-#ifdef __WIN32OS2__
-    infoPtr = (ANIMATE_INFO*)initControl(hWnd,sizeof(ANIMATE_INFO));
-#else
     infoPtr = (ANIMATE_INFO *)COMCTL32_Alloc(sizeof(ANIMATE_INFO));
-#endif
     if (!infoPtr) {
         ERR("could not allocate info memory!\n");
@@ -854 +846 @@
     switch (uMsg)
     {
-#ifdef __WIN32OS2__
-    case ACM_OPENA:
-        return ANIMATE_Open(hWnd,wParam,lParam,FALSE);
-
-    case ACM_OPENW:
-        return ANIMATE_Open(hWnd,wParam,lParam,TRUE);
-#else
     case ACM_OPENA:
         return ANIMATE_OpenA(hWnd, wParam, lParam);
@@ -866 +851 @@
         /*      case ACM_OPEN32W: FIXME!! */
         /*          return ANIMATE_Open32W(hWnd, wParam, lParam); */
-#endif
         
     case ACM_PLAY:
@@ -944 +928 @@
             ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
         
-#ifdef __WIN32OS2__
-        return defComCtl32ProcA (hWnd, uMsg, wParam, lParam);
-#else
         return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-#endif
     }
     return 0;
 }
-
 
 void ANIMATE_Register(void)

trunk/src/comctl32/comboex.c

@@ -1 +1 @@
 /*
- * TODO   <-------------
- *  1. The following extended styles need to be implemented, use will
- *     result in a FIXME:
- *           CBES_EX_NOEDITIMAGEINDENT
+ * ComboBoxEx control
+ *
+ * Copyright 1998, 1999 Eric Kohl
+ * Copyright 2000, 2001, 2002 Guy Albertelli <galberte@neo.lrun.com>
+ * Copyright 2002 Dimitrie O. Paun
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * FIXME:
+ *  1. Implement following extended styles:
  *           CBES_EX_PATHWORDBREAKPROC
  *           CBES_EX_NOSIZELIMIT
  *           CBES_EX_CASESENSITIVE
- *  2. None of the following callback items are implemented. Therefor
- *     no CBEN_GETDISPINFO notifies are issued. Use in either CBEM_INSERTITEM
- *     or CBEM_SETITEM will result in a FIXME:
- *           LPSTR_TEXTCALLBACK
- *           I_IMAGECALLBACK
- *           I_INDENTCALLBACK
- *  3. No use is made of the iOverlay image.
- *  4. Notify CBEN_DRAGBEGIN is not implemented.
- */
-
-
-/*
- * ComboBoxEx control v2 (mod6)
- *
- * Copyright 1998, 1999 Eric Kohl
- *
- * NOTES
- *   This is just a dummy control. An author is needed! Any volunteers?
- *   I will only improve this control once in a while.
- *     Eric <ekohl@abo.rhein-zeitung.de>
- *
-
- * Changes  Guy Albertelli <galberte@neo.lrun.com>
- * v1  Implemented messages: CB_SETITEMHEIGHT, WM_WINDOWPOSCHANGING,
- *      WM_DRAWITEM, and WM_MEASUREITEM. Fixed WM_CREATE. Fixed height
- *      of window rect reported fixing rebar control.
- * v2
- *   1. Rewrite of WM_Create for own created EDIT control. Also try to
- *      generate message sequence similar to native DLL.
- *   2. Handle case where CBEM_SETITEM is called to display data in EDIT
- *      Control. 
- *   3. Add override for WNDPROC for the EDIT control (reqed for VK_RETURN).
- *   4. Dump input data for things using COMBOBOXEXITEM{A|W}.
- *   5. Handle positioning EDIT control based on whether icon present.
- *   6. Make InsertItemA use InsertItemW, and store all data in ..W form.
- *   7. Implement CBEM_DELETEITEM, CBEM_GETITEM{A|W}, CB_SETCURSEL,
- *      CBEM_{GET|SET}UNICODEFORMAT.
- *   8. Add override for WNDPROC for the COMBO control.
- *   9. Support extended style CBES_EX_NOEDITIMAGE and warn others are not
- *      supported.
- *  10. Implement CB_FINDSTRINGEXACT in both the Combo and ComboEx window
- *      procs to match the items. This eliminates dup entries in the listbox.
- *
- *  mod 4
- *   1. Implemented CBN_SELCHANGE, CBN_KILLFOCUS, and CBN_SELENDOK.
- *   2. Fix putting text in CBEN_ENDEDIT notifies for CBN_DROPDOWN case.
- *   3. Lock image selected status to focus state of edit control if
- *      edit control exists. Mimics native actions.
- *   4. Implemented WM_SETFOCUS in EditWndProc to track status of 
- *      focus for 3 above.
- *   5. The LBN_SELCHANGE is just for documentation purposes.
- *
- *  mod 5
- *   1. Add support for CB_GETITEMDATA to a Comboex. Returns the LPARAM
- *      passed during insert of item.
- *   2. Remember selected item and don't issue CB_SETCURSEL unless needed.
- *   3. Add initial support for WM_NCCREATE to remove unwanted window styles
- *      (Currently just WS_VSCROLL and WS_HSCROLL, but probably should be
- *       more.)
- *   4. Improve some traces.
- *   5. Add support for CB_SETITEMDATA sets LPARAM value from item.
- *
- *  mod 6
- *   1. Add support for WM_NOTIFYFORMAT (both incoming and outgoing) and do 
- *      WM_NOTIFY correctly based on results.
- *   2. Fix memory leaks of text strings in COMBOEX_WM_DELETEITEM.
- *   3. Add routines to handle special cases of NMCBEENDEDIT and NMCOMBOXEX
- *      so translation to ANSI is done correctly. 
- *   4. Fix some issues with COMBOEX_DrawItem.
- *
- * Test vehicals were the ControlSpy modules (rebar.exe and comboboxex.exe),
- *  WinRAR, and IE 4.0.
+ *  2. Notify CBEN_DRAGBEGIN is not implemented.
  *
  */
@@ -85 +32 @@
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "wine/unicode.h"
 
-DEFAULT_DEBUG_CHANNEL(comboex);
-/*
- * The following is necessary for the test done in COMBOEX_DrawItem
- * to determine whether to dump out the DRAWITEM structure or not.
- */
-DECLARE_DEBUG_CHANNEL(message);
+WINE_DEFAULT_DEBUG_CHANNEL(comboex);
 
 /* Item structure */
@@ -101 +43 @@
     UINT         mask;
     LPWSTR       pszText;
+    LPWSTR       pszTemp;
     int          cchTextMax;
     int          iImage;
@@ -117 +60 @@
     HWND         hwndEdit;
     WNDPROC      prevEditWndProc;  /* previous Edit WNDPROC value */
-    WNDPROC      prevComboWndProc;   /* previous Combo WNDPROC value */
+    WNDPROC      prevComboWndProc; /* previous Combo WNDPROC value */
     DWORD        dwExtStyle;
     INT          selected;         /* index of selected item */
     DWORD        flags;            /* WINE internal flags */
-    HFONT        hDefaultFont;
+    HFONT        defaultFont;
     HFONT        font;
     INT          nb_items;         /* Number of items */
-    BOOL         bUnicode;        /* TRUE if this window is Unicode   */
-    BOOL         NtfUnicode;      /* TRUE if parent wants notify in Unicode */
+    BOOL         unicode;          /* TRUE if this window is Unicode   */
+    BOOL         NtfUnicode;       /* TRUE if parent wants notify in Unicode */
     CBE_ITEMDATA *edit;            /* item data for edit item */
     CBE_ITEMDATA *items;           /* Array of items */
@@ -131 +74 @@
 
 /* internal flags in the COMBOEX_INFO structure */
-#define  WCBE_ACTEDIT        0x00000001     /* Edit active i.e.
+#define  WCBE_ACTEDIT           0x00000001     /* Edit active i.e.
                                              * CBEN_BEGINEDIT issued
                                              * but CBEN_ENDEDIT{A|W}
                                              * not yet issued. */
-#define  WCBE_EDITCHG        0x00000002     /* Edit issued EN_CHANGE */
-#define  WCBE_EDITFOCUSED    0x00000004     /* Edit control has focus */
-
-
-#define ID_CB_EDIT    1001
+#define  WCBE_EDITCHG           0x00000002     /* Edit issued EN_CHANGE */
+#define  WCBE_EDITHASCHANGED    (WCBE_ACTEDIT | WCBE_EDITCHG)
+#define  WCBE_EDITFOCUSED       0x00000004     /* Edit control has focus */
+
+
+#define ID_CB_EDIT              1001
 
 
@@ -152 +96 @@
  * only version 4.0 applications will have ODS_COMBOBOXEDIT set.
  */
-#define ODS_COMBOEXLBOX  0x4000
+#define ODS_COMBOEXLBOX         0x4000
 
 
 
 /* Height in pixels of control over the amount of the selected font */
-#define CBE_EXTRA     3
+#define CBE_EXTRA               3
 
 /* Indent amount per MS documentation */
-#define CBE_INDENT    10
+#define CBE_INDENT              10
 
 /* Offset in pixels from left side for start of image or text */
-#define CBE_STARTOFFSET   6
+#define CBE_STARTOFFSET         6
 
 /* Offset between image and text */
-#define CBE_SEP   4
-
-#define COMBOEX_GetInfoPtr(hwnd) ((COMBOEX_INFO *)GetWindowLongA (hwnd, 0))
+#define CBE_SEP                 4
+
+#define COMBOEX_SUBCLASS_PROP   "CCComboEx32SubclassInfo"
+#define COMBOEX_GetInfoPtr(hwnd) ((COMBOEX_INFO *)GetWindowLongW (hwnd, 0))
 
 
 /* Things common to the entire DLL */
-static ATOM ComboExInfo;
 static LRESULT WINAPI
 COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 static LRESULT WINAPI
 COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-static void
-COMBOEX_DumpItem (CBE_ITEMDATA *item)
-{
-    if (TRACE_ON(comboex)){
-      TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n",
-            item, item->mask, item->pszText, item->cchTextMax,
-            item->iImage);
-      TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
-            item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
-      if ((item->mask & CBEIF_TEXT) && item->pszText)
-          TRACE("item %p - pszText=%s\n",
-                item, debugstr_w((const WCHAR *)item->pszText));
-    }
-}
-
-
-static void
-COMBOEX_DumpInput (COMBOBOXEXITEMA *input, BOOL true_for_w)
-{
-    if (TRACE_ON(comboex)){
-      TRACE("input - mask=%08x, iItem=%d, pszText=%p, cchTM=%d, iImage=%d\n",
-            input->mask, input->iItem, input->pszText, input->cchTextMax,
-            input->iImage);
-      if ((input->mask & CBEIF_TEXT) && input->pszText) {
-          if (true_for_w)
-              TRACE("input - pszText=<%s>\n", 
-                    debugstr_w((const WCHAR *)input->pszText));
-          else 
-              TRACE("input - pszText=<%s>\n", 
-                    debugstr_a((const char *)input->pszText));
-      }
-      TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
-            input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
-    }
-}
-
-
-inline static LRESULT
-COMBOEX_Forward (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    if (infoPtr->hwndCombo)    
-        return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
-
-    return 0;
-}
-
-
-static INT
-COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr)
-{
-
+static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr);
+
+inline static BOOL is_textW(LPCWSTR str)
+{
+    return str && str != LPSTR_TEXTCALLBACKW;
+}
+
+inline static BOOL is_textA(LPCSTR str)
+{
+    return str && str != LPSTR_TEXTCALLBACKA;
+}
+
+inline static LPCSTR debugstr_txt(LPCWSTR str)
+{
+    if (str == LPSTR_TEXTCALLBACKW) return "(callback)";
+    return debugstr_w(str);
+}
+
+static void COMBOEX_DumpItem (CBE_ITEMDATA *item)
+{
+    TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n",
+          item, item->mask, item->pszText, item->cchTextMax, item->iImage);
+    TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
+          item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
+    if (item->mask & CBEIF_TEXT)
+        TRACE("item %p - pszText=%s\n", item, debugstr_txt(item->pszText));
+}
+
+
+static void COMBOEX_DumpInput (COMBOBOXEXITEMW *input)
+{
+    TRACE("input - mask=%08x, iItem=%d, pszText=%p, cchTM=%d, iImage=%d\n",
+          input->mask, input->iItem, input->pszText, input->cchTextMax,
+          input->iImage);
+    if (input->mask & CBEIF_TEXT)
+        TRACE("input - pszText=<%s>\n", debugstr_txt(input->pszText));
+    TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
+          input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
+}
+
+
+inline static CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index)
+{
+    return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA, 
+                                         (WPARAM)index, 0);
+}
+
+
+static INT COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr)
+{
     hdr->idFrom = GetDlgCtrlID (infoPtr->hwndSelf);
     hdr->hwndFrom = infoPtr->hwndSelf;
@@ -246 +186 @@
 COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, INT code, NMCOMBOBOXEXW *hdr)
 {
-
     /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */
-
-    hdr->hdr.idFrom = GetDlgCtrlID (infoPtr->hwndSelf);
-    hdr->hdr.hwndFrom = infoPtr->hwndSelf;
-    hdr->hdr.code = code;
     if (infoPtr->NtfUnicode)
-        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)hdr);
+        return COMBOEX_Notify (infoPtr, code, &hdr->hdr);
     else {
-        LPWSTR str, ostr = NULL;
+        LPWSTR wstr = hdr->ceItem.pszText;
+        LPSTR astr = 0;
         INT ret, len = 0;
 
-        if (hdr->ceItem.mask & CBEIF_TEXT) {
-            ostr = hdr->ceItem.pszText;
-            str = ostr;
-            if (!str) str = (LPWSTR)L"";
-            len = WideCharToMultiByte (CP_ACP, 0, str, -1, 0, 0, NULL, NULL);
+        if ((hdr->ceItem.mask & CBEIF_TEXT) && is_textW(wstr)) {
+            len = WideCharToMultiByte (CP_ACP, 0, wstr, -1, 0, 0, NULL, NULL);
             if (len > 0) {
-                hdr->ceItem.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(CHAR));
-                WideCharToMultiByte (CP_ACP, 0, str, -1, (LPSTR)hdr->ceItem.pszText,
-                                     len, NULL, NULL);
+                astr = (LPSTR)COMCTL32_Alloc ((len + 1)*sizeof(CHAR));
+                if (!astr) return 0;
+                WideCharToMultiByte (CP_ACP, 0, wstr, -1, astr, len, 0, 0);
+                hdr->ceItem.pszText = (LPWSTR)astr;
             }
         }
 
-        ret = SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                            (LPARAM)hdr);
-        if (hdr->ceItem.mask & CBEIF_TEXT) {
-            if (len > 0)
-                COMCTL32_Free (hdr->ceItem.pszText);
-            hdr->ceItem.pszText = ostr;
-        }
+        if (code == CBEN_ENDEDITW) code = CBEN_ENDEDITA;
+        else if (code == CBEN_GETDISPINFOW) code = CBEN_GETDISPINFOA;
+        else if (code == CBEN_DRAGBEGINW) code = CBEN_DRAGBEGINA;
+        
+        ret = COMBOEX_Notify (infoPtr, code, (NMHDR *)hdr);
+
+        if (astr && hdr->ceItem.pszText == (LPWSTR)astr)
+            hdr->ceItem.pszText = wstr;
+        
+        if (astr) COMCTL32_Free(astr);
+        
         return ret;
     }
@@ -283 +220 @@
 
 
-static INT
-COMBOEX_NotifyEndEdit (COMBOEX_INFO *infoPtr, NMCBEENDEDITW *hdr, LPWSTR itemText)
-{
-
+static INT COMBOEX_NotifyEndEdit (COMBOEX_INFO *infoPtr, NMCBEENDEDITW *neew, LPCWSTR wstr)
+{
     /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */
-
-    hdr->hdr.idFrom = GetDlgCtrlID (infoPtr->hwndSelf);
-    hdr->hdr.hwndFrom = infoPtr->hwndSelf;
-    hdr->hdr.code = (infoPtr->NtfUnicode) ? CBEN_ENDEDITW : CBEN_ENDEDITA;
-    if (infoPtr->NtfUnicode)
-        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)hdr);
-    else {
-        NMCBEENDEDITA ansi;
-
-        memcpy (&ansi.hdr, &hdr->hdr, sizeof(NMHDR));
-        ansi.fChanged = hdr->fChanged;
-        ansi.iNewSelection = hdr->iNewSelection;
-        WideCharToMultiByte (CP_ACP, 0, itemText, -1,
-                             (LPSTR)&ansi.szText, CBEMAXSTRLEN, NULL, NULL);
-        ansi.iWhy = hdr->iWhy;
-        return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                             (LPARAM)&ansi);
-    }
-}
-
-
-static void
-COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size)
+    if (infoPtr->NtfUnicode) {
+        lstrcpynW(neew->szText, wstr, CBEMAXSTRLEN);
+        return COMBOEX_Notify (infoPtr, CBEN_ENDEDITW, &neew->hdr);
+    } else {
+        NMCBEENDEDITA neea;
+        
+        memcpy (&neea.hdr, &neew->hdr, sizeof(NMHDR));
+        neea.fChanged = neew->fChanged;
+        neea.iNewSelection = neew->iNewSelection;
+        WideCharToMultiByte (CP_ACP, 0, wstr, -1, neea.szText, CBEMAXSTRLEN, 0, 0);
+        neea.iWhy = neew->iWhy;
+
+        return COMBOEX_Notify (infoPtr, CBEN_ENDEDITA, &neea.hdr);
+    }
+}
+
+
+static void COMBOEX_FreeText (CBE_ITEMDATA *item)
+{
+    if (is_textW(item->pszText)) COMCTL32_Free(item->pszText);
+    item->pszText = 0;
+    if (item->pszTemp) COMCTL32_Free(item->pszTemp);
+    item->pszTemp = 0;
+}
+
+
+static LPCWSTR COMBOEX_GetText(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item)
+{
+    NMCOMBOBOXEXW nmce;
+    LPWSTR text, buf;
+    INT len;
+    
+    if (item->pszText != LPSTR_TEXTCALLBACKW) 
+        return item->pszText;
+    
+    ZeroMemory(&nmce, sizeof(nmce));
+    nmce.ceItem.mask = CBEIF_TEXT;
+    COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
+
+    if (is_textW(nmce.ceItem.pszText)) {
+        len = MultiByteToWideChar (CP_ACP, 0, (LPSTR)nmce.ceItem.pszText, -1, NULL, 0);
+        buf = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        if (buf)
+            MultiByteToWideChar (CP_ACP, 0, (LPSTR)nmce.ceItem.pszText, -1, buf, len);
+        if (nmce.ceItem.mask & CBEIF_DI_SETITEM) {
+            COMBOEX_FreeText(item);
+            item->pszText = buf;
+        } else {
+            if (item->pszTemp) COMCTL32_Free(item->pszTemp);
+            item->pszTemp = buf;
+        }
+        text = buf;
+    } else
+        text = nmce.ceItem.pszText;
+    
+    if (nmce.ceItem.mask & CBEIF_DI_SETITEM)
+        item->pszText = text;
+    return text;
+}
+
+
+static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size)
 {
     HFONT nfont, ofont;
@@ -326 +299 @@
 
 
-static void
-COMBOEX_CopyItem (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit)
+static void COMBOEX_CopyItem (CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit)
 {
     if (cit->mask & CBEIF_TEXT) {
-        cit->pszText        = item->pszText;
-        cit->cchTextMax     = item->cchTextMax;
+        /*
+         * when given a text buffer actually use that buffer
+         */
+        if (cit->pszText) {
+            if (is_textW(item->pszText))
+                lstrcpynW(cit->pszText, item->pszText, cit->cchTextMax);
+            else
+                cit->pszText[0] = 0;
+        } else {
+            cit->pszText        = item->pszText;
+            cit->cchTextMax     = item->cchTextMax;
+        }
     }
     if (cit->mask & CBEIF_IMAGE)
@@ -343 +325 @@
     if (cit->mask & CBEIF_LPARAM)
         cit->lParam         = item->lParam;
-
-}
-
-
-static void
-COMBOEX_AdjustEditPos (COMBOEX_INFO *infoPtr)
+}
+
+
+static void COMBOEX_AdjustEditPos (COMBOEX_INFO *infoPtr)
 {
     SIZE mysize;
-    IMAGEINFO iinfo;
-    INT x, y, w, h, xoff = 0;
+    INT x, y, w, h, xioff;
     RECT rect;
 
     if (!infoPtr->hwndEdit) return;
-    iinfo.rcImage.left = iinfo.rcImage.right = 0;
-    if (infoPtr->himl) {
+
+    if (infoPtr->himl && !(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGEINDENT)) {
+        IMAGEINFO iinfo;
+        iinfo.rcImage.left = iinfo.rcImage.right = 0;
         ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
-        xoff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
-    }
+        xioff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
+    }  else xioff = 0;
+
     GetClientRect (infoPtr->hwndCombo, &rect);
     InflateRect (&rect, -2, -2);
@@ -368 +350 @@
     COMBOEX_GetComboFontSize (infoPtr, &mysize);
     TRACE("Combo font x=%ld, y=%ld\n", mysize.cx, mysize.cy);
-    x = xoff + CBE_STARTOFFSET + 1;
-    y = CBE_EXTRA + 1;
+    x = xioff + CBE_STARTOFFSET + 1;
     w = rect.right-rect.left - x - GetSystemMetrics(SM_CXVSCROLL) - 1;
     h = mysize.cy + 1;
+    y = rect.bottom - h - 1;
 
     TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n",
-          rect.left, rect.top, rect.right, rect.bottom,
-          x, y, x + w, y + h);
-    SetWindowPos(infoPtr->hwndEdit, HWND_TOP,
-                 x, y,
-                 w, h,
+          rect.left, rect.top, rect.right, rect.bottom, x, y, x + w, y + h);
+    SetWindowPos(infoPtr->hwndEdit, HWND_TOP, x, y, w, h,
                  SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER);
 }
 
 
-static void
-COMBOEX_ReSize (HWND hwnd, COMBOEX_INFO *infoPtr)
+static void COMBOEX_ReSize (COMBOEX_INFO *infoPtr)
 {
     SIZE mysize;
@@ -397 +375 @@
         TRACE("upgraded height due to image:  height=%d\n", cy);
     }
-    SendMessageW (hwnd, CB_SETITEMHEIGHT, (WPARAM) -1, (LPARAM) cy);
+    SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, (WPARAM)-1, (LPARAM)cy);
     if (infoPtr->hwndCombo)
         SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT,
@@ -404 +382 @@
 
 
-static void
-COMBOEX_SetEditText (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item)
+static void COMBOEX_SetEditText (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item)
 {
     if (!infoPtr->hwndEdit) return;
@@ -413 +390 @@
     /*      EM_SETSEL32 (0,-1)      */
     if (item->mask & CBEIF_TEXT) {
-        SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)item->pszText);
+        SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)COMBOEX_GetText(infoPtr, item));
         SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
         SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
@@ -420 +397 @@
 
  
-static CBE_ITEMDATA *
-COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index)
+static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index)
 {
     CBE_ITEMDATA *item;
@@ -439 +415 @@
     }
     if (!item || (i != index)) {
-        FIXME("COMBOBOXEX item structures broken. Please report!\n");
+        ERR("COMBOBOXEX item structures broken. Please report!\n");
         return 0;
     }
@@ -446 +422 @@
 
 
-static void
-COMBOEX_WarnCallBack (CBE_ITEMDATA *item)
-{
-    if (item->pszText == LPSTR_TEXTCALLBACKW)
-        FIXME("Callback not implemented yet for pszText\n");
-    if (item->iImage == I_IMAGECALLBACK)
-        FIXME("Callback not implemented yet for iImage\n");
-    if (item->iSelectedImage == I_IMAGECALLBACK)
-        FIXME("Callback not implemented yet for iSelectedImage\n");
-    if (item->iOverlay == I_IMAGECALLBACK)
-        FIXME("Callback not implemented yet for iOverlay\n");
-    if (item->iIndent == I_INDENTCALLBACK)
-        FIXME("Callback not implemented yet for iIndent\n");
-}
-
+static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO *infoPtr)
+{
+    return infoPtr->hwndEdit;
+}
+ 
 
 /* ***  CBEM_xxx message support  *** */
 
 
-static LRESULT
-COMBOEX_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    INT index = (INT) wParam;
+static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index)
+{
     CBE_ITEMDATA *item;
 
-    TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
+    TRACE("(index=%d)\n", index);
 
     /* if item number requested does not exist then return failure */
-    if ((index > infoPtr->nb_items) || (index < 0)) {
-        ERR("attempt to delete item that does not exist\n");
-        return CB_ERR;
-    }
-
-    if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        ERR("attempt to delete item that was not found!\n");
-        return CB_ERR;
-    }
+    if ((index > infoPtr->nb_items) || (index < 0)) return CB_ERR;
+    if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR;
 
     /* doing this will result in WM_DELETEITEM being issued */
@@ -492 +448 @@
 
 
-inline static LRESULT
-COMBOEX_GetComboControl (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    TRACE("\n");
-
-    return (LRESULT)infoPtr->hwndCombo;
-}
-
-
-inline static LRESULT
-COMBOEX_GetEditControl (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-        return 0;
-
-    TRACE("-- 0x%x\n", infoPtr->hwndEdit);
-
-    return (LRESULT)infoPtr->hwndEdit;
-}
-
-
-inline static LRESULT
-COMBOEX_GetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    TRACE("-- 0x%08lx\n", infoPtr->dwExtStyle);
-
-    return (LRESULT)infoPtr->dwExtStyle;
-}
-
-
-inline static LRESULT
-COMBOEX_GetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    TRACE("-- %p\n", infoPtr->himl);
-
-    return (LRESULT)infoPtr->himl;
-}
-
-
-static LRESULT
-COMBOEX_GetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    COMBOBOXEXITEMW *cit = (COMBOBOXEXITEMW *) lParam;
-    INT index;
+static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit)
+{
+    INT index = cit->iItem;
     CBE_ITEMDATA *item;
 
-    TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
-
-    /* get real index of item to insert */
-    index = cit->iItem;
+    TRACE("(...)\n");
 
     /* if item number requested does not exist then return failure */
-    if ((index > infoPtr->nb_items) || (index < -1)) {
-        ERR("attempt to get item that does not exist\n");
-        return 0;
-    }
+    if ((index > infoPtr->nb_items) || (index < -1)) return FALSE;
 
     /* if the item is the edit control and there is no edit control, skip */
-    if ((index == -1) && 
-        ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN))
-            return 0;
-
-    if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        ERR("attempt to get item that was not found!\n");
-        return 0;
-    }
-
-    COMBOEX_CopyItem (infoPtr, item, cit);
+    if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE;
+
+    if (!(item = COMBOEX_FindItem(infoPtr, index))) return FALSE;
+
+    COMBOEX_CopyItem (item, cit);
 
     return TRUE;
@@ -574 +469 @@
 
 
-inline static LRESULT
-COMBOEX_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOBOXEXITEMA *cit = (COMBOBOXEXITEMA *) lParam;
+static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit)
+{
     COMBOBOXEXITEMW tmpcit;
-    INT len;
-
-    TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
+
+    TRACE("(...)\n");
 
     tmpcit.mask = cit->mask;
     tmpcit.iItem = cit->iItem;
-    COMBOEX_GetItemW (hwnd, wParam, (LPARAM) &tmpcit);
-
-    len = WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 0, 0, NULL, NULL);
-    if (len > 0) 
-        WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 
+    tmpcit.pszText = 0;
+    if(!COMBOEX_GetItemW (infoPtr, &tmpcit)) return FALSE;
+
+    if (is_textW(tmpcit.pszText) && cit->pszText)
+        WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 
                              cit->pszText, cit->cchTextMax, NULL, NULL);
+    else if (cit->pszText) cit->pszText[0] = 0;
+    else cit->pszText = (LPSTR)tmpcit.pszText;
 
     cit->iImage = tmpcit.iImage;
@@ -602 +496 @@
 
 
-inline static LRESULT
-COMBOEX_GetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    TRACE("%s hwnd=0x%x\n", 
-           infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
-
-    return infoPtr->bUnicode;
-}
-
-
-inline static LRESULT
-COMBOEX_HasEditChanged (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
-    if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-        return FALSE;
-    if ((infoPtr->flags & (WCBE_ACTEDIT | WCBE_EDITCHG)) == 
-        (WCBE_ACTEDIT | WCBE_EDITCHG))
-        return TRUE;
-    return FALSE;
-}
-
-
-static LRESULT
-COMBOEX_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    COMBOBOXEXITEMW *cit = (COMBOBOXEXITEMW *) lParam;
+inline static BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr)
+{
+    return COMBOEX_HasEdit(infoPtr) &&
+           (infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED;
+}
+
+
+static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit)
+{
     INT index;
     CBE_ITEMDATA *item;
@@ -639 +511 @@
     TRACE("\n");
 
-    COMBOEX_DumpInput ((COMBOBOXEXITEMA *) cit, TRUE);
+    if (TRACE_ON(comboex)) COMBOEX_DumpInput (cit);
 
     /* get real index of item to insert */
@@ -646 +518 @@
     if (index > infoPtr->nb_items) index = infoPtr->nb_items;
 
-    /* get space and chain it in */
-    item = (CBE_ITEMDATA *)COMCTL32_Alloc (sizeof (CBE_ITEMDATA));
-    item->next = NULL;
-    item->pszText = NULL;
-
+    /* get zero-filled space and chain it in */
+    if(!(item = (CBE_ITEMDATA *)COMCTL32_Alloc (sizeof(*item)))) return -1;
+    
     /* locate position to insert new item in */
     if (index == infoPtr->nb_items) {
@@ -666 +536 @@
         }
         if (!moving) {
-            FIXME("COMBOBOXEX item structures broken. Please report!\n");
+            ERR("COMBOBOXEX item structures broken. Please report!\n");
             COMCTL32_Free(item);
             return -1;
@@ -675 +545 @@
 
     /* fill in our hidden item structure */
-    item->mask           = cit->mask;
+    item->mask = cit->mask;
     if (item->mask & CBEIF_TEXT) {
-        LPWSTR str;
-        INT len;
-
-        str = cit->pszText;
-        if (!str) str = (LPWSTR) L"";
-        len = strlenW (str);
+        INT len = 0;
+
+        if (is_textW(cit->pszText)) len = strlenW (cit->pszText);
         if (len > 0) {
             item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            strcpyW (item->pszText, str);
-        }
-        else
-            item->pszText = NULL;
-        item->cchTextMax   = cit->cchTextMax;
+            if (!item->pszText) {
+                COMCTL32_Free(item);
+                return -1;
+            }
+            strcpyW (item->pszText, cit->pszText);
+        }
+        else if (cit->pszText == LPSTR_TEXTCALLBACKW)
+            item->pszText = LPSTR_TEXTCALLBACKW;
+        item->cchTextMax = cit->cchTextMax;
     }
     if (item->mask & CBEIF_IMAGE)
-      item->iImage         = cit->iImage;
+        item->iImage = cit->iImage;
     if (item->mask & CBEIF_SELECTEDIMAGE)
-      item->iSelectedImage = cit->iSelectedImage;
+        item->iSelectedImage = cit->iSelectedImage;
     if (item->mask & CBEIF_OVERLAY)
-      item->iOverlay       = cit->iOverlay;
+        item->iOverlay = cit->iOverlay;
     if (item->mask & CBEIF_INDENT)
-      item->iIndent        = cit->iIndent;
+        item->iIndent = cit->iIndent;
     if (item->mask & CBEIF_LPARAM)
-      item->lParam         = cit->lParam;
+        item->lParam = cit->lParam;
     infoPtr->nb_items++;
 
-    COMBOEX_WarnCallBack (item);
-
-    COMBOEX_DumpItem (item);
+    if (TRACE_ON(comboex)) COMBOEX_DumpItem (item);
 
     SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING, 
                   (WPARAM)cit->iItem, (LPARAM)item);
 
-    COMBOEX_CopyItem (infoPtr, item, &nmcit.ceItem);
+    memset (&nmcit.ceItem, 0, sizeof(nmcit.ceItem));
+    COMBOEX_CopyItem (item, &nmcit.ceItem);
     COMBOEX_NotifyItem (infoPtr, CBEN_INSERTITEM, &nmcit);
 
@@ -718 +588 @@
 
 
-static LRESULT
-COMBOEX_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOBOXEXITEMA     *cit = (COMBOBOXEXITEMA *) lParam;
-    COMBOBOXEXITEMW     citW;
-    LRESULT             ret;
+static INT COMBOEX_InsertItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit)
+{
+    COMBOBOXEXITEMW citW;
+    LPWSTR wstr = NULL;
+    INT ret;
 
     memcpy(&citW,cit,sizeof(COMBOBOXEXITEMA));
-    if (cit->mask & CBEIF_TEXT) {
-        LPSTR str;
-        INT len;
-
-        str = cit->pszText;
-        if (!str) str="";
-        len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-        if (len > 0) {
-            citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
-        }
-    }
-    ret = COMBOEX_InsertItemW(hwnd,wParam,(LPARAM)&citW);;
-
-    if (cit->mask & CBEIF_TEXT)
-        COMCTL32_Free(citW.pszText);
+    if (cit->mask & CBEIF_TEXT && is_textA(cit->pszText)) {
+        INT len = MultiByteToWideChar (CP_ACP, 0, cit->pszText, -1, NULL, 0);
+        wstr = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        if (!wstr) return -1;
+        MultiByteToWideChar (CP_ACP, 0, cit->pszText, -1, wstr, len);
+        citW.pszText = wstr;
+    }
+    ret = COMBOEX_InsertItemW(infoPtr, &citW);;
+    
+    if (wstr) COMCTL32_Free(wstr);
+    
     return ret;
 }
 
 
-static LRESULT
-COMBOEX_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+static DWORD 
+COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style)
+{
     DWORD dwTemp;
 
-    TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
+    TRACE("(mask=x%08lx, style=0x%08lx)\n", mask, style);
 
     dwTemp = infoPtr->dwExtStyle;
 
-    if (lParam & (CBES_EX_NOEDITIMAGEINDENT |
-                  CBES_EX_PATHWORDBREAKPROC |
+    if (style &  (CBES_EX_PATHWORDBREAKPROC |
                   CBES_EX_NOSIZELIMIT |
                   CBES_EX_CASESENSITIVE))
-        FIXME("Extended style not implemented %08lx\n", lParam);
-
-    if ((DWORD)wParam) {
-        infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
-    }
+        FIXME("Extended style not implemented %08lx\n", style);
+
+    if (mask)
+        infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~mask) | style;
     else
-        infoPtr->dwExtStyle = (DWORD)lParam;
-
-    /*
-     * native does this for CBES_EX_NOEDITIMAGE state change
-     */
-    if ((infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE) ^
-        (dwTemp & CBES_EX_NOEDITIMAGE)) {
+        infoPtr->dwExtStyle = style;
+
+    /* test if the control's appearance has changed */
+    mask = CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT;
+    if ((infoPtr->dwExtStyle & mask) != (dwTemp & mask)) {
         /* if state of EX_NOEDITIMAGE changes, invalidate all */
         TRACE("EX_NOEDITIMAGE state changed to %ld\n",
-            infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
-        InvalidateRect (hwnd, NULL, TRUE);
+              infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
+        InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);
         COMBOEX_AdjustEditPos (infoPtr);
         if (infoPtr->hwndEdit)
@@ -782 +641 @@
     }
 
-    return (LRESULT)dwTemp;
-}
-
-
-inline static LRESULT
-COMBOEX_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    HIMAGELIST himlTemp;
-
-    TRACE("(0x%08x 0x%08lx)\n", wParam, lParam);
-
-    himlTemp = infoPtr->himl;
-    infoPtr->himl = (HIMAGELIST)lParam;
-
-    COMBOEX_ReSize (hwnd, infoPtr);
+    return dwTemp;
+}
+
+
+static HIMAGELIST COMBOEX_SetImageList (COMBOEX_INFO *infoPtr, HIMAGELIST himl)
+{
+    HIMAGELIST himlTemp = infoPtr->himl;
+
+    TRACE("(...)\n");
+
+    infoPtr->himl = himl;
+
+    COMBOEX_ReSize (infoPtr);
     InvalidateRect (infoPtr->hwndCombo, NULL, TRUE);
 
     /* reposition the Edit control based on whether icon exists */
     COMBOEX_AdjustEditPos (infoPtr);
-    return (LRESULT)himlTemp;
-}
-
-static LRESULT
-COMBOEX_SetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    COMBOBOXEXITEMW *cit = (COMBOBOXEXITEMW *) lParam;
-    INT index;
+    return himlTemp;
+}
+
+static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit)
+{
+    INT index = cit->iItem;
     CBE_ITEMDATA *item;
 
-    COMBOEX_DumpInput ((COMBOBOXEXITEMA *) cit, TRUE);
-
-    /* get real index of item to insert */
-    index = cit->iItem;
+    if (TRACE_ON(comboex)) COMBOEX_DumpInput (cit);
 
     /* if item number requested does not exist then return failure */
-    if ((index > infoPtr->nb_items) || (index < -1)) {
-        ERR("attempt to set item that does not exist yet!\n");
-        return 0;
-    }
+    if ((index > infoPtr->nb_items) || (index < -1)) return FALSE;
 
     /* if the item is the edit control and there is no edit control, skip */
-    if ((index == -1) && 
-        ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN))
-            return 0;
-
-    if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        ERR("attempt to set item that was not found!\n");
-        return 0;
-    }
+    if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE;
+
+    if (!(item = COMBOEX_FindItem(infoPtr, index))) return FALSE;
 
     /* add/change stuff to the internal item structure */ 
     item->mask |= cit->mask;
     if (cit->mask & CBEIF_TEXT) {
-        LPWSTR str;
-        INT len;
-        WCHAR emptystr[1] = {0};
-
-        str = cit->pszText;
-        if (!str) str=emptystr;
-        len = strlenW(str);
+        INT len = 0;
+
+        COMBOEX_FreeText(item);
+        if (is_textW(cit->pszText)) len = strlenW(cit->pszText);
         if (len > 0) {
             item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            strcpyW(item->pszText,str);
-        }
-        item->cchTextMax   = cit->cchTextMax;
+            if (!item->pszText) return FALSE;
+            strcpyW(item->pszText, cit->pszText);
+        } else if (cit->pszText == LPSTR_TEXTCALLBACKW)
+            item->pszText = LPSTR_TEXTCALLBACKW;
+        item->cchTextMax = cit->cchTextMax;
     }
     if (cit->mask & CBEIF_IMAGE)
-      item->iImage         = cit->iImage;
+        item->iImage = cit->iImage;
     if (cit->mask & CBEIF_SELECTEDIMAGE)
-      item->iSelectedImage = cit->iSelectedImage;
+        item->iSelectedImage = cit->iSelectedImage;
     if (cit->mask & CBEIF_OVERLAY)
-      item->iOverlay       = cit->iOverlay;
+        item->iOverlay = cit->iOverlay;
     if (cit->mask & CBEIF_INDENT)
-      item->iIndent        = cit->iIndent;
+        item->iIndent = cit->iIndent;
     if (cit->mask & CBEIF_LPARAM)
-      cit->lParam         = cit->lParam;
-
-    COMBOEX_WarnCallBack (item);
-
-    COMBOEX_DumpItem (item);
+        cit->lParam = cit->lParam;
+
+    if (TRACE_ON(comboex)) COMBOEX_DumpItem (item);
 
     /* if original request was to update edit control, do some fast foot work */
@@ -873 +712 @@
 }
 
-static LRESULT
-COMBOEX_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOBOXEXITEMA     *cit = (COMBOBOXEXITEMA *) lParam;
-    COMBOBOXEXITEMW     citW;
-    LRESULT             ret;
-
-    memcpy(&citW,cit,sizeof(COMBOBOXEXITEMA));
-    if (cit->mask & CBEIF_TEXT) {
-        LPSTR str;
-        INT len;
-
-        str = cit->pszText;
-        if (!str) str="";
-        len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-        if (len > 0) {
-            citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-            MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
-        }
-    }
-    ret = COMBOEX_SetItemW(hwnd,wParam,(LPARAM)&citW);;
-
-    if (cit->mask & CBEIF_TEXT)
-        COMCTL32_Free(citW.pszText);
+static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit)
+{
+    COMBOBOXEXITEMW citW;
+    LPWSTR wstr = NULL;
+    BOOL ret;
+
+    memcpy(&citW, cit, sizeof(COMBOBOXEXITEMA));
+    if ((cit->mask & CBEIF_TEXT) && is_textA(cit->pszText)) {
+        INT len = MultiByteToWideChar (CP_ACP, 0, cit->pszText, -1, NULL, 0);
+        wstr = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+        if (!wstr) return FALSE;
+        MultiByteToWideChar (CP_ACP, 0, cit->pszText, -1, wstr, len);
+        citW.pszText = wstr;
+    }
+    ret = COMBOEX_SetItemW(infoPtr, &citW);;
+
+    if (wstr) COMCTL32_Free(wstr);
+
     return ret;
 }
 
 
-inline static LRESULT
-COMBOEX_SetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    BOOL bTemp = infoPtr->bUnicode;
-
-    TRACE("to %s hwnd=0x%04x, was %s\n", 
-          ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd,
-          (bTemp) ? "TRUE" : "FALSE");
-
-    infoPtr->bUnicode = (BOOL)wParam;
+static BOOL COMBOEX_SetUnicodeFormat (COMBOEX_INFO *infoPtr, BOOL value)
+{
+    BOOL bTemp = infoPtr->unicode;
+
+    TRACE("to %s, was %s\n", value ? "TRUE":"FALSE", bTemp ? "TRUE":"FALSE");
+
+    infoPtr->unicode = value;
 
     return bTemp;
@@ -917 +746 @@
 
 
-
 /* ***  CB_xxx message support  *** */
 
-
-static LRESULT
-COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
+static INT
+COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCSTR str)
 {
     INT i, count;
     CBE_ITEMDATA *item;
     LPWSTR desired = NULL;
-    INT start = (INT) wParam;
-
-    i = MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, NULL, 0);
+
+    i = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
     if (i > 0) {
         desired = (LPWSTR)COMCTL32_Alloc ((i + 1)*sizeof(WCHAR));
-        MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, desired, i);
-    }
-
-    count = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0 , 0);
+        if (!desired) return CB_ERR;
+        MultiByteToWideChar (CP_ACP, 0, str, -1, desired, i);
+    }
+
+    count = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
 
     /* now search from after starting loc and wrapping back to start */
     for(i=start+1; i<count; i++) {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                          CB_GETITEMDATA, (WPARAM)i, 0);
-        TRACE("desired=%s, item=%s\n", 
-              debugstr_w(desired), debugstr_w(item->pszText));
-        if (lstrcmpiW(item->pszText, desired) == 0) {
+        item = get_item_data(infoPtr, i);
+        if (lstrcmpiW(COMBOEX_GetText(infoPtr, item), desired) == 0) {
             COMCTL32_Free (desired);
             return i;
@@ -949 +773 @@
     }
     for(i=0; i<=start; i++) {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                          CB_GETITEMDATA, (WPARAM)i, 0);
-        TRACE("desired=%s, item=%s\n", 
-              debugstr_w(desired), debugstr_w(item->pszText));
-        if (lstrcmpiW(item->pszText, desired) == 0) {
+        item = get_item_data(infoPtr, i);
+        if (lstrcmpiW(COMBOEX_GetText(infoPtr, item), desired) == 0) {
             COMCTL32_Free (desired);
             return i;
@@ -963 +784 @@
 
 
-static LRESULT
-COMBOEX_GetItemData (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    INT index = wParam;
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+static DWORD COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index)
+{
     CBE_ITEMDATA *item1, *item2;
-    LRESULT lret = 0;
-
-    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
-                                             wParam, lParam);
+    DWORD ret = 0;
+
+    item1 = get_item_data(infoPtr, index);
     if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
         item2 = COMBOEX_FindItem (infoPtr, index);
@@ -979 +796 @@
             return CB_ERR;
         }
-        if (item1->mask & CBEIF_LPARAM)
-            lret = (LRESULT) item1->lParam;
-        TRACE("returning 0x%08lx\n", lret);
-        return lret;
-    }
-    lret = (LRESULT)item1;
-    TRACE("non-valid result from combo, returning 0x%08lx\n", lret);
-    return lret;
-}
-
-
-static LRESULT
-COMBOEX_SetCursel (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    INT index = wParam;
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+        if (item1->mask & CBEIF_LPARAM) ret = item1->lParam;
+        TRACE("returning 0x%08lx\n", ret);
+    } else {
+        ret = (DWORD)item1;
+        TRACE("non-valid result from combo, returning 0x%08lx\n", ret);
+    }
+    return ret;
+}
+
+
+static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT index)
+{
     CBE_ITEMDATA *item;
-    LRESULT lret;
-
-    if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-        /* FIXME: need to clear selection */
-        return CB_ERR;
-    }
-
-    TRACE("selecting item %d text=%s\n", index, (item->pszText) ?
-          debugstr_w(item->pszText) : "<null>");
+    INT sel;
+
+    if (!(item = COMBOEX_FindItem(infoPtr, index)))
+        return SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, index, 0);
+
+    TRACE("selecting item %d text=%s\n", index, debugstr_txt(item->pszText));
     infoPtr->selected = index;
 
-    lret = SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, wParam, lParam);
+    sel = (INT)SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, index, 0);
     COMBOEX_SetEditText (infoPtr, item);
-    return lret;
-}
-
-
-static LRESULT
-COMBOEX_SetItemData (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    INT index = wParam;
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+    return sel;
+}
+
+
+static DWORD COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD data)
+{
     CBE_ITEMDATA *item1, *item2;
 
-    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
-                                             wParam, lParam);
+    item1 = get_item_data(infoPtr, index);
     if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
         item2 = COMBOEX_FindItem (infoPtr, index);
@@ -1029 +835 @@
         }
         item1->mask |= CBEIF_LPARAM;
-        item1->lParam = lParam;
-        TRACE("setting lparam to 0x%08lx\n", lParam);
+        item1->lParam = data;
+        TRACE("setting lparam to 0x%08lx\n", data);
         return 0;
     }
@@ -1038 +844 @@
 
 
-static LRESULT
-COMBOEX_SetItemHeight (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+static INT COMBOEX_SetItemHeight (COMBOEX_INFO *infoPtr, INT index, UINT height)
+{
     RECT cb_wrect, cbx_wrect, cbx_crect;
-    LRESULT ret = 0;
-    UINT height;
 
     /* First, lets forward the message to the normal combo control
        just like Windows.     */
-    if (infoPtr->hwndCombo)    
-       SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, wParam, lParam);
+    if (infoPtr->hwndCombo)
+       if (SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT,
+                         index, height) == CB_ERR) return CB_ERR;
 
     GetWindowRect (infoPtr->hwndCombo, &cb_wrect);
-    GetWindowRect (hwnd, &cbx_wrect);
-    GetClientRect (hwnd, &cbx_crect);
+    GetWindowRect (infoPtr->hwndSelf, &cbx_wrect);
+    GetClientRect (infoPtr->hwndSelf, &cbx_crect);
     /* the height of comboex as height of the combo + comboex border */ 
     height = cb_wrect.bottom-cb_wrect.top
@@ -1064 +867 @@
           cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
           cbx_wrect.right-cbx_wrect.left, height);
-    SetWindowPos (hwnd, HWND_TOP, 0, 0,
-                  cbx_wrect.right-cbx_wrect.left,
-                  height,
+    SetWindowPos (infoPtr->hwndSelf, HWND_TOP, 0, 0,
+                  cbx_wrect.right-cbx_wrect.left, height,
                   SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
 
-    return ret;
+    return 0;
 }
 
@@ -1076 +878 @@
 
 
-static LRESULT
-COMBOEX_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    LPCREATESTRUCTA cs = (LPCREATESTRUCTA) lParam;
+static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs)
+{
+    WCHAR COMBOBOX[] = { 'C', 'o', 'm', 'b', 'o', 'B', 'o', 'x', 0 };
+    WCHAR EDIT[] = { 'E', 'D', 'I', 'T', 0 };
+    WCHAR NIL[] = { 0 };
     COMBOEX_INFO *infoPtr;
     DWORD dwComboStyle;
-    LOGFONTA mylogfont;
-    CBE_ITEMDATA *item;
+    LOGFONTW mylogfont;
     RECT wnrc1, clrc1, cmbwrc;
-    LONG test;
     INT i;
 
     /* allocate memory for info structure */
     infoPtr = (COMBOEX_INFO *)COMCTL32_Alloc (sizeof(COMBOEX_INFO));
-    if (infoPtr == NULL) {
-        ERR("could not allocate info memory!\n");
-        return 0;
-    }
+    if (!infoPtr) return -1;
 
     /* initialize info structure */
-
-    infoPtr->items    = NULL;
-    infoPtr->nb_items = 0;
+    /* note that infoPtr is allocated zero-filled */
+    
     infoPtr->hwndSelf = hwnd;
     infoPtr->selected = -1;
 
-    infoPtr->bUnicode = IsWindowUnicode (hwnd);
-
-    i = SendMessageA(GetParent (hwnd),
-                     WM_NOTIFYFORMAT, hwnd, NF_QUERY);
-    if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-            i);
+    infoPtr->unicode = IsWindowUnicode (hwnd);
+
+    i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+    if ((i != NFR_ANSI) && (i != NFR_UNICODE)) {
+        WARN("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i);
         i = NFR_ANSI;
     }
-    infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
-
-    SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
+    infoPtr->NtfUnicode = (i == NFR_UNICODE);
+
+    SetWindowLongW (hwnd, 0, (DWORD)infoPtr);
 
     /* create combo box */
-    dwComboStyle = GetWindowLongA (hwnd, GWL_STYLE) &
+    dwComboStyle = GetWindowLongW (hwnd, GWL_STYLE) &
                         (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
@@ -1136 +931 @@
     /* (allow space for the icons).                                     */
 
-    infoPtr->hwndCombo = CreateWindowA ("ComboBox", "",
+    infoPtr->hwndCombo = CreateWindowW (COMBOBOX, NIL,
                          /* following line added to match native */
                          WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
@@ -1143 +938 @@
                          WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
                          cs->y, cs->x, cs->cx, cs->cy, hwnd,
-                         (HMENU) GetWindowLongA (hwnd, GWL_ID),
-                         GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+                         (HMENU) GetWindowLongW (hwnd, GWL_ID),
+                         GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
 
     /* 
@@ -1158 +953 @@
      * data structure.
      */
-    test = GetPropA(infoPtr->hwndCombo, (LPCSTR)(LONG)ComboExInfo);
-    if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
-        SetPropA(infoPtr->hwndCombo, "CC32SubclassInfo", (LONG)infoPtr);
-    }
-    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndCombo, 
+    SetPropA(infoPtr->hwndCombo, COMBOEX_SUBCLASS_PROP, hwnd);
+    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndCombo, 
                                 GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc);
     infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
@@ -1172 +964 @@
      */
     if ((cs->style & CBS_DROPDOWNLIST) == CBS_DROPDOWN) {
-        infoPtr->hwndEdit = CreateWindowExA (0, "EDIT", "",
+        infoPtr->hwndEdit = CreateWindowExW (0, EDIT, NIL,
                     WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
                     0, 0, 0, 0,  /* will set later */
                     infoPtr->hwndCombo, 
-                    (HMENU) GetWindowLongA (hwnd, GWL_ID),
-                    GetWindowLongA (hwnd, GWL_HINSTANCE),
+                    (HMENU) GetWindowLongW (hwnd, GWL_ID),
+                    GetWindowLongW (hwnd, GWL_HINSTANCE),
                     NULL);
 
@@ -1191 +983 @@
          * data structure.
          */
-        test = GetPropA(infoPtr->hwndEdit, (LPCSTR)(LONG)ComboExInfo);
-        if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
-            SetPropA(infoPtr->hwndEdit, "CC32SubclassInfo", (LONG)infoPtr);
-        }
-        infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndEdit, 
+        SetPropA(infoPtr->hwndEdit, COMBOEX_SUBCLASS_PROP, hwnd);
+        infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongW(infoPtr->hwndEdit, 
                                  GWL_WNDPROC, (LONG)COMBOEX_EditWndProc);
         infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
-    }
-    else {
-        infoPtr->hwndEdit = 0;
-        infoPtr->font = 0;
     }
 
@@ -1209 +994 @@
      */
     if (!infoPtr->font) {
-        SystemParametersInfoA (SPI_GETICONTITLELOGFONT, sizeof(mylogfont), 
+        SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof(mylogfont), 
                                &mylogfont, 0);
-        infoPtr->font = infoPtr->hDefaultFont = CreateFontIndirectA (&mylogfont);
+        infoPtr->font = infoPtr->defaultFont = CreateFontIndirectW (&mylogfont);
     }
     SendMessageW (infoPtr->hwndCombo, WM_SETFONT, (WPARAM)infoPtr->font, 0);
@@ -1219 +1004 @@
     }
 
-    COMBOEX_ReSize (hwnd, infoPtr);
+    COMBOEX_ReSize (infoPtr);
 
     /* Above is fairly certain, below is much less certain. */
@@ -1245 +1030 @@
     /*
      * Create an item structure to represent the data in the 
-     * EDIT control.
+     * EDIT control. It is allocated zero-filled.
      */
-    item = (CBE_ITEMDATA *)COMCTL32_Alloc (sizeof (CBE_ITEMDATA));
-    item->next = NULL;
-    item->pszText = NULL;
-    item->mask = 0;
-    infoPtr->edit = item;
+    infoPtr->edit = (CBE_ITEMDATA *)COMCTL32_Alloc (sizeof (CBE_ITEMDATA));
+    if (!infoPtr->edit) {
+        COMBOEX_Destroy(infoPtr);
+        return -1;
+    }
 
     return 0;
@@ -1257 +1042 @@
 
 
-inline static LRESULT
-COMBOEX_Command (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
     LRESULT lret;
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
     INT command = HIWORD(wParam);
     CBE_ITEMDATA *item = 0;
@@ -1268 +1051 @@
     NMCBEENDEDITW cbeend;
     DWORD oldflags;
+    HWND parent = GetParent (infoPtr->hwndSelf);
 
     TRACE("for command %d\n", command);
@@ -1274 +1058 @@
     {
     case CBN_DROPDOWN:
-        SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+        SetFocus (infoPtr->hwndCombo);
+        ShowWindow (infoPtr->hwndEdit, SW_HIDE);
+        return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
+        
+    case CBN_CLOSEUP:
+        SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
         /*
          * from native trace of first dropdown after typing in URL in IE4 
@@ -1289 +1077 @@
          * the rest is supposition  
          */
+        ShowWindow (infoPtr->hwndEdit, SW_SHOW);
+        InvalidateRect (infoPtr->hwndCombo, 0, TRUE);
+        InvalidateRect (infoPtr->hwndEdit, 0, TRUE);
         cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
         if (cursel == -1) {
@@ -1295 +1086 @@
             n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
             for (cursel = 0; cursel < n; cursel++){
-                item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                                                     CB_GETITEMDATA, 
-                                                     cursel, 0);
+                item = get_item_data(infoPtr, cursel);
                 if ((INT)item == CB_ERR) break;
-                if (lstrcmpiW(item->pszText, wintext) == 0) break;
+                if (!lstrcmpiW(COMBOEX_GetText(infoPtr, item), wintext)) break;
             }
             if ((cursel == n) || ((INT)item == CB_ERR)) {
@@ -1310 +1099 @@
         }
         else {
-            item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
-                                                 CB_GETITEMDATA, 
-                                                 cursel, 0);
+            item = get_item_data(infoPtr, cursel);
             if ((INT)item == CB_ERR) {
                 TRACE("failed to find match??? item=%p cursel=%d\n",
@@ -1332 +1119 @@
             cbeend.iWhy = CBENF_DROPDOWN;
 
-            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, item->pszText)) {
-                /* abort the change */
-                TRACE("Notify requested abort of change\n");
-                return 0;
-            }
+            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, COMBOEX_GetText(infoPtr, item))) return 0;
         }
 
@@ -1343 +1126 @@
         if ((oldflags & WCBE_EDITCHG) || (cursel != infoPtr->selected)) {
             infoPtr->selected = cursel;
-            SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
+            SendMessageW (infoPtr->hwndSelf, CB_SETCURSEL, cursel, 0);
             SetFocus(infoPtr->hwndCombo);
         }
@@ -1369 +1152 @@
         infoPtr->selected = oldItem;
         COMBOEX_SetEditText (infoPtr, item);
-        return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+        return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
 
     case CBN_SELENDOK:
@@ -1377 +1159 @@
          * issuing the message. IE4 depends on this.
          */
-        return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+        return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
 
     case CBN_KILLFOCUS:
@@ -1392 +1173 @@
          *  return 0
          */
-        SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+        SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
         if (infoPtr->flags & WCBE_ACTEDIT) {
             GetWindowTextW (infoPtr->hwndEdit, wintext, 260);
@@ -1402 +1182 @@
 
             infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, wintext)) {
-                /* abort the change */
-                TRACE("Notify requested abort of change\n");
-                return 0;
-            }
+            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, wintext)) return 0;
         }
         /* possible CB_GETCURSEL */
@@ -1412 +1188 @@
         return 0;
 
-    case CBN_CLOSEUP:
     default:
         /* 
@@ -1420 +1195 @@
          * after passing the command to the parent of the ComboEx.
          */
-        lret = SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
-                             (LPARAM)hwnd);
+        lret = SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf);
         if (infoPtr->hwndEdit)
             SetFocus(infoPtr->hwndEdit);
@@ -1430 +1204 @@
 
 
-inline static LRESULT
-COMBOEX_WM_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    DELETEITEMSTRUCT *dis = (DELETEITEMSTRUCT *)lParam;
+static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis)
+{
     CBE_ITEMDATA *item, *olditem;
+    NMCOMBOBOXEXW nmcit;
     INT i;
-    NMCOMBOBOXEXW nmcit;
 
     TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%x, data=%08lx\n",
@@ -1460 +1231 @@
         }
         if (!item->next || (i != dis->itemID)) {
-            FIXME("COMBOBOXEX item structures broken. Please report!\n");
+            ERR("COMBOBOXEX item structures broken. Please report!\n");
             return FALSE;
         }
@@ -1468 +1239 @@
     infoPtr->nb_items--;
 
-    COMBOEX_CopyItem (infoPtr, olditem, &nmcit.ceItem);
+    memset (&nmcit.ceItem, 0, sizeof(nmcit.ceItem));
+    COMBOEX_CopyItem (olditem, &nmcit.ceItem);
     COMBOEX_NotifyItem (infoPtr, CBEN_DELETEITEM, &nmcit);
 
-    if (olditem->pszText)
-        COMCTL32_Free(olditem->pszText);
+    COMBOEX_FreeText(olditem);
     COMCTL32_Free(olditem);
 
     return TRUE;
-
-}
-
-
-inline static LRESULT
-COMBOEX_DrawItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;
+}
+
+
+static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis)
+{
+    WCHAR nil[] = { 0 };
     CBE_ITEMDATA *item = 0;
     SIZE txtsize;
     RECT rect;
-    LPWSTR str;
-    int drawimage, drawstate;
+    LPCWSTR str = nil;
     UINT xbase, x, y;
-    UINT xioff = 0;               /* size and spacer of image if any */
-    IMAGEINFO iinfo;
     INT len;
-    COLORREF nbkc, ntxc;
+    COLORREF nbkc, ntxc, bkc, txc;
+    int drawimage, drawstate, xioff;
 
     if (!IsWindowEnabled(infoPtr->hwndCombo)) return 0;
 
-    /* dump the DRAWITEMSTRUCT if tracing "comboex" but not "message" */
-    if (!TRACE_ON(message)) {
-        TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", 
-              dis->CtlType, dis->CtlID);
-        TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", 
-              dis->itemID, dis->itemAction, dis->itemState);
-        TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
-              dis->hwndItem, dis->hDC, dis->rcItem.left, 
-              dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, 
-              dis->itemData);
-    }
+    TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", 
+          dis->CtlType, dis->CtlID);
+    TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", 
+          dis->itemID, dis->itemAction, dis->itemState);
+    TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+          dis->hwndItem, dis->hDC, dis->rcItem.left, 
+          dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, 
+          dis->itemData);
 
     /* MSDN says:                                                       */
@@ -1536 +1299 @@
             {
                 RECT exrc, cbrc, edrc;
-                GetWindowRect (hwnd, &exrc);
+                GetWindowRect (infoPtr->hwndSelf, &exrc);
                 GetWindowRect (infoPtr->hwndCombo, &cbrc);
                 edrc.left=edrc.top=edrc.right=edrc.bottom=-1;
@@ -1558 +1321 @@
     /* If draw item is -1 (edit control) setup the item pointer */
     if (dis->itemID == 0xffffffff) {
-        CHAR str[260];
-        INT wlen, alen;
-
         item = infoPtr->edit;
 
         if (infoPtr->hwndEdit) {
+            INT len;
 
             /* free previous text of edit item */
-            if (item->pszText) {
-                COMCTL32_Free(item->pszText);
-                item->pszText = 0;
-                item->mask &= ~CBEIF_TEXT;
+            COMBOEX_FreeText(item);
+            item->mask &= ~CBEIF_TEXT;
+            if( (len = GetWindowTextLengthW(infoPtr->hwndEdit)) ) {
+                item->mask |= CBEIF_TEXT;
+                item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+                if (item->pszText)
+                    GetWindowTextW(infoPtr->hwndEdit, item->pszText, len+1);
+            
+               TRACE("edit control hwndEdit=%0x, text len=%d str=%s\n",
+                     infoPtr->hwndEdit, len, debugstr_txt(item->pszText));
             }
-            alen = SendMessageA (infoPtr->hwndEdit, WM_GETTEXT, 260, (LPARAM)&str);
-            TRACE("edit control hwndEdit=%0x, text len=%d str=<%s>\n",
-                  infoPtr->hwndEdit, alen, str);
-            if (alen > 0) {
-                item->mask |= CBEIF_TEXT;
-                wlen = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-                if (wlen > 0) {
-                    item->pszText = (LPWSTR)COMCTL32_Alloc ((wlen + 1)*sizeof(WCHAR));
-                    MultiByteToWideChar (CP_ACP, 0, str, -1, item->pszText, wlen);
-                }
-            }
-        }
-    }
+        }
+    }
+
 
     /* if the item pointer is not set, then get the data and locate it */
     if (!item) {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-                             CB_GETITEMDATA, (WPARAM)dis->itemID, 0);
-        if (item == (CBE_ITEMDATA *)CB_ERR)
-            {
-                FIXME("invalid item for id %d \n",dis->itemID);
-                return 0;
+        item = get_item_data(infoPtr, dis->itemID);
+        if (item == (CBE_ITEMDATA *)CB_ERR) {
+            ERR("invalid item for id %d \n", dis->itemID);
+            return 0;
+        }
+    }
+
+    if (TRACE_ON(comboex)) COMBOEX_DumpItem (item);
+
+    xbase = CBE_STARTOFFSET;
+    if ((item->mask & CBEIF_INDENT) && (dis->itemState & ODS_COMBOEXLBOX)) {
+        INT indent = item->iIndent;
+        if (indent == I_INDENTCALLBACK) {
+            NMCOMBOBOXEXW nmce;
+            ZeroMemory(&nmce, sizeof(nmce));
+            nmce.ceItem.mask = CBEIF_INDENT;
+            COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
+            if (nmce.ceItem.mask & CBEIF_DI_SETITEM)
+                item->iIndent = nmce.ceItem.iIndent;
+            indent = nmce.ceItem.iIndent;
+        }
+        xbase += (indent * CBE_INDENT);
+    }
+
+    drawimage = -2;
+    drawstate = ILD_NORMAL;
+    if (item->mask & CBEIF_IMAGE)
+        drawimage = item->iImage;
+    if (dis->itemState & ODS_COMBOEXLBOX) {
+        /* drawing listbox entry */
+        if (dis->itemState & ODS_SELECTED) {
+            if (item->mask & CBEIF_SELECTEDIMAGE)
+                drawimage = item->iSelectedImage;
+            drawstate = ILD_SELECTED;
+        }
+    } else {
+        /* drawing combo/edit entry */
+        if (IsWindowVisible(infoPtr->hwndEdit)) {
+            /* if we have an edit control, the slave the 
+             * selection state to the Edit focus state 
+             */
+            if (infoPtr->flags & WCBE_EDITFOCUSED) {
+                if (item->mask & CBEIF_SELECTEDIMAGE)
+                    drawimage = item->iSelectedImage;
+                drawstate = ILD_SELECTED;
             }
-    }
-
-    COMBOEX_DumpItem (item);
-
-    xbase = CBE_STARTOFFSET;
-    if ((item->mask & CBEIF_INDENT) && (dis->itemState & ODS_COMBOEXLBOX))
-        xbase += (item->iIndent * CBE_INDENT);
-    if (item->mask & CBEIF_IMAGE) {
-        ImageList_GetImageInfo(infoPtr->himl, item->iImage, &iinfo);
-        xioff = (iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP);
-    }
-
-    switch (dis->itemAction) {
-    case ODA_FOCUS:
-        if (dis->itemState & ODS_SELECTED /*1*/) {
-            if ((item->mask & CBEIF_TEXT) && item->pszText) {
-                RECT rect2;
-
-                len = strlenW (item->pszText);
-                GetTextExtentPointW (dis->hDC, item->pszText, len, &txtsize);
-                rect.left = xbase + xioff - 1;
-                rect.right = rect.left + txtsize.cx + 2;
-                rect.top = dis->rcItem.top;
-                rect.bottom = dis->rcItem.bottom;
-                GetClipBox (dis->hDC, &rect2);
-                TRACE("drawing item %d focus, rect=(%d,%d)-(%d,%d)\n",
-                      dis->itemID, rect.left, rect.top,
-                      rect.right, rect.bottom);
-                TRACE("                      clip=(%d,%d)-(%d,%d)\n",
-                      rect2.left, rect2.top,
-                      rect2.right, rect2.bottom);
-
-                DrawFocusRect(dis->hDC, &rect);
+        } else {
+            /* if we don't have an edit control, use 
+             * the requested state.
+             */
+            if (dis->itemState & ODS_SELECTED) {
+                if (item->mask & CBEIF_SELECTEDIMAGE)
+                    drawimage = item->iSelectedImage;
+                drawstate = ILD_SELECTED;
             }
-            else {
-                FIXME("ODA_FOCUS and ODS_SELECTED but no text\n");
-            }
-        }
-        else {
-            FIXME("ODA_FOCUS but not ODS_SELECTED\n");
-        }
-        break;
-    case ODA_SELECT:
-    case ODA_DRAWENTIRE:
-        drawimage = -1;
-        drawstate = ILD_NORMAL;
-        if (!(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE)) {
-            if (item->mask & CBEIF_IMAGE) 
-                drawimage = item->iImage;
-            if (dis->itemState & ODS_COMBOEXLBOX) {
-                /* drawing listbox entry */
-                if (dis->itemState & ODS_SELECTED) {
-                    if (item->mask & CBEIF_SELECTEDIMAGE)
-                        drawimage = item->iSelectedImage;
-                    drawstate = ILD_SELECTED;
-                }
-            }
-            else {
-                /* drawing combo/edit entry */
-                if (infoPtr->hwndEdit) {
-                    /* if we have an edit control, the slave the 
-                     * selection state to the Edit focus state 
-                     */
-                    if (infoPtr->flags & WCBE_EDITFOCUSED) {
-                        if (item->mask & CBEIF_SELECTEDIMAGE)
-                            drawimage = item->iSelectedImage;
-                        drawstate = ILD_SELECTED;
-                    }
-                }
-                else {
-                    /* if we don't have an edit control, use 
-                     * the requested state.
-                     */
-                    if (dis->itemState & ODS_SELECTED) {
-                        if (item->mask & CBEIF_SELECTEDIMAGE)
-                            drawimage = item->iSelectedImage;
-                        drawstate = ILD_SELECTED;
-                    }
-                }
-            }
-        }
-        if (drawimage != -1) {
-            TRACE("drawing image state=%d\n", dis->itemState & ODS_SELECTED);
-            ImageList_Draw (infoPtr->himl, drawimage, dis->hDC, 
-                            xbase, dis->rcItem.top, drawstate);
-        }
-
-        /* setup pointer to text to be drawn */
-        if ((item->mask & CBEIF_TEXT) && item->pszText)
-            str = item->pszText;
-        else
-            str = (LPWSTR) L"";
+        }
+    }
+
+    if (infoPtr->himl && !(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGEINDENT)) {
+        IMAGEINFO iinfo;
+        iinfo.rcImage.left = iinfo.rcImage.right = 0;
+        ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
+        xioff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
+    }  else xioff = 0;
+
+    /* setup pointer to text to be drawn */
+    str = COMBOEX_GetText(infoPtr, item);
+    if (!str) str = nil;
+
+    len = strlenW (str);
+    GetTextExtentPoint32W (dis->hDC, str, len, &txtsize);
+    
+    if (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) {
+        int overlay = item->iOverlay;
+        
+        if (drawimage == I_IMAGECALLBACK) {
+            NMCOMBOBOXEXW nmce;
+            ZeroMemory(&nmce, sizeof(nmce));
+            nmce.ceItem.mask = (drawstate == ILD_NORMAL) ? CBEIF_IMAGE : CBEIF_SELECTEDIMAGE;
+            COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
+            if (drawstate == ILD_NORMAL) {
+                if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iImage = nmce.ceItem.iImage;
+                drawimage = nmce.ceItem.iImage;
+            } else if (drawstate == ILD_SELECTED) {
+                if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iSelectedImage = nmce.ceItem.iSelectedImage;
+                drawimage =  nmce.ceItem.iSelectedImage;
+            } else ERR("Bad draw state = %d\n", drawstate);
+        }
+
+        if (overlay == I_IMAGECALLBACK) {
+            NMCOMBOBOXEXW nmce;
+            ZeroMemory(&nmce, sizeof(nmce));
+            nmce.ceItem.mask = CBEIF_OVERLAY;
+            COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
+            if (nmce.ceItem.mask & CBEIF_DI_SETITEM)
+                item->iOverlay = nmce.ceItem.iOverlay;
+            overlay = nmce.ceItem.iOverlay;
+        }
+    
+        if (drawimage >= 0 && 
+            !(infoPtr->dwExtStyle & (CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT))) {
+            if (overlay > 0) ImageList_SetOverlayImage (infoPtr->himl, overlay, 1);
+            ImageList_Draw (infoPtr->himl, drawimage, dis->hDC, xbase, dis->rcItem.top, 
+                            drawstate | (overlay > 0 ? INDEXTOOVERLAYMASK(1) : 0));
+        }
 
         /* now draw the text */
-        len = lstrlenW (str);
-        GetTextExtentPointW (dis->hDC, str, len, &txtsize);
-        nbkc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
-                            COLOR_HIGHLIGHT : COLOR_WINDOW);
-        SetBkColor (dis->hDC, nbkc);
-        ntxc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
-                            COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT);
-        SetTextColor (dis->hDC, ntxc);
-        x = xbase + xioff;
-        y = dis->rcItem.top +
-            (dis->rcItem.bottom - dis->rcItem.top - txtsize.cy) / 2;
-        rect.left = x;
-        rect.right = x + txtsize.cx;
-        rect.top = dis->rcItem.top + 1;
-        rect.bottom = dis->rcItem.bottom - 1;
-        TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
-              dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
-        ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
-                     &rect, str, len, 0);
-        if (dis->itemState & ODS_FOCUS) {
-            rect.top -= 1;
-            rect.bottom += 1;
-            rect.left -= 1;
-            rect.right += 1;
-            TRACE("drawing item %d focus after text, rect=(%d,%d)-(%d,%d)\n",
-                  dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
-            DrawFocusRect (dis->hDC, &rect);
-        }
-        break;
-    default:
-        FIXME("unknown action hwnd=%08x, wparam=%08x, lparam=%08lx, action=%d\n", 
-              hwnd, wParam, lParam, dis->itemAction);
+        if (!IsWindowVisible (infoPtr->hwndEdit)) {
+            nbkc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
+                                COLOR_HIGHLIGHT : COLOR_WINDOW);
+            bkc = SetBkColor (dis->hDC, nbkc);
+            ntxc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
+                                COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT);
+            txc = SetTextColor (dis->hDC, ntxc);
+            x = xbase + xioff;
+            y = dis->rcItem.top +
+                (dis->rcItem.bottom - dis->rcItem.top - txtsize.cy) / 2;
+            rect.left = x;
+            rect.right = x + txtsize.cx;
+            rect.top = dis->rcItem.top + 1;
+            rect.bottom = dis->rcItem.bottom - 1;
+            TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
+                  dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
+            ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
+                         &rect, str, len, 0);
+            SetBkColor (dis->hDC, bkc);
+            SetTextColor (dis->hDC, txc);
+        }
+    }
+    
+    if (dis->itemAction & ODA_FOCUS) {
+        rect.left = xbase + xioff - 1;
+        rect.right = rect.left + txtsize.cx + 2;
+        rect.top = dis->rcItem.top;
+        rect.bottom = dis->rcItem.bottom;
+        DrawFocusRect(dis->hDC, &rect);
     }
 
@@ -1726 +1486 @@
 
 
-static LRESULT
-COMBOEX_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-
+static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr)
+{
     if (infoPtr->hwndCombo)
         DestroyWindow (infoPtr->hwndCombo);
@@ -1740 +1497 @@
 
     if (infoPtr->items) {
-        CBE_ITEMDATA *this, *next;
-
-        this = infoPtr->items;
-        while (this) {
-            next = (CBE_ITEMDATA *)this->next;
-            if ((this->mask & CBEIF_TEXT) && this->pszText)
-                COMCTL32_Free (this->pszText);
-            COMCTL32_Free (this);
-            this = next;
-        }
-    }
-
-    if (infoPtr->hDefaultFont) DeleteObject (infoPtr->hDefaultFont);
+        CBE_ITEMDATA *item, *next;
+
+        item = infoPtr->items;
+        while (item) {
+            next = (CBE_ITEMDATA *)item->next;
+            COMBOEX_FreeText (item);
+            COMCTL32_Free (item);
+            item = next;
+        }
+        infoPtr->items = 0;
+    }
+
+    if (infoPtr->defaultFont) 
+        DeleteObject (infoPtr->defaultFont);
 
     /* free comboex info data */
     COMCTL32_Free (infoPtr);
-    SetWindowLongA (hwnd, 0, 0);
+    SetWindowLongW (infoPtr->hwndSelf, 0, 0);
     return 0;
 }
 
 
-static LRESULT
-COMBOEX_MeasureItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    /*COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);*/
-    MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *) lParam;
+static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO *infoPtr, MEASUREITEMSTRUCT *mis)
+{
+    SIZE mysize;
     HDC hdc;
-    SIZE mysize;
 
     hdc = GetDC (0);
@@ -1775 +1530 @@
 
     TRACE("adjusted height hwnd=%08x, height=%d\n",
-          hwnd, mis->itemHeight);
+          infoPtr->hwndSelf, mis->itemHeight);
 
     return 0;
@@ -1781 +1536 @@
 
 
-static LRESULT
-COMBOEX_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT COMBOEX_NCCreate (HWND hwnd)
 {
     /* WARNING: The COMBOEX_INFO structure is not yet created */
     DWORD oldstyle, newstyle;
 
-    oldstyle = (DWORD)GetWindowLongA (hwnd, GWL_STYLE);
+    oldstyle = (DWORD)GetWindowLongW (hwnd, GWL_STYLE);
     newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL);
     if (newstyle != oldstyle) {
         TRACE("req style %08lx, reseting style %08lx\n",
               oldstyle, newstyle);
-        SetWindowLongA (hwnd, GWL_STYLE, newstyle);
+        SetWindowLongW (hwnd, GWL_STYLE, newstyle);
     }
     return 1;
@@ -1798 +1552 @@
 
 
-static LRESULT
-COMBOEX_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    INT i;
-
+static LRESULT COMBOEX_NotifyFormat (COMBOEX_INFO *infoPtr, LPARAM lParam)
+{
     if (lParam == NF_REQUERY) {
-        i = SendMessageA(GetParent (hwnd),
+        INT i = SendMessageW(GetParent (infoPtr->hwndSelf),
                          WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
-        if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-            ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-                i);
-            i = NFR_ANSI;
-        }
         infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
-        return (LRESULT)i;
-    }
-    return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);
-}
-
-
-static LRESULT
-COMBOEX_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
-    RECT rect;
-
-    GetWindowRect (hwnd, &rect);
-    TRACE("my rect (%d,%d)-(%d,%d)\n",
-          rect.left, rect.top, rect.right, rect.bottom);
-
-    MoveWindow (infoPtr->hwndCombo, 0, 0, rect.right -rect.left,
-                  rect.bottom - rect.top, TRUE);
+    }
+    return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI;
+}
+
+
+static LRESULT COMBOEX_Size (COMBOEX_INFO *infoPtr, INT width, INT height)
+{
+    TRACE("(width=%d, height=%d)\n", width, height); 
+
+    MoveWindow (infoPtr->hwndCombo, 0, 0, width, height, TRUE);
 
     COMBOEX_AdjustEditPos (infoPtr);
@@ -1838 +1575 @@
 
 
-static LRESULT
-COMBOEX_WindowPosChanging (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+static LRESULT COMBOEX_WindowPosChanging (COMBOEX_INFO *infoPtr, WINDOWPOS *wp)
+{
     RECT cbx_wrect, cbx_crect, cb_wrect;
     UINT width, height;
-    WINDOWPOS *wp = (WINDOWPOS *)lParam;
-
-    GetWindowRect (hwnd, &cbx_wrect);
-    GetClientRect (hwnd, &cbx_crect);
+
+    GetWindowRect (infoPtr->hwndSelf, &cbx_wrect);
+    GetClientRect (infoPtr->hwndSelf, &cbx_crect);
     GetWindowRect (infoPtr->hwndCombo, &cb_wrect);
 
@@ -1888 +1622 @@
 COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    COMBOEX_INFO *infoPtr = (COMBOEX_INFO *)GetPropA (hwnd, (LPCSTR)(LONG) ComboExInfo);
+    HWND hwndComboex = (HWND)GetPropA(hwnd, COMBOEX_SUBCLASS_PROP);
+    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwndComboex);
     NMCBEENDEDITW cbeend;
     WCHAR edit_text[260];
-    COLORREF nbkc, obkc;
+    COLORREF obkc;
     HDC hDC;
     RECT rect;
@@ -1904 +1639 @@
     {
 
-    case WM_CHAR:
+        case WM_CHAR:
             /* handle (ignore) the return character */
             if (wParam == VK_RETURN) return 0;
             /* all other characters pass into the real Edit */
-            return CallWindowProcA (infoPtr->prevEditWndProc, 
+            return CallWindowProcW (infoPtr->prevEditWndProc, 
                                    hwnd, uMsg, wParam, lParam);
 
-    case WM_ERASEBKGND:
+        case WM_ERASEBKGND:
             /*
              * The following was determined by traces of the native 
              */
             hDC = (HDC) wParam;
-            nbkc = GetSysColor (COLOR_WINDOW);
-            obkc = SetBkColor (hDC, nbkc);
+            obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW));
             GetClientRect (hwnd, &rect);
             TRACE("erasing (%d,%d)-(%d,%d)\n",
@@ -1923 +1657 @@
             ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-            return CallWindowProcA (infoPtr->prevEditWndProc, 
+            return CallWindowProcW (infoPtr->prevEditWndProc, 
                                    hwnd, uMsg, wParam, lParam);
 
-    case WM_KEYDOWN: {
-            INT oldItem, selected;
+        case WM_KEYDOWN: {
+            INT oldItem, selected, step = 1;
             CBE_ITEMDATA *item;
 
@@ -1960 +1694 @@
                 cbeend.iWhy = CBENF_ESCAPE;
 
-                if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-                    /* abort the change */
-                    TRACE("Notify requested abort of change\n");
-                    return 0;
-                }
-                oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
+                if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) return 0;
+                oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
                 InvalidateRect (infoPtr->hwndCombo, 0, 0);
                 if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
@@ -2010 +1740 @@
                     item = COMBOEX_FindItem (infoPtr, selected);
                     TRACE("handling VK_RETURN, selected = %d, selected_text=%s\n",
-                          selected, debugstr_w(item->pszText));
+                          selected, debugstr_txt(item->pszText));
                     TRACE("handling VK_RETURN, edittext=%s\n",
                           debugstr_w(edit_text));
-                    if (lstrcmpiW (item->pszText, edit_text)) {
+                    if (lstrcmpiW (COMBOEX_GetText(infoPtr, item), edit_text)) {
                         /* strings not equal -- indicate edit has changed */
                         selected = -1;
@@ -2040 +1770 @@
                 break;
 
+            case VK_UP:
+                step = -1;
+            case VK_DOWN:
+                /* by default, step is 1 */
+                oldItem = SendMessageW (infoPtr->hwndSelf, CB_GETCURSEL, 0, 0);
+                if (oldItem >= 0 && oldItem + step >= 0)
+                    SendMessageW (infoPtr->hwndSelf, CB_SETCURSEL, oldItem + step, 0);
+                return 0;
             default:
-                return CallWindowProcA (infoPtr->prevEditWndProc,
+                return CallWindowProcW (infoPtr->prevEditWndProc,
                                        hwnd, uMsg, wParam, lParam);
             }
@@ -2047 +1785 @@
             }
 
-    case WM_SETFOCUS:
+        case WM_SETFOCUS:
             /* remember the focus to set state of icon */
-            lret = CallWindowProcA (infoPtr->prevEditWndProc, 
+            lret = CallWindowProcW (infoPtr->prevEditWndProc, 
                                    hwnd, uMsg, wParam, lParam);
             infoPtr->flags |= WCBE_EDITFOCUSED;
             return lret;
 
-    case WM_KILLFOCUS:
+        case WM_KILLFOCUS:
             /* 
              * do NOTIFY CBEN_ENDEDIT with CBENF_KILLFOCUS
@@ -2072 +1810 @@
             /* fall through */
 
-    default:
-            return CallWindowProcA (infoPtr->prevEditWndProc, 
+        default:
+            return CallWindowProcW (infoPtr->prevEditWndProc, 
                                    hwnd, uMsg, wParam, lParam);
     }
@@ -2083 +1821 @@
 COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    COMBOEX_INFO *infoPtr = (COMBOEX_INFO *)GetPropA (hwnd, (LPCSTR)(LONG) ComboExInfo);
+    HWND hwndComboex = (HWND)GetPropA(hwnd, COMBOEX_SUBCLASS_PROP);
+    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwndComboex);
     NMCBEENDEDITW cbeend;
     NMMOUSE nmmse;
-    COLORREF nbkc, obkc;
+    COLORREF obkc;
     HDC hDC;
     HWND focusedhwnd;
@@ -2101 +1840 @@
 
     case CB_FINDSTRINGEXACT:
-            return COMBOEX_FindStringExact (infoPtr, wParam, lParam);
+            return COMBOEX_FindStringExact (infoPtr, (INT)wParam, (LPCSTR)lParam);
 
     case WM_DRAWITEM:
@@ -2110 +1849 @@
              */
             ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX;
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc, 
                                    hwnd, uMsg, wParam, lParam);
 
@@ -2118 +1857 @@
              */
             hDC = (HDC) wParam;
-            nbkc = GetSysColor (COLOR_WINDOW);
-            obkc = SetBkColor (hDC, nbkc);
+            obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW));
             GetClientRect (hwnd, &rect);
             TRACE("erasing (%d,%d)-(%d,%d)\n",
@@ -2125 +1863 @@
             ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc, 
                                    hwnd, uMsg, wParam, lParam);
 
@@ -2140 +1878 @@
             nmmse.dwHitInfo = lParam;
             COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse);
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc, 
                                    hwnd, uMsg, wParam, lParam);
 
@@ -2174 +1912 @@
 
                     infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-                    if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-                        /* abort the change */
-                        TRACE("Notify requested abort of change\n");
-                        return 0;
-                    }
+                    if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) return 0;
                 }
                 /* possible CB_GETCURSEL */
@@ -2219 +1953 @@
                  */
                 WCHAR edit_text[260];
-                WCHAR *lastwrk;
-                INT selected, cnt;
+                LPCWSTR lastwrk;
+                INT selected;
                 CBE_ITEMDATA *item;
 
@@ -2231 +1965 @@
                 if (selected == -1) {
                     lastwrk = infoPtr->edit->pszText;
-                    cnt = lstrlenW (lastwrk);
-                    if (cnt >= 259) cnt = 259;
                 }
                 else {
                     item = COMBOEX_FindItem (infoPtr, selected);
-                    cnt = lstrlenW (item->pszText);
-                    lastwrk = item->pszText;
-                    if (cnt >= 259) cnt = 259;
+                    lastwrk = COMBOEX_GetText(infoPtr, item);
                 }
 
                 TRACE("handling EN_CHANGE, selected = %d, selected_text=%s\n",
-                    selected, debugstr_w(lastwrk));
+                      selected, debugstr_w(lastwrk));
                 TRACE("handling EN_CHANGE, edittext=%s\n",
                       debugstr_w(edit_text));
 
                 /* lstrcmpiW is between lastworkingURL and GetWindowText */
-
                 if (lstrcmpiW (lastwrk, edit_text)) {
                     /* strings not equal -- indicate edit has changed */
@@ -2295 +2024 @@
             }/* fall through */
     default:
-            return CallWindowProcA (infoPtr->prevComboWndProc, 
+            return CallWindowProcW (infoPtr->prevComboWndProc, 
                                    hwnd, uMsg, wParam, lParam);
     }
@@ -2309 +2038 @@
     TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
 
-    if (!COMBOEX_GetInfoPtr (hwnd)) {
+    if (!infoPtr) {
         if (uMsg == WM_CREATE)
-            return COMBOEX_Create (hwnd, wParam, lParam);
+            return COMBOEX_Create (hwnd, (LPCREATESTRUCTA)lParam);
         if (uMsg == WM_NCCREATE)
-            COMBOEX_NCCreate (hwnd, wParam, lParam);
-        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            COMBOEX_NCCreate (hwnd);
+        return DefWindowProcW (hwnd, uMsg, wParam, lParam);
     }
 
     switch (uMsg)
     {
-        case CBEM_DELETEITEM:  /* maps to CB_DELETESTRING */
-            return COMBOEX_DeleteItem (hwnd, wParam, lParam);
+        case CBEM_DELETEITEM:
+            return COMBOEX_DeleteItem (infoPtr, wParam);
 
         case CBEM_GETCOMBOCONTROL:
-            return COMBOEX_GetComboControl (hwnd, wParam, lParam);
+            return infoPtr->hwndCombo;
 
         case CBEM_GETEDITCONTROL:
-            return COMBOEX_GetEditControl (hwnd, wParam, lParam);
+            return infoPtr->hwndEdit;
 
         case CBEM_GETEXTENDEDSTYLE:
-            return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
+            return infoPtr->dwExtStyle;
 
         case CBEM_GETIMAGELIST:
-            return COMBOEX_GetImageList (hwnd, wParam, lParam);
+            return (LRESULT)infoPtr->himl;
 
         case CBEM_GETITEMA:
-            return COMBOEX_GetItemA (hwnd, wParam, lParam);
+            return (LRESULT)COMBOEX_GetItemA (infoPtr, (COMBOBOXEXITEMA *)lParam);
 
         case CBEM_GETITEMW:
-            return COMBOEX_GetItemW (hwnd, wParam, lParam);
+            return (LRESULT)COMBOEX_GetItemW (infoPtr, (COMBOBOXEXITEMW *)lParam);
 
         case CBEM_GETUNICODEFORMAT:
-            return COMBOEX_GetUnicodeFormat (hwnd, wParam, lParam);
+            return infoPtr->unicode;
 
         case CBEM_HASEDITCHANGED:
-            return COMBOEX_HasEditChanged (hwnd, wParam, lParam);
+            return COMBOEX_HasEditChanged (infoPtr);
 
         case CBEM_INSERTITEMA:
-            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
+            return COMBOEX_InsertItemA (infoPtr, (COMBOBOXEXITEMA *)lParam);
 
         case CBEM_INSERTITEMW:
-            return COMBOEX_InsertItemW (hwnd, wParam, lParam);
-
-        case CBEM_SETEXSTYLE:   /* FIXME: obsoleted, should be the same as: */
+            return COMBOEX_InsertItemW (infoPtr, (COMBOBOXEXITEMW *)lParam);
+
+        case CBEM_SETEXSTYLE:
         case CBEM_SETEXTENDEDSTYLE:
-            return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
+            return COMBOEX_SetExtendedStyle (infoPtr, (DWORD)wParam, (DWORD)lParam);
 
         case CBEM_SETIMAGELIST:
-            return COMBOEX_SetImageList (hwnd, wParam, lParam);
+            return (LRESULT)COMBOEX_SetImageList (infoPtr, (HIMAGELIST)lParam);
 
         case CBEM_SETITEMA:
-            return COMBOEX_SetItemA (hwnd, wParam, lParam);
+            return COMBOEX_SetItemA (infoPtr, (COMBOBOXEXITEMA *)lParam);
 
         case CBEM_SETITEMW:
-            return COMBOEX_SetItemW (hwnd, wParam, lParam);
+            return COMBOEX_SetItemW (infoPtr, (COMBOBOXEXITEMW *)lParam);
 
         case CBEM_SETUNICODEFORMAT:
-            return COMBOEX_SetUnicodeFormat (hwnd, wParam, lParam);
-
+            return COMBOEX_SetUnicodeFormat (infoPtr, wParam);
+
+        /*case CBEM_SETWINDOWTHEME:
+            FIXME("CBEM_SETWINDOWTHEME: stub\n");*/
 
 /*   Combo messages we are not sure if we need to process or just forward */
@@ -2382 +2113 @@
             FIXME("(0x%x 0x%x 0x%lx): possibly missing function\n",
                   uMsg, wParam, lParam);
-            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
 
 /*   Combo messages OK to just forward to the regular COMBO */
@@ -2391 +2121 @@
         case CB_SETEXTENDEDUI:
         case CB_SHOWDROPDOWN:
-            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
+            return SendMessageW (infoPtr->hwndCombo, uMsg, wParam, lParam);
 
 /*   Combo messages we need to process specially */
         case CB_FINDSTRINGEXACT:
-            return COMBOEX_FindStringExact (COMBOEX_GetInfoPtr (hwnd), 
-                                            wParam, lParam);
+            return COMBOEX_FindStringExact (infoPtr, (INT)wParam, (LPCSTR)lParam);
 
         case CB_GETITEMDATA:
-            return COMBOEX_GetItemData (hwnd, wParam, lParam);
+            return COMBOEX_GetItemData (infoPtr, (INT)wParam);
 
         case CB_SETCURSEL:
-            return COMBOEX_SetCursel (hwnd, wParam, lParam);
+            return COMBOEX_SetCursel (infoPtr, (INT)wParam);
 
         case CB_SETITEMDATA:
-            return COMBOEX_SetItemData (hwnd, wParam, lParam);
+            return COMBOEX_SetItemData (infoPtr, (INT)wParam, (DWORD)lParam);
 
         case CB_SETITEMHEIGHT:
-            return COMBOEX_SetItemHeight (hwnd, wParam, lParam);
+            return COMBOEX_SetItemHeight (infoPtr, (INT)wParam, (UINT)lParam);
 
 
@@ -2414 +2143 @@
 /*   Window messages passed to parent */
         case WM_COMMAND:
-            return COMBOEX_Command (hwnd, wParam, lParam);
+            return COMBOEX_Command (infoPtr, wParam, lParam);
 
         case WM_NOTIFY:
             if (infoPtr->NtfUnicode)
-                return SendMessageW (GetParent (hwnd),
-                                     uMsg, wParam, lParam);
+                return SendMessageW (GetParent (hwnd), uMsg, wParam, lParam);
             else
-                return SendMessageA (GetParent (hwnd),
-                                     uMsg, wParam, lParam);
+                return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
 
 
 /*   Window messages we need to process */
         case WM_DELETEITEM:
-            return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
+            return COMBOEX_WM_DeleteItem (infoPtr, (DELETEITEMSTRUCT *)lParam);
 
         case WM_DRAWITEM:
-            return COMBOEX_DrawItem (hwnd, wParam, lParam);
+            return COMBOEX_DrawItem (infoPtr, (DRAWITEMSTRUCT *)lParam);
 
         case WM_DESTROY:
-            return COMBOEX_Destroy (hwnd, wParam, lParam);
+            return COMBOEX_Destroy (infoPtr);
 
         case WM_MEASUREITEM:
-            return COMBOEX_MeasureItem (hwnd, wParam, lParam);
+            return COMBOEX_MeasureItem (infoPtr, (MEASUREITEMSTRUCT *)lParam);
 
         case WM_NOTIFYFORMAT:
-            return COMBOEX_NotifyFormat (hwnd, wParam, lParam);
+            return COMBOEX_NotifyFormat (infoPtr, lParam);
 
         case WM_SIZE:
-            return COMBOEX_Size (hwnd, wParam, lParam);
+            return COMBOEX_Size (infoPtr, LOWORD(lParam), HIWORD(lParam));
 
         case WM_WINDOWPOSCHANGING:
-            return COMBOEX_WindowPosChanging (hwnd, wParam, lParam);
+            return COMBOEX_WindowPosChanging (infoPtr, (WINDOWPOS *)lParam);
 
         default:
             if (uMsg >= WM_USER)
-                ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-                     uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+                ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam);
+            return DefWindowProcW (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2457 +2183 @@
 
 
-VOID
-COMBOEX_Register (void)
-{
-    WNDCLASSA wndClass;
-
-    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
+void COMBOEX_Register (void)
+{
+    WNDCLASSW wndClass;
+
+    ZeroMemory (&wndClass, sizeof(WNDCLASSW));
     wndClass.style         = CS_GLOBALCLASS;
     wndClass.lpfnWndProc   = (WNDPROC)COMBOEX_WindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(COMBOEX_INFO *);
-    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hCursor       = LoadCursorW (0, IDC_ARROWW);
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = WC_COMBOBOXEXA;
+    wndClass.lpszClassName = WC_COMBOBOXEXW;
  
-    RegisterClassA (&wndClass);
-
-    ComboExInfo = GlobalAddAtomA("CC32SubclassInfo");
-}
-
-
-VOID
-COMBOEX_Unregister (void)
-{
-    UnregisterClassA (WC_COMBOBOXEXA, (HINSTANCE)NULL);
-}
-
+    RegisterClassW (&wndClass);
+}
+
+
+void COMBOEX_Unregister (void)
+{
+    UnregisterClassW (WC_COMBOBOXEXW, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/comctl32.def

@@ -1 @@
-; $Id: comctl32.def,v 1.25 2002-02-06 17:23:18 sandervl Exp $
+; $Id: comctl32.def,v 1.26 2002-05-08 11:24:59 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -15 +15 @@
   DPA_SaveStream               = _DPA_SaveStream@16                  @10
   DPA_Merge                    = _DPA_Merge@24                       @11
-  CreatePropertySheetPage      = _CreatePropertySheetPageA@4         @12
+;;12 stub Cctl1632_ThunkData32
   MakeDragList                 = _MakeDragList@4                     @13
   LBItemFromPt                 = _LBItemFromPt@16                    @14
@@ -107 +107 @@
   CreateMRUListLazyA  = _CreateMRUListLazyA@16     @157
 
+;;163 stub CreatePage
+;;164 stub CreateProxyPage
+
   AddMRUData          = _AddMRUData@12             @167
   FindMRUData         = _FindMRUData@16            @169

trunk/src/comctl32/comctl32.h

@@ -1 @@
-/* $Id: comctl32.h,v 1.21 2002-02-06 17:23:18 sandervl Exp $ */
-/*
- * Win32 common controls implementation
+/******************************************************************************
+ * 
+ * Common definitions (resource ids and global variables)
  *
- * Copyright (C) 1999 Achim Hasenmueller
+ * Copyright 1999 Thuy Nguyen
+ * Copyright 1999 Eric Kohl
  *
- * Based on the work of the WINE group (www.winehq.com)
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * Project Odin Software License can be found in LICENSE.TXT
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* Status: Corel WINE 20000807 */
-
-#ifndef _H_COMCTL32
-#define _H_COMCTL32
-
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include <win/commctrl.h>
-#include "unicode.h"
-
-#define _OS2WIN_H
-#define NO_ULONG
-#include <misc.h>
-
-#ifndef __cplusplus
-#undef inline
-#define inline
-#endif
-
-extern HBRUSH  COMCTL32_hPattern55AABrush;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* registers window classes inside this DLL */
-void CDECL RegisterCOMCTL32WindowClasses(unsigned long hinstDLL);
-void CDECL UnregisterCOMCTL32WindowClasses(void);
-#ifdef __cplusplus
-}
-#endif
-
-// string functions from kernel32
-LPWSTR WIN32API HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
-LPSTR  WIN32API HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str );
-
-
-/**************************************************************************
- *  UNDOCUMENTED functions
- */
-
-/* private heap memory functions */
-
-LPVOID WINAPI COMCTL32_Alloc (DWORD);
-LPVOID WINAPI COMCTL32_ReAlloc (LPVOID, DWORD);
-BOOL WINAPI COMCTL32_Free (LPVOID);
-DWORD  WINAPI COMCTL32_GetSize (LPVOID);
-
+#ifndef __WINE_COMCTL32_H
+#define __WINE_COMCTL32_H
 
 extern HMODULE COMCTL32_hModule;
+extern HBRUSH  COMCTL32_hPattern55AABrush;
 
 /* Property sheet / Wizard */
@@ -75 +38 @@
 #define IDC_SUNKEN_LINE   12326
 
-#define IDS_CLOSE 4160
+#define IDS_CLOSE         4160
 
 /* Toolbar customization dialog */
@@ -98 +61 @@
 #define IDB_HIST_LARGE      131
 
-//direction bitmaps
-#define IDB_DIRECTION_ALL   132
-#define IDB_DIRECTION_NS    133
-#define IDB_DIRECTION WE    134
-
-//Header filter bitmap
-#define IDB_HEADER_FILTER   140
-
-//cursors
-#define IDC_COMCTL32_ERROR       20480
-#define IDC_COMCTL32_INFORMATION 20481
-#define IDC_COMCTL32_EXCLAMATION 20482
-
-#define IDC_COMCTL32_DRAGRECT      102
-#define IDC_COMCTL32_ARROW1        104
-#define IDC_COMCTL32_ARROW2        105
-#define IDC_COMCTL32_DRAGHLINE     106
-#define IDC_COMCTL32_SPLITHLINE    107
-#define IDC_COMCTL32_HAND          108
-#define IDC_COMCTL32_DIRECTION_NS  109
-#define IDC_COMCTL32_DIRECTION_WE  110
-#define IDC_COMCTL32_DIRECTION_ALL 111
-#define IDC_COMCTL32_DIRECTION_N   112
-#define IDC_COMCTL32_DIRECTION_S   113
-#define IDC_COMCTL32_DIRECTION_E   114
-#define IDC_COMCTL32_DIRECTION_W   115
-#define IDC_COMCTL32_DIRECTION_NE  116
-#define IDC_COMCTL32_DIRECTION_NW  117
-#define IDC_COMCTL32_DIRECTION_SE  118
-#define IDC_COMCTL32_DIRECTION_SW  119
-
-#define IDC_COMCTL32_SPLITVLINE    135
-#define IDC_COMCTL32_ENTER         150
 
 /* Month calendar month menu popup */
 #define IDD_MCMONTHMENU     300
 
-#define IDM_JAN                         301
-#define IDM_FEB                         302
-#define IDM_MAR                         303
-#define IDM_APR                         304
-#define IDM_MAY                         305
-#define IDM_JUN                         306
-#define IDM_JUL                         307
-#define IDM_AUG                         308
-#define IDM_SEP                         309
-#define IDM_OCT                         310
-#define IDM_NOV                         311
-#define IDM_DEC                         312
+#define IDM_JAN                         301
+#define IDM_FEB                         302
+#define IDM_MAR                         303
+#define IDM_APR                         304
+#define IDM_MAY                         305
+#define IDM_JUN                         306
+#define IDM_JUL                         307
+#define IDM_AUG                         308
+#define IDM_SEP                         309
+#define IDM_OCT                         310
+#define IDM_NOV                         311
+#define IDM_DEC                         312
 
 #define IDM_TODAY                      4163
@@ -160 +90 @@
 #define IDC_DIVIDEROPEN                 107
 
+#ifdef __WIN32OS2__
+/* Header filter bitmap */
+#define IDB_HEADER_FILTER   140
+
+#define IDC_COMCTL32_DRAGHLINE     106
+#define IDC_COMCTL32_SPLITHLINE    107
+
+#endif
 
 /* DragList icon */
 #define IDI_DRAGARROW                   150
+
+typedef struct 
+{
+    COLORREF clrBtnHighlight;       /* COLOR_BTNHIGHLIGHT                  */
+    COLORREF clrBtnShadow;          /* COLOR_BTNSHADOW                     */
+    COLORREF clrBtnText;            /* COLOR_BTNTEXT                       */
+    COLORREF clrBtnFace;            /* COLOR_BTNFACE                       */
+    COLORREF clrHighlight;          /* COLOR_HIGHLIGHT                     */
+    COLORREF clrHighlightText;      /* COLOR_HIGHLIGHTTEXT                 */
+    COLORREF clr3dHilight;          /* COLOR_3DHILIGHT                     */
+    COLORREF clr3dShadow;           /* COLOR_3DSHADOW                      */
+    COLORREF clr3dDkShadow;         /* COLOR_3DDKSHADOW                    */
+    COLORREF clr3dFace;             /* COLOR_3DFACE                        */
+    COLORREF clrWindow;             /* COLOR_WINDOW                        */
+    COLORREF clrWindowText;         /* COLOR_WINDOWTEXT                    */
+    COLORREF clrGrayText;           /* COLOR_GREYTEXT                      */
+    COLORREF clrActiveCaption;      /* COLOR_ACTIVECAPTION                 */
+    COLORREF clrInfoBk;             /* COLOR_INFOBK                        */
+    COLORREF clrInfoText;           /* COLOR_INFOTEXT                      */
+} COMCTL32_SysColor;
+
+extern COMCTL32_SysColor  comctl32_color;
+
+/* Internal function */
+HWND COMCTL32_CreateToolTip (HWND);
+VOID COMCTL32_RefreshSysColors(void);
+INT  Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen);
+BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc);
 
 #define COMCTL32_VERSION_MINOR 0 
@@ -168 +134 @@
 #define WINE_FILEVERSIONSTR "5.00"
 
-#define UINT_PTR DWORD
-
+#ifdef __WIN32OS2__
+#define swprintf   wsprintfW
 #ifdef __cplusplus
 extern "C" {
@@ -216 +182 @@
 
 
-INT  Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen);
-BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc);
-
 #ifdef __cplusplus
 }
 #endif
+#endif
 
-#endif /* _H_COMCTL32 */
+#endif  /* __WINE_COMCTL32_H */

trunk/src/comctl32/comctl32dbg.def

@@ -1 @@
-; $Id: comctl32dbg.def,v 1.1 2002-02-15 15:39:29 sandervl Exp $
+; $Id: comctl32dbg.def,v 1.2 2002-05-08 11:24:59 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -15 +15 @@
   DPA_SaveStream               = _DbgDPA_SaveStream@16                  @10
   DPA_Merge                    = _DbgDPA_Merge@24                       @11
-  CreatePropertySheetPage      = _DbgCreatePropertySheetPageA@4         @12
+;;12 stub Cctl1632_ThunkData32
   MakeDragList                 = _DbgMakeDragList@4                     @13
   LBItemFromPt                 = _DbgLBItemFromPt@16                    @14

trunk/src/comctl32/comctl32undoc.c

@@ -5 +5 @@
  *           1998 Juergen Schmied <j.schmied@metronet.de>
  *           2000 Eric Kohl for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -34 +48 @@
 #include "comctl32.h"
 
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(commctrl);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 
@@ -206 +220 @@
     INT nCount;
     LPVOID *pWork1, *pWork2;
-    INT nResult;
+    INT nResult, i;
     INT nIndex;
 
@@ -224 +238 @@
         return FALSE;
 
-    if (dwFlags & DPAM_SORT) {
+    if (!(dwFlags & DPAM_NOSORT)) {
         TRACE("sorting dpa's!\n");
         if (hdpa1->nItemCount > 0)
@@ -251 +265 @@
     do
     {
-        if (nIndex < 0) break;
+        if (nIndex < 0) {
+            if ((nCount >= 0) && (dwFlags & DPAM_INSERT)) {
+                /* Now insert the remaining new items into DPA 1 */
+                TRACE("%d items to be inserted at start of DPA 1\n",
+                      nCount+1);
+                for (i=nCount; i>=0; i--) {
+                    PVOID ptr;
+
+                    ptr = (pfnMerge)(3, *pWork2, NULL, lParam);
+                    if (!ptr)
+                        return FALSE;
+                    DPA_InsertPtr (hdpa1, 0, ptr);
+                    pWork2--;
+                }
+            }
+            break;
+        }
         nResult = (pfnCompare)(*pWork1, *pWork2, lParam);
         TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n", 
@@ -270 +300 @@
             pWork1--;
         }
-        else if (nResult < 0)
+        else if (nResult > 0)
         {
-            if (!(dwFlags & 8))
+            /* item in DPA 1 missing from DPA 2 */
+            if (dwFlags & DPAM_DELETE)
             {
+                /* Now delete the extra item in DPA1 */
                 PVOID ptr;
 
@@ -285 +317 @@
         else
         {
-            if (!(dwFlags & 4))
+            /* new item in DPA 2 */
+            if (dwFlags & DPAM_INSERT)
             {
+                /* Now insert the new item in DPA 1 */
                 PVOID ptr;
 
@@ -292 +326 @@
                 if (!ptr)
                     return FALSE;
-                DPA_InsertPtr (hdpa1, nIndex, ptr);
+                DPA_InsertPtr (hdpa1, nIndex+1, ptr);
             }
             nCount--;
@@ -2800 +2834 @@
    return TRUE;
 }
-

trunk/src/comctl32/commctrl.c

@@ -5 +5 @@
  * Copyright 1998,2000 Eric Kohl
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -17 +30 @@
 #include "shlwapi.h"
 #include "comctl32.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(commctrl);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 extern void ANIMATE_Register(void);
@@ -68 +81 @@
 LANGID  COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
 HBRUSH  COMCTL32_hPattern55AABrush = (HANDLE)NULL;
+COMCTL32_SysColor  comctl32_color;
 
 static HBITMAP COMCTL32_hPattern55AABitmap = (HANDLE)NULL;
@@ -111 +125 @@
             COMCTL32_hPattern55AABitmap = CreateBitmap (8, 8, 1, 1, wPattern55AA);
             COMCTL32_hPattern55AABrush = CreatePatternBrush (COMCTL32_hPattern55AABitmap);
+
+            /* Get all the colors at DLL load */
+            COMCTL32_RefreshSysColors();
 
             /* register all Win95 common control classes */
@@ -396 +413 @@
  */
 
-VOID WINAPI
-DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style)
+void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style)
 {
     RECT r = *lprc;
@@ -403 +419 @@
 
     if (style & SBT_POPOUT)
-      border = BDR_RAISEDOUTER;
+        border = BDR_RAISEDOUTER;
     else if (style & SBT_NOBORDERS)
-      border = 0;
-
-    DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST|BF_MIDDLE);
+        border = 0;
+
+    DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST);
 
     /* now draw text */
     if (text) {
-      int oldbkmode = SetBkMode (hdc, TRANSPARENT);
-      r.left += 3;
-      DrawTextW (hdc, text, lstrlenW(text),
-                   &r, DT_LEFT|DT_VCENTER|DT_SINGLELINE);  
-      if (oldbkmode != TRANSPARENT)
+        int oldbkmode = SetBkMode (hdc, TRANSPARENT);
+        UINT align = DT_LEFT;
+        if (*text == L'\t') {
+            text++;
+            align = DT_CENTER;
+            if (*text == L'\t') {
+                text++;
+                align = DT_RIGHT;
+            }
+        }
+        r.left += 3;
+        if (style & SBT_RTLREADING)
+            FIXME("Usupported RTL style!");
+        DrawTextW (hdc, text, -1, &r, align|DT_VCENTER|DT_SINGLELINE);
         SetBkMode(hdc, oldbkmode);
     }
@@ -437 +462 @@
  */
 
-VOID WINAPI
-DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style)
+void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style)
 {
     INT len;
@@ -1015 +1039 @@
     return hwndToolTip;
 }
+
+
+/***********************************************************************
+ * COMCTL32_RefreshSysColors [NOT AN API]
+ *
+ * Invoked on any control recognizing a WM_SYSCOLORCHANGE message to
+ * refresh the color values in the color structure
+ *
+ * PARAMS
+ *     none
+ *
+ * RETURNS
+ *     none
+ */
+VOID
+COMCTL32_RefreshSysColors(void)
+{
+    comctl32_color.clrBtnHighlight = GetSysColor (COLOR_BTNHIGHLIGHT);
+    comctl32_color.clrBtnShadow = GetSysColor (COLOR_BTNSHADOW);
+    comctl32_color.clrBtnText = GetSysColor (COLOR_BTNTEXT);
+    comctl32_color.clrBtnFace = GetSysColor (COLOR_BTNFACE);
+    comctl32_color.clrHighlight = GetSysColor (COLOR_HIGHLIGHT);
+    comctl32_color.clrHighlightText = GetSysColor (COLOR_HIGHLIGHTTEXT);
+    comctl32_color.clr3dHilight = GetSysColor (COLOR_3DHILIGHT);
+    comctl32_color.clr3dShadow = GetSysColor (COLOR_3DSHADOW);
+    comctl32_color.clr3dDkShadow = GetSysColor (COLOR_3DDKSHADOW);
+    comctl32_color.clr3dFace = GetSysColor (COLOR_3DFACE);
+    comctl32_color.clrWindow = GetSysColor (COLOR_WINDOW);
+    comctl32_color.clrWindowText = GetSysColor (COLOR_WINDOWTEXT);
+    comctl32_color.clrGrayText = GetSysColor (COLOR_GRAYTEXT);
+    comctl32_color.clrActiveCaption = GetSysColor (COLOR_ACTIVECAPTION);
+    comctl32_color.clrInfoBk = GetSysColor (COLOR_INFOBK);
+    comctl32_color.clrInfoText = GetSysColor (COLOR_INFOTEXT);
+}

trunk/src/comctl32/dbgwrap.cpp

@@ -50 +50 @@
 DEBUGWRAP20(FlatSB_SetScrollRange)
 DEBUGWRAP12(FlatSB_ShowScrollBar)
-NODEF_DEBUGWRAP0(GetMUILanguage)
+DEBUGWRAP0(GetMUILanguage)
 DEBUGWRAP12(ImageList_Add)
 DEBUGWRAP8(ImageList_AddIcon)
@@ -95 +95 @@
 NODEF_DEBUGWRAP8(ImageList_Write)
 DEBUGWRAP4(InitCommonControlsEx)
-NODEF_DEBUGWRAP4(InitMUILanguage)
+DEBUGWRAP4(InitMUILanguage)
 DEBUGWRAP4(InitializeFlatSB)
 DEBUGWRAP4(PropertySheetA)

trunk/src/comctl32/flatsb.c

@@ -4 +4 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1998 Alex Priem
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -16 +30 @@
  */
 
+#include <string.h>
 #include "winbase.h"
 #include "winerror.h"
 #include "commctrl.h"
-#include "debugtools.h"
-
-#ifdef __WIN32OS2__
-#include "ccbase.h"
-#endif
-
-DEFAULT_DEBUG_CHANNEL(commctrl);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 typedef struct
 {
-#ifdef __WIN32OS2__
-    COMCTL32_HEADER header;
-#endif
     DWORD dwDummy;  /* just to keep the compiler happy ;-) */
 } FLATSB_INFO, *LPFLATSB_INFO;
@@ -39 +47 @@
 
 /***********************************************************************
- *              InitializeFlatSB
+ *              InitializeFlatSB (COMCTL32.86)
  *
  *      returns nonzero if successful, zero otherwise
@@ -52 +60 @@
 
 /***********************************************************************
- *              UninitializeFlatSB
+ *              UninitializeFlatSB (COMCTL32.90)
  *
  *      returns:
@@ -68 +76 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollProp
+ *              FlatSB_GetScrollProp (COMCTL32.32)
  *
  *      Returns nonzero if successful, or zero otherwise. If index is WSB_PROP_HSTYLE,
@@ -84 +92 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollProp
+ *              FlatSB_SetScrollProp (COMCTL32.36)
  */
 BOOL WINAPI 
@@ -111 +119 @@
 
 /***********************************************************************
- *              FlatSB_EnableScrollBar
+ *              FlatSB_EnableScrollBar (COMCTL32.29)
  */
 BOOL WINAPI 
@@ -120 +128 @@
 
 /***********************************************************************
- *              FlatSB_ShowScrollBar
+ *              FlatSB_ShowScrollBar (COMCTL32.38)
  */
 BOOL WINAPI 
@@ -129 +137 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollRange
+ *              FlatSB_GetScrollRange (COMCTL32.33)
  */
 BOOL WINAPI 
@@ -138 +146 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollInfo
+ *              FlatSB_GetScrollInfo (COMCTL32.30)
  */
 BOOL WINAPI 
@@ -147 +155 @@
 
 /***********************************************************************
- *              FlatSB_GetScrollPos
+ *              FlatSB_GetScrollPos (COMCTL32.31)
  */
 INT WINAPI 
@@ -156 +164 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollPos
+ *              FlatSB_SetScrollPos (COMCTL32.35)
  */
 INT WINAPI 
@@ -165 +173 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollInfo
+ *              FlatSB_SetScrollInfo (COMCTL32.34)
  */
 INT WINAPI 
@@ -174 +182 @@
 
 /***********************************************************************
- *              FlatSB_SetScrollRange
+ *              FlatSB_SetScrollRange (COMCTL32.37)
  */
 INT WINAPI 
@@ -187 +195 @@
 {
     TRACE("[%04x] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
-#ifdef __WIN32OS2__
-    initControl(hwnd,sizeof(FLATSB_INFO));
-#endif
-
     return 0;
 }
@@ -199 +203 @@
 {
     TRACE("[%04x] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
-#ifdef __WIN32OS2__
-    /* free pager info data */
-    doneControl(hwnd);
-#endif
     return 0;
 }
@@ -210 +210 @@
 FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+    if (!FlatSB_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
+        return DefWindowProcA( hwnd, uMsg, wParam, lParam );
+    
     switch (uMsg)
     {
@@ -222 +225 @@
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",
                     uMsg, wParam, lParam);
-#ifdef __WIN32OS2__
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
-#else
             return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-#endif
     }
     return 0;

trunk/src/comctl32/imagelist.c

@@ -6 +6 @@
  *            2001 Michael Stefaniuc
  *            2001 Charles Loep for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  TODO:
@@ -22 +36 @@
  *      partially implemented, the functions mentioned above will be 
  *      limited in functionality too.
+ *
+ *    - Hotspot handling still not correct. The Hotspot passed to BeginDrag
+ *      is the offset of the image position relative to the actual mouse pointer
+ *      position. However the Hotspot passed to SetDragCursorImage is the
+ *      offset of the mouse messages sent to the application...
  */
 
@@ -32 +51 @@
 #include "commctrl.h"
 #include "imagelist.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(imagelist);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(imagelist);
 
 
@@ -54 +73 @@
     /* saved background */
     HBITMAP     hbmBg;
+    BOOL        bHSPending;
 } INTERNALDRAG;
 
-static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 };
+static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0, FALSE };
 
 
@@ -748 +768 @@
 
     InternalDrag.himl->cCurImage = 1;
+    InternalDrag.bHSPending = TRUE;
 
     return TRUE;
@@ -1072 +1093 @@
 ImageList_DragLeave (HWND hwndLock)
 {
-    if (hwndLock)
+    /* As we don't save drag info in the window this can lead to problems if
+       an app does not supply the same window as DragEnter */
+    /* if (hwndLock)
         InternalDrag.hwnd = hwndLock;
     else
-        InternalDrag.hwnd = GetDesktopWindow ();
+        InternalDrag.hwnd = GetDesktopWindow (); */
+    if(!hwndLock)
+        hwndLock = GetDesktopWindow();
+    if(InternalDrag.hwnd != hwndLock)
+        FIXME("DragLeave hWnd != DragEnter hWnd\n");
 
     ImageList_DragShowNolock (FALSE);
@@ -1490 +1517 @@
     DeleteObject(InternalDrag.hbmBg);
     InternalDrag.hbmBg = 0;
+    InternalDrag.bHSPending = FALSE;
 
     return TRUE;
@@ -2601 +2629 @@
      * hotspot) to the origin of the second image.
      * See M$DN for details */
-    dx = InternalDrag.dxHotspot - dxHotspot;
-    dy = InternalDrag.dyHotspot - dyHotspot;
+    if(InternalDrag.bHSPending) {
+        dx = 0;
+        dy = 0;
+        InternalDrag.bHSPending = FALSE;
+    } else {
+        dx = InternalDrag.dxHotspot - dxHotspot;
+        dy = InternalDrag.dyHotspot - dyHotspot;
+    }
     himlTemp = ImageList_Merge (InternalDrag.himl, 0, himlDrag, iDrag, dx, dy);
 
@@ -2621 +2655 @@
     /* update the InternalDragOffset, if the origin of the
      * DragImage was changed by ImageList_Merge. */
-    if (dx > InternalDrag.dxHotspot) {
-        InternalDrag.dxHotspot = dx;
-    }
-    if (dy > InternalDrag.dyHotspot) {
-        InternalDrag.dyHotspot = dy;
-    }
+    if (dx <= 0)
+        InternalDrag.dxHotspot = dxHotspot;
+    if (dy <= 0)
+        InternalDrag.dyHotspot = dyHotspot;
 
     if (visible) {
@@ -2934 +2966 @@
 
     if(bitCount == 1) {
-        //Hack.
+        /* Hack. */
         LPBITMAPINFO inf = (LPBITMAPINFO)bmih;
         inf->bmiColors[0].rgbRed = inf->bmiColors[0].rgbGreen = inf->bmiColors[0].rgbBlue = 0;

trunk/src/comctl32/ipaddress.c

@@ -2 +2 @@
  * IP Address control
  *
- * Copyright 1999 Chris Morgan<cmorgan@wpi.edu> and
- *                James Abbatiello<abbeyj@wpi.edu>
+ * Copyright 2002 Dimitrie O. Paun
+ * Copyright 1999 Chris Morgan<cmorgan@wpi.edu>
+ * Copyright 1999 James Abbatiello<abbeyj@wpi.edu>
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1998 Alex Priem <alexp@sci.kun.nl>
  *
- * NOTES
- *
- * TODO:
- *    -Edit control doesn't support the ES_CENTER style which prevents
- *     this ipaddress control from having centered text look like the
- *     windows ipaddress control
- *    -Check all notifications/behavior.
- *    -Optimization: 
- *        -include lpipsi in IPADDRESS_INFO.
- *        -CurrentFocus: field that has focus at moment of processing.
- *        -connect Rect32 rcClient.
- *        -check ipaddress.cpp for missing features.
- *    -refresh: draw '.' instead of setpixel.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
  */
 
@@ -27 +29 @@
 #include <string.h>
 
+#include "ntddk.h"
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(ipaddress);
+#include "wine/debug.h"
+#ifdef __WIN32OS2__
+#include "comctl32.h"
+#endif
+
+WINE_DEFAULT_DEBUG_CHANNEL(ipaddress);
 
 typedef struct
 {
-        BYTE LowerLimit[4];
-        BYTE UpperLimit[4];
-
-        RECT    rcClient;
-        INT     uFocus;
+    HWND     EditHwnd;
+    INT      LowerLimit;
+    INT      UpperLimit;
+    WNDPROC  OrigProc;
+} IPPART_INFO;
+
+typedef struct
+{
+    HWND        Self;
+    IPPART_INFO Part[4];
 } IPADDRESS_INFO;
 
-typedef struct
-{
-    WNDPROC wpOrigProc[4];
-    HWND    hwndIP[4];
-    IPADDRESS_INFO *infoPtr;
-    HWND    hwnd;
-    UINT    uRefCount;
-} IP_SUBCLASS_INFO, *LPIP_SUBCLASS_INFO;
-
-#define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO *)GetWindowLongA (hwnd, 0))
-
-static BOOL 
-IPADDRESS_SendNotify (HWND hwnd, UINT command);
-static BOOL 
-IPADDRESS_SendIPAddressNotify (HWND hwnd, UINT field, BYTE newValue);
-
-/* property name of tooltip window handle */
+#define POS_DEFAULT     0
+#define POS_LEFT        1
+#define POS_RIGHT       2
+#define POS_SELALL      3
+
 #define IP_SUBCLASS_PROP "CCIP32SubclassInfo"
+#define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO *)GetWindowLongW (hwnd, 0))
 
 
@@ -65 +65 @@
 IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-
-static VOID
-IPADDRESS_Refresh (HWND hwnd, HDC hdc)
-{
-  RECT rcClient;
-  HBRUSH hbr;
-  COLORREF clr=GetSysColor (COLOR_3DDKSHADOW);
-  int i,x,fieldsize;
-
-  GetClientRect (hwnd, &rcClient);
-  hbr = CreateSolidBrush (RGB(255,255,255));
-  DrawEdge (hdc, &rcClient, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
-  FillRect (hdc, &rcClient, hbr);
-  DeleteObject (hbr);
-
-  x=rcClient.left;
-  fieldsize=(rcClient.right-rcClient.left) / 4;
-
-  for (i=0; i<3; i++) {         /* Should draw text "." here */
-    x+=fieldsize;
-    SetPixel (hdc, x,   13, clr);
-    SetPixel (hdc, x,   14, clr);
-    SetPixel (hdc, x+1, 13, clr);
-    SetPixel (hdc, x+1, 14, clr);
-  }
-}
-
-
-static LRESULT
-IPADDRESS_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  IPADDRESS_INFO *infoPtr;
-  RECT rcClient, edit;
-  int i,fieldsize;
-  LPIP_SUBCLASS_INFO lpipsi;
+static LRESULT IPADDRESS_Notify (IPADDRESS_INFO *infoPtr, UINT command)
+{
+    HWND hwnd = infoPtr->Self;
+    
+    TRACE("(command=%x)\n", command);
+    
+    return SendMessageW (GetParent (hwnd), WM_COMMAND,
+             MAKEWPARAM (GetWindowLongW (hwnd, GWL_ID), command), (LPARAM)hwnd);
+}
+
+static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value)
+{
+    NMIPADDRESS nmip;
+
+    TRACE("(field=%x, value=%d)\n", field, value);
+    
+    nmip.hdr.hwndFrom = infoPtr->Self;
+    nmip.hdr.idFrom   = GetWindowLongW (infoPtr->Self, GWL_ID);
+    nmip.hdr.code     = IPN_FIELDCHANGED;
+
+    nmip.iField = field;
+    nmip.iValue = value;
+
+    SendMessageW (GetParent (infoPtr->Self), WM_NOTIFY,
+                  (WPARAM)nmip.hdr.idFrom, (LPARAM)&nmip);
+
+    TRACE("<-- %d\n", nmip.iValue);
+    
+    return nmip.iValue;
+}
+
+
+static int IPADDRESS_GetPartIndex(IPADDRESS_INFO *infoPtr, HWND hwnd)
+{
+    int i;
+    
+    TRACE("(hwnd=%x)\n", hwnd);
+    
+    for (i = 0; i < 4; i++) 
+        if (infoPtr->Part[i].EditHwnd == hwnd) return i;
+    
+    ERR("We subclassed the wrong window! (hwnd=%x)\n", hwnd);
+    return -1;
+}
+
+
+static LRESULT IPADDRESS_Draw (IPADDRESS_INFO *infoPtr, HDC hdc)
+{
+    RECT rect, rcPart;
+    POINT pt;
+    int i;
+
+    TRACE("\n");
+    
+    GetClientRect (infoPtr->Self, &rect);
+    DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+
+    for (i = 0; i < 3; i++) {
+        GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart);
+        pt.x = rcPart.right;
+        ScreenToClient(infoPtr->Self, &pt);
+        rect.left = pt.x;       
+        GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart);
+        pt.x = rcPart.left;
+        ScreenToClient(infoPtr->Self, &pt);
+        rect.right = pt.x;
+        DrawTextA(hdc, ".", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM);
+    }
+
+    return 0;
+}
+
+
+static LRESULT IPADDRESS_Create (HWND hwnd)
+{
+    IPADDRESS_INFO *infoPtr;
+    RECT rcClient, edit;
+    int i, fieldsize;
+    WCHAR EDIT[] = { 'E', 'd', 'i', 't', 0 };
+
+    TRACE("\n");
+    
+    SetWindowLongW (hwnd, GWL_STYLE,
+                    GetWindowLongW(hwnd, GWL_STYLE) & ~WS_BORDER);
+    
+    infoPtr = (IPADDRESS_INFO *)COMCTL32_Alloc (sizeof(IPADDRESS_INFO));
+    if (!infoPtr) return -1;
+    SetWindowLongW (hwnd, 0, (DWORD)infoPtr);
+
+    GetClientRect (hwnd, &rcClient);
+
+    fieldsize = (rcClient.right - rcClient.left) / 4;
+
+    edit.top    = rcClient.top + 2;
+    edit.bottom = rcClient.bottom - 2;
+
+    infoPtr->Self = hwnd;
+  
+    for (i = 0; i < 4; i++) {
+        IPPART_INFO* part = &infoPtr->Part[i];
         
-
-  infoPtr = (IPADDRESS_INFO *)COMCTL32_Alloc (sizeof(IPADDRESS_INFO));
-  SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
-
-  GetClientRect (hwnd, &rcClient);
-
-  fieldsize=(rcClient.right-rcClient.left) /4;
-
-  edit.top   =rcClient.top+2;
-  edit.bottom=rcClient.bottom-2;
-
-  lpipsi=(LPIP_SUBCLASS_INFO) GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
-  if (lpipsi == NULL)  {
-    lpipsi = (LPIP_SUBCLASS_INFO) COMCTL32_Alloc (sizeof(IP_SUBCLASS_INFO));
-    lpipsi->hwnd = hwnd;
-    lpipsi->uRefCount++;
-    SetPropA ((HWND)hwnd, IP_SUBCLASS_PROP, (HANDLE)lpipsi);
-/*              infoPtr->lpipsi= lpipsi; */
-  } else 
-    WARN("IP-create called twice\n");
+        part->LowerLimit = 0;
+        part->UpperLimit = 255;
+        edit.left = rcClient.left + i*fieldsize + 6;
+        edit.right = rcClient.left + (i+1)*fieldsize - 2;
+        part->EditHwnd =
+                CreateWindowW (EDIT, NULL, WS_CHILD | WS_VISIBLE | ES_CENTER,
+                               edit.left, edit.top, edit.right - edit.left, 
+                               edit.bottom - edit.top, hwnd, (HMENU) 1, 
+                               GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
+        SetPropA(part->EditHwnd, IP_SUBCLASS_PROP, hwnd);
+        part->OrigProc = (WNDPROC)
+                SetWindowLongW (part->EditHwnd, GWL_WNDPROC, 
+                                (LONG)IPADDRESS_SubclassProc);
+    }
+
+    return 0;
+}
+
+
+static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr)
+{
+    int i;
+
+    TRACE("\n");
+    
+    for (i = 0; i < 4; i++) {
+        IPPART_INFO* part = &infoPtr->Part[i];
+        SetWindowLongW (part->EditHwnd, GWL_WNDPROC, (LONG)part->OrigProc);
+    }
+
+    SetWindowLongW (infoPtr->Self, 0, 0);
+    COMCTL32_Free (infoPtr);
+    return 0;
+}
+
+
+static LRESULT IPADDRESS_Paint (IPADDRESS_INFO *infoPtr, HDC hdc)
+{
+    PAINTSTRUCT ps;
+
+    TRACE("\n");
+    
+    if (hdc) return IPADDRESS_Draw (infoPtr, hdc);
+  
+    hdc = BeginPaint (infoPtr->Self, &ps);
+    IPADDRESS_Draw (infoPtr, hdc);
+    EndPaint (infoPtr->Self, &ps);
+    return 0;
+}
+
+
+static BOOL IPADDRESS_IsBlank (IPADDRESS_INFO *infoPtr)
+{
+    int i;
+
+    TRACE("\n");
+
+    for (i = 0; i < 4; i++)
+        if (GetWindowTextLengthW (infoPtr->Part[i].EditHwnd)) return FALSE;
+
+    return TRUE;
+}
+
+
+static int IPADDRESS_GetAddress (IPADDRESS_INFO *infoPtr, LPDWORD ip_address)
+{
+    WCHAR field[5];
+    int i, invalid = 0;
+    DWORD ip_addr = 0;
+
+    TRACE("\n");
+
+    for (i = 0; i < 4; i++) {
+        ip_addr *= 256;
+        if (GetWindowTextW (infoPtr->Part[i].EditHwnd, field, 4)) 
+            ip_addr += wcstol(field, 0, 10);
+        else
+            invalid++;
+    }
+    *ip_address = ip_addr;
+
+    return 4 - invalid;
+}
+
+
+static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range)
+{
+    TRACE("\n");
+
+    if ( (index < 0) || (index > 3) ) return FALSE;
+
+    infoPtr->Part[index].LowerLimit = range & 0xFF;
+    infoPtr->Part[index].UpperLimit = (range >> 8)  & 0xFF;
+
+    return TRUE;
+}
+
+
+static void IPADDRESS_ClearAddress (IPADDRESS_INFO *infoPtr)
+{
+    WCHAR nil[1] = { 0 };
+    int i;
+
+    TRACE("\n");
+
+    for (i = 0; i < 4; i++) 
+        SetWindowTextW (infoPtr->Part[i].EditHwnd, nil);
+}
+
+
+static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address)
+{
+    WCHAR buf[20], fmt[] = { '%', 'd', 0 };
+    int i;
+
+    TRACE("\n");
+
+    for (i = 3; i >= 0; i--) {
+        IPPART_INFO* part = &infoPtr->Part[i];
+        int value = ip_address & 0xff;
+        if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) {
+            swprintf (buf, fmt, value);
+            SetWindowTextW (part->EditHwnd, buf);
+            IPADDRESS_Notify (infoPtr, EN_CHANGE);
+        }
+        ip_address >>= 8;
+    }
+
+    return TRUE;
+}
+
+
+static void IPADDRESS_SetFocusToField (IPADDRESS_INFO *infoPtr, INT index)
+{
+    TRACE("(index=%d)\n", index);
+ 
+    if (index > 3) {
+        for (index = 0; index < 4; index++)
+            if (!GetWindowTextLengthW(infoPtr->Part[index].EditHwnd)) break;
+    }
+    if (index < 9 || index > 3) index = 0;
         
-  for (i=0; i<=3; i++)
-  {
-    infoPtr->LowerLimit[i]=0;
-    infoPtr->UpperLimit[i]=255;
-    edit.left=rcClient.left+i*fieldsize+6;
-    edit.right=rcClient.left+(i+1)*fieldsize-2;
-    lpipsi->hwndIP[i]= CreateWindowA ("edit", NULL, 
-        WS_CHILD | WS_VISIBLE | ES_CENTER,
-        edit.left, edit.top, edit.right-edit.left, edit.bottom-edit.top,
-        hwnd, (HMENU) 1, GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
-    lpipsi->wpOrigProc[i]= (WNDPROC)
-        SetWindowLongA (lpipsi->hwndIP[i],GWL_WNDPROC, (LONG)
-        IPADDRESS_SubclassProc);
-    SetPropA ((HWND)lpipsi->hwndIP[i], IP_SUBCLASS_PROP, (HANDLE)lpipsi);
-  }
-
-  lpipsi->infoPtr= infoPtr;
-
-  return 0;
-}
-
-
-static LRESULT
-IPADDRESS_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  int i;
-  IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
-  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
-
-  for (i=0; i<=3; i++) {
-    SetWindowLongA ((HWND)lpipsi->hwndIP[i], GWL_WNDPROC,
-                  (LONG)lpipsi->wpOrigProc[i]);
-  }
-
-  COMCTL32_Free (infoPtr);
-  SetWindowLongA (hwnd, 0, 0);
-  return 0;
-}
-
-
-static LRESULT
-IPADDRESS_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  HDC hdc;
-
-  TRACE("\n");
-  hdc = GetDC (hwnd);
-  IPADDRESS_Refresh (hwnd, hdc);
-  ReleaseDC (hwnd, hdc);
-
-  IPADDRESS_SendIPAddressNotify (hwnd, 0, 0);  /* FIXME: should use -1 */
-  IPADDRESS_SendNotify (hwnd, EN_KILLFOCUS);       
-  InvalidateRect (hwnd, NULL, TRUE);
-
-  return 0;
-}
-
-
-static LRESULT
-IPADDRESS_Paint (HWND hwnd, WPARAM wParam)
-{
-  HDC hdc;
-  PAINTSTRUCT ps;
-
-  hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
-  IPADDRESS_Refresh (hwnd, hdc);
-  if(!wParam)
-    EndPaint (hwnd, &ps);
-  return 0;
-}
-
-
-static LRESULT
-IPADDRESS_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  HDC hdc;
-
-  TRACE("\n");
-
-  hdc = GetDC (hwnd);
-  IPADDRESS_Refresh (hwnd, hdc);
-  ReleaseDC (hwnd, hdc);
-
-  return 0;
-}
-
-
-static LRESULT
-IPADDRESS_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  /* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd); */
-  TRACE("\n");
-  return 0;
-}
-
-
-static BOOL
-IPADDRESS_SendNotify (HWND hwnd, UINT command)
-{
-  TRACE("%x\n",command);
-  return (BOOL)SendMessageA (GetParent (hwnd), WM_COMMAND,
-              MAKEWPARAM (GetWindowLongA (hwnd, GWL_ID),command), (LPARAM)hwnd);
-}
-
-
-static BOOL
-IPADDRESS_SendIPAddressNotify (HWND hwnd, UINT field, BYTE newValue)
-{
-  NMIPADDRESS nmip;
-
-  TRACE("%x %x\n",field,newValue);
-  nmip.hdr.hwndFrom = hwnd;
-  nmip.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-  nmip.hdr.code     = IPN_FIELDCHANGED;
-
-  nmip.iField=field;
-  nmip.iValue=newValue;
-
-  return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                             (WPARAM)nmip.hdr.idFrom, (LPARAM)&nmip);
-}
-
-
-static LRESULT
-IPADDRESS_ClearAddress (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  int i;
-  HDC hdc;
-  char buf[1];
-  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetPropA ((HWND)hwnd,IP_SUBCLASS_PROP);
-
-  TRACE("\n");
-
-  buf[0]=0;
-  for (i=0; i<=3; i++) 
-    SetWindowTextA (lpipsi->hwndIP[i],buf);
+    SetFocus (infoPtr->Part[index].EditHwnd);
+}
+
+
+static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield)
+{
+    IPPART_INFO *part = &infoPtr->Part[currentfield];
+    WCHAR field[10], fmt[] = { '%', 'd', 0 };
+    int curValue, newValue;
+
+    TRACE("(currentfield=%d)\n", currentfield);
+
+    if (currentfield < 0 || currentfield > 3) return FALSE;
+  
+    if (!GetWindowTextW (part->EditHwnd, field, 4)) return FALSE;
+    
+    curValue = wcstol(field, 0, 10);
+    TRACE("  curValue=%d\n", curValue);
+    
+    newValue = IPADDRESS_IPNotify(infoPtr, currentfield, curValue);
+    TRACE("  newValue=%d\n", newValue);
+
+    if (newValue < part->LowerLimit) newValue = part->LowerLimit;
+    if (newValue > part->UpperLimit) newValue = part->UpperLimit;
+    
+    if (newValue == curValue) return FALSE;
+    
+    swprintf (field, fmt, newValue);
+    TRACE("  field='%s'\n", debugstr_w(field));
+    return SetWindowTextW (part->EditHwnd, field);
+}
+
+
+static BOOL IPADDRESS_GotoNextField (IPADDRESS_INFO *infoPtr, int cur, int sel)
+{
+    TRACE("\n");
+
+    if(cur >= -1 && cur < 4) {
+        IPADDRESS_ConstrainField(infoPtr, cur);
         
-  hdc = GetDC (hwnd);
-  IPADDRESS_Refresh (hwnd, hdc);
-  ReleaseDC (hwnd, hdc);
-        
-  return 0;
-}
-
-
-static LRESULT
-IPADDRESS_IsBlank (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  int i;
-  char buf[20];
-  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
-
-  TRACE("\n");
-
-  for (i=0; i<=3; i++) {
-    GetWindowTextA (lpipsi->hwndIP[i],buf,5);
-    if (buf[0])
-      return 0;
-  }
-
-  return 1;
-}
-
-
-static LRESULT
-IPADDRESS_GetAddress (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  char field[20];
-  int i,valid,fieldvalue;
-  DWORD ip_addr;
-  IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
-  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
-
-  TRACE("\n");
-
-  valid=0;
-  ip_addr=0;
-  for (i=0; i<=3; i++) {
-    GetWindowTextA (lpipsi->hwndIP[i],field,4);
-    ip_addr*=256;
-    if (field[0]) {
-      field[3]=0;
-      fieldvalue=atoi(field);
-      if (fieldvalue<infoPtr->LowerLimit[i]) 
-        fieldvalue=infoPtr->LowerLimit[i];
-      if (fieldvalue>infoPtr->UpperLimit[i]) 
-        fieldvalue=infoPtr->UpperLimit[i];
-      ip_addr+=fieldvalue;
-      valid++;
-    }
-  }
-
-  *(LPDWORD) lParam=ip_addr;
-
-  return valid;
-}
-
-
-static LRESULT
-IPADDRESS_SetRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
-  INT index;
-        
-  TRACE("\n");
-
-  index=(INT) wParam;
-  if ((index<0) || (index>3)) return 0;
-
-  infoPtr->LowerLimit[index]=lParam & 0xff;
-  infoPtr->UpperLimit[index]=(lParam >>8)  & 0xff;
-  return 1;
-}
-
-
-static LRESULT
-IPADDRESS_SetAddress (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
-  HDC hdc;
-  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
-            GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
-  int i,value;
-  DWORD ip_address;
-  char buf[20];
-
-  TRACE("\n");
-  ip_address=(DWORD) lParam;
-
-  for (i=3; i>=0; i--) {
-    value=ip_address & 0xff;
-    if ((value>=infoPtr->LowerLimit[i]) && (value<=infoPtr->UpperLimit[i])) 
-    {
-      sprintf (buf,"%d",value);
-      SetWindowTextA (lpipsi->hwndIP[i],buf);
-      IPADDRESS_SendNotify (hwnd, EN_CHANGE);
-    }
-    ip_address= ip_address >> 8;
-  }
-
-  hdc = GetDC (hwnd);           /* & send notifications */
-  IPADDRESS_Refresh (hwnd, hdc);
-  ReleaseDC (hwnd, hdc);
-
-  return TRUE;
-}
-
-
-static LRESULT
-IPADDRESS_SetFocusToField (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  /* IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd); */
-  LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO) GetPropA ((HWND)hwnd,
-                                                   IP_SUBCLASS_PROP);
-  INT index;
-
-  index=(INT) wParam;
-  TRACE(" %d\n", index);
-  if ((index<0) || (index>3)) return 0;
-        
-  SetFocus (lpipsi->hwndIP[index]);
-        
-  return 1;
-}
-
-
-static LRESULT
-IPADDRESS_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  TRACE("\n");
-
-  SetFocus (hwnd);
-  IPADDRESS_SendNotify (hwnd, EN_SETFOCUS);
-  IPADDRESS_SetFocusToField (hwnd, 0, 0);
-
-  return TRUE;
-}
-
-
-static INT
-IPADDRESS_CheckField (LPIP_SUBCLASS_INFO lpipsi, int currentfield)
-{
-  int newField,fieldvalue;
-  char field[20];
-  IPADDRESS_INFO *infoPtr=lpipsi->infoPtr;
-
-  if(currentfield >= 0 && currentfield < 4)
-  {
-    TRACE("\n");
-    GetWindowTextA (lpipsi->hwndIP[currentfield],field,4);
-    if (field[0])
-    {
-      field[3]=0;       
-      newField=-1;
-      fieldvalue=atoi(field);
-    
-      if (fieldvalue < infoPtr->LowerLimit[currentfield]) 
-        newField=infoPtr->LowerLimit[currentfield];
-    
-      if (fieldvalue > infoPtr->UpperLimit[currentfield])
-        newField=infoPtr->UpperLimit[currentfield];
-    
-      if (newField >= 0)
-      {
-        sprintf (field,"%d",newField);
-        SetWindowTextA (lpipsi->hwndIP[currentfield], field);
-        return TRUE;
-      }
-    }
-  }
-  return FALSE;
-}
-
-
-static INT
-IPADDRESS_GotoNextField (LPIP_SUBCLASS_INFO lpipsi, int currentfield)
-{
-  if(currentfield >= -1 && currentfield < 4)
-  {
-    IPADDRESS_CheckField(lpipsi, currentfield); /* check the fields value */  
-
-    if(currentfield < 3)
-    { 
-      SetFocus (lpipsi->hwndIP[currentfield+1]);
-      return TRUE; 
-    }
-  }
-  return FALSE;
-}
-
-
-/* period: move and select the text in the next field to the right if */
-/*         the current field is not empty(l!=0), we are not in the */
-/*         left most position, and nothing is selected(startsel==endsel) */
-
-/* spacebar: same behavior as period */
-
-/* alpha characters: completely ignored */
-
-/* digits: accepted when field text length < 2 ignored otherwise. */
-/*         when 3 numbers have been entered into the field the value */
-/*         of the field is checked, if the field value exceeds the */
-/*         maximum value and is changed the field remains the current */
-/*         field, otherwise focus moves to the field to the right */
-
-/* tab: change focus from the current ipaddress control to the next */
-/*      control in the tab order */
-
-/* right arrow: move to the field on the right to the left most */
-/*              position in that field if no text is selected, */
-/*              we are in the right most position in the field, */
-/*              we are not in the right most field */
-
-/* left arrow: move to the field on the left to the right most */
-/*             position in that field if no text is selected, */
-/*             we are in the left most position in the current field */
-/*             and we are not in the left most field */
-
-/* backspace: delete the character to the left of the cursor position, */
-/*            if none are present move to the field on the left if */
-/*            we are not in the left most field and delete the right */
-/*            most digit in that field while keeping the cursor */
-/*            on the right side of the field */
-
-
+        if(cur < 3) {
+            IPPART_INFO *next = &infoPtr->Part[cur + 1];
+            int start = 0, end = 0;
+            SetFocus (next->EditHwnd);
+            if (sel != POS_DEFAULT) {
+                if (sel == POS_RIGHT)
+                    start = end = GetWindowTextLengthW(next->EditHwnd);
+                else if (sel == POS_SELALL)
+                    end = -1;
+                SendMessageW(next->EditHwnd, EM_SETSEL, start, end);
+            }
+            return TRUE;
+        }
+                 
+    }
+    return FALSE;
+}
+
+
+/*
+ * period: move and select the text in the next field to the right if
+ *         the current field is not empty(l!=0), we are not in the
+ *         left most position, and nothing is selected(startsel==endsel)
+ *
+ * spacebar: same behavior as period
+ *
+ * alpha characters: completely ignored
+ *
+ * digits: accepted when field text length < 2 ignored otherwise. 
+ *         when 3 numbers have been entered into the field the value 
+ *         of the field is checked, if the field value exceeds the 
+ *         maximum value and is changed the field remains the current 
+ *         field, otherwise focus moves to the field to the right 
+ *
+ * tab: change focus from the current ipaddress control to the next 
+ *      control in the tab order 
+ *
+ * right arrow: move to the field on the right to the left most 
+ *              position in that field if no text is selected, 
+ *              we are in the right most position in the field, 
+ *              we are not in the right most field 
+ *
+ * left arrow: move to the field on the left to the right most 
+ *             position in that field if no text is selected, 
+ *             we are in the left most position in the current field 
+ *             and we are not in the left most field 
+ *
+ * backspace: delete the character to the left of the cursor position, 
+ *            if none are present move to the field on the left if 
+ *            we are not in the left most field and delete the right 
+ *            most digit in that field while keeping the cursor 
+ *            on the right side of the field 
+ */
 LRESULT CALLBACK
 IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  IPADDRESS_INFO *infoPtr;
-  LPIP_SUBCLASS_INFO lpipsi = (LPIP_SUBCLASS_INFO) GetPropA
-        ((HWND)hwnd,IP_SUBCLASS_PROP); 
-  CHAR c = (CHAR)wParam;
-  INT i, l, index, startsel, endsel;
-
-  infoPtr = lpipsi->infoPtr;
-  index=0;             /* FIXME */
-  for (i=0; i<=3; i++) 
-    if (lpipsi->hwndIP[i]==hwnd) index=i;
-
-  switch (uMsg) {
-  case WM_CHAR: 
-    if(isdigit(c)) /* process all digits */
-    {
-      int return_val;
-      SendMessageA(lpipsi->hwndIP[index], EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel); 
-      l = GetWindowTextLengthA (lpipsi->hwndIP[index]);
-      if(l==2 && startsel==endsel) /* field is full after this key is processed */
-      { 
-        /* process the digit press before we check the field */
-        return_val = CallWindowProcA (lpipsi->wpOrigProc[index], hwnd, uMsg, wParam, lParam);
+    HWND Self = (HWND)GetPropA (hwnd, IP_SUBCLASS_PROP);
+    IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (Self);
+    CHAR c = (CHAR)wParam;
+    INT index, len = 0, startsel, endsel;
+    IPPART_INFO *part;
+
+    TRACE("(hwnd=0x%x msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+
+    if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0;
+    part = &infoPtr->Part[index];
+
+    if (uMsg == WM_CHAR || uMsg == WM_KEYDOWN) {
+        len = GetWindowTextLengthW (hwnd);
+        SendMessageW(hwnd, EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel);
+    }   
+    switch (uMsg) {
+        case WM_CHAR: 
+            if(isdigit(c)) {
+                if(len == 2 && startsel==endsel && endsel==len) {
+                    /* process the digit press before we check the field */
+                    int return_val = CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam);
           
-        /* if the field value was changed stay at the current field */
-        if(!IPADDRESS_CheckField(lpipsi, index))
-          IPADDRESS_GotoNextField (lpipsi,index);
-
-        return return_val;
-      }
-      
-      if(l > 2) /* field is full, stop key messages */
-      {
-        lParam = 0;
-        wParam = 0;
-      }
-      break;
-    }   
-    
-    if(c == '.') /* VK_PERIOD */
-    { 
-      l = GetWindowTextLengthA(lpipsi->hwndIP[index]);
-      SendMessageA(lpipsi->hwndIP[index], EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel);
-      if(l != 0 && startsel==endsel && startsel != 0)
-      {
-        IPADDRESS_GotoNextField(lpipsi, index); 
-        SendMessageA(lpipsi->hwndIP[index+1], EM_SETSEL, (WPARAM)0, (LPARAM)3);
-      }
-    }
+                    /* if the field value was changed stay at the current field */
+                    if(!IPADDRESS_ConstrainField(infoPtr, index))
+                        IPADDRESS_GotoNextField (infoPtr, index, POS_DEFAULT);
+
+                    return return_val;
+                } else if (len == 3 && startsel==endsel && endsel==len)
+                    IPADDRESS_GotoNextField (infoPtr, index, POS_SELALL);
+                else if (len < 3) break; 
+            } else if(c == '.' || c == ' ') {
+                if(len && startsel==endsel && startsel != 0) {
+                    IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL); 
+                }
+            } else if (c == VK_BACK) break;
+            return 0;
         
-    /* stop all other characters */
-    wParam = 0;
-    lParam = 0;
-    break;
-
-  case WM_KEYDOWN:
-    if(c == VK_SPACE)
-    { 
-      l = GetWindowTextLengthA(lpipsi->hwndIP[index]);
-      SendMessageA(lpipsi->hwndIP[index], EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel);
-      if(l != 0 && startsel==endsel && startsel != 0)
-      {
-        IPADDRESS_GotoNextField(lpipsi, index); 
-        SendMessageA(lpipsi->hwndIP[index+1], EM_SETSEL, (WPARAM)0, (LPARAM)3);
-      }
-    }
-
-    if(c == VK_RIGHT)
-    {
-      SendMessageA(lpipsi->hwndIP[index], EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel);
-      l = GetWindowTextLengthA (lpipsi->hwndIP[index]);
-    
-      if(startsel==endsel && startsel==l)
-      {
-        IPADDRESS_GotoNextField(lpipsi, index);
-        SendMessageA(lpipsi->hwndIP[index+1], EM_SETSEL, (WPARAM)0,(LPARAM)0);
-      }
-    }
-
-    if(c == VK_LEFT)
-    { 
-      SendMessageA(lpipsi->hwndIP[index], EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel);
-      if(startsel==0 && startsel==endsel && index > 0)
-      {        
-        IPADDRESS_GotoNextField(lpipsi, index - 2);
-        l = GetWindowTextLengthA(lpipsi->hwndIP[index-1]);
-        SendMessageA(lpipsi->hwndIP[index-1], EM_SETSEL, (WPARAM)l,(LPARAM)l);
-      }     
-    }
-   
-    if(c == VK_BACK) /* VK_BACKSPACE */
-    {
-      CHAR buf[4];
-
-      SendMessageA(lpipsi->hwndIP[index], EM_GETSEL, (WPARAM)&startsel, (LPARAM)&endsel); 
-      l = GetWindowTextLengthA (lpipsi->hwndIP[index]);
-      if(startsel==endsel && startsel==0 && index > 0)
-      {
-        l = GetWindowTextLengthA(lpipsi->hwndIP[index-1]);
-        if(l!=0)
-        {
-          GetWindowTextA (lpipsi->hwndIP[index-1],buf,4);
-          buf[l-1] = '\0'; 
-          SetWindowTextA(lpipsi->hwndIP[index-1], buf);
-          SendMessageA(lpipsi->hwndIP[index-1], EM_SETSEL, (WPARAM)l,(LPARAM)l);
-        } 
-        IPADDRESS_GotoNextField(lpipsi, index - 2);
-      }
-    }
-    break;
-
-  default:
-    break;
-  }
-  return CallWindowProcA (lpipsi->wpOrigProc[index], hwnd, uMsg, wParam, lParam);
+        case WM_KEYDOWN:
+            switch(c) {
+                case VK_RIGHT:
+                    if(startsel==endsel && startsel==len) {
+                        IPADDRESS_GotoNextField(infoPtr, index, POS_LEFT);
+                        return 0;
+                    }
+                    break;
+                case VK_LEFT:
+                    if(startsel==0 && startsel==endsel && index > 0) {
+                        IPADDRESS_GotoNextField(infoPtr, index - 2, POS_RIGHT);
+                        return 0;
+                    }
+                    break;
+                case VK_BACK:
+                    if(startsel==endsel && startsel==0 && index > 0) {
+                        IPPART_INFO *prev = &infoPtr->Part[index-1];
+                        WCHAR val[10];
+                        
+                        if(GetWindowTextW(prev->EditHwnd, val, 5)) {
+                            val[lstrlenW(val) - 1] = 0;
+                            SetWindowTextW(prev->EditHwnd, val);
+                        }
+                                
+                        IPADDRESS_GotoNextField(infoPtr, index - 2, POS_RIGHT);
+                        return 0;
+                    }
+                    break;
+            }               
+            break;
+        case WM_KILLFOCUS:
+            if (IPADDRESS_GetPartIndex(infoPtr, (HWND)wParam) < 0)
+                IPADDRESS_Notify(infoPtr, EN_KILLFOCUS);
+            break;
+        case WM_SETFOCUS:
+            if (IPADDRESS_GetPartIndex(infoPtr, (HWND)wParam) < 0)
+                IPADDRESS_Notify(infoPtr, EN_SETFOCUS);
+            break;
+    }
+    return CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam);
 }
 
@@ -614 +487 @@
 IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
-  if (!IPADDRESS_GetInfoPtr (hwnd) && (uMsg != WM_CREATE))
-      return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-  switch (uMsg)
-  {
-    case IPM_CLEARADDRESS:
-      return IPADDRESS_ClearAddress (hwnd, wParam, lParam);
-
-    case IPM_SETADDRESS:
-      return IPADDRESS_SetAddress (hwnd, wParam, lParam);
-
-    case IPM_GETADDRESS:
-      return IPADDRESS_GetAddress (hwnd, wParam, lParam);
-
-    case IPM_SETRANGE:
-      return IPADDRESS_SetRange (hwnd, wParam, lParam);
-
-    case IPM_SETFOCUS:
-      return IPADDRESS_SetFocusToField (hwnd, wParam, lParam);
-
-    case IPM_ISBLANK:
-      return IPADDRESS_IsBlank (hwnd, wParam, lParam);
-
-    case WM_CREATE:
-      return IPADDRESS_Create (hwnd, wParam, lParam);
-
-    case WM_DESTROY:
-      return IPADDRESS_Destroy (hwnd, wParam, lParam);
-
-    case WM_GETDLGCODE:
-      return DLGC_WANTARROWS | DLGC_WANTCHARS;
-
-    case WM_KILLFOCUS:
-      return IPADDRESS_KillFocus (hwnd, wParam, lParam);
-
-    case WM_LBUTTONDOWN:
-      return IPADDRESS_LButtonDown (hwnd, wParam, lParam);
-
-    case WM_PAINT:
-      return IPADDRESS_Paint (hwnd, wParam);
-
-    case WM_SETFOCUS:
-      return IPADDRESS_SetFocus (hwnd, wParam, lParam);
-
-    case WM_SIZE:
-      return IPADDRESS_Size (hwnd, wParam, lParam);
-
-    default:
-      if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-                     uMsg, wParam, lParam);
-      return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+    IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
+  
+    TRACE("(hwnd=0x%x msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+  
+    if (!infoPtr && (uMsg != WM_CREATE))
+        return DefWindowProcW (hwnd, uMsg, wParam, lParam);
+  
+    switch (uMsg)
+    {
+        case WM_CREATE:
+            return IPADDRESS_Create (hwnd);
+
+        case WM_DESTROY:
+            return IPADDRESS_Destroy (infoPtr);
+
+        case WM_PAINT:
+            return IPADDRESS_Paint (infoPtr, (HDC)wParam);
+
+        case WM_COMMAND:
+            switch(wParam >> 16) {
+                case EN_CHANGE:
+                    IPADDRESS_Notify(infoPtr, EN_CHANGE);
+                    break;
+                case EN_KILLFOCUS:
+                    IPADDRESS_ConstrainField(infoPtr, IPADDRESS_GetPartIndex(infoPtr, (HWND)lParam));
+                    break;
+            }
+            break;
+
+        case IPM_CLEARADDRESS:
+            IPADDRESS_ClearAddress (infoPtr);
+            break;
+
+        case IPM_SETADDRESS:
+            return IPADDRESS_SetAddress (infoPtr, (DWORD)lParam);
+
+        case IPM_GETADDRESS:
+            return IPADDRESS_GetAddress (infoPtr, (LPDWORD)lParam);
+
+        case IPM_SETRANGE:
+            return IPADDRESS_SetRange (infoPtr, (int)wParam, (WORD)lParam);
+
+        case IPM_SETFOCUS:
+            IPADDRESS_SetFocusToField (infoPtr, (int)wParam);
+            break;
+
+        case IPM_ISBLANK:
+            return IPADDRESS_IsBlank (infoPtr);
+
+        default:
+            if (uMsg >= WM_USER)
+                ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+            return DefWindowProcW (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -673 +547 @@
 void IPADDRESS_Register (void)
 {
-  WNDCLASSA wndClass;
-
-  ZeroMemory (&wndClass, sizeof(WNDCLASSA));
-  wndClass.style         = CS_GLOBALCLASS;
-  wndClass.lpfnWndProc   = (WNDPROC)IPADDRESS_WindowProc;
-  wndClass.cbClsExtra    = 0;
-  wndClass.cbWndExtra    = sizeof(IPADDRESS_INFO *);
-  wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
-  wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
-  wndClass.lpszClassName = WC_IPADDRESSA;
+    WNDCLASSW wndClass;
+
+    ZeroMemory (&wndClass, sizeof(WNDCLASSW));
+    wndClass.style         = CS_GLOBALCLASS;
+    wndClass.lpfnWndProc   = (WNDPROC)IPADDRESS_WindowProc;
+    wndClass.cbClsExtra    = 0;
+    wndClass.cbWndExtra    = sizeof(IPADDRESS_INFO *);
+    wndClass.hCursor       = LoadCursorW (0, IDC_IBEAMW);
+    wndClass.hbrBackground = GetStockObject(WHITE_BRUSH);
+    wndClass.lpszClassName = WC_IPADDRESSW;
  
-  RegisterClassA (&wndClass);
-}
-
-
-VOID IPADDRESS_Unregister (void)
-{
-  UnregisterClassA (WC_IPADDRESSA, (HINSTANCE)NULL);
-}
+    RegisterClassW (&wndClass);
+}
+
+
+void IPADDRESS_Unregister (void)
+{
+    UnregisterClassW (WC_IPADDRESSW, (HINSTANCE)NULL);
+}

trunk/src/comctl32/listview.c

@@ -5 +5 @@
  * Copyright 1999 Luc Tourangeau
  * Copyright 2000 Jason Mawdsley
+ * Copyright 2001 Codeweavers Inc.
+ * Copyright 2002 Dimitrie O. Paun
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
- * Listview control implementation.
+ * Listview control implementation. 
  *
  * TODO:
@@ -19 +35 @@
  * Data structure:
  *   LISTVIEW_SetItemCount : not completed for non OWNERDATA
- *
- * Unicode:
- *   LISTVIEW_SetItemW : no unicode support
- *   LISTVIEW_InsertItemW : no unicode support
- *   LISTVIEW_InsertColumnW : no unicode support
- *   LISTVIEW_GetColumnW : no unicode support
- *   LISTVIEW_SetColumnW : no unicode support
- *
+ * 
  * Advanced functionality:
  *   LISTVIEW_GetNumberOfWorkAreas : not implemented
  *   LISTVIEW_GetHotCursor : not implemented
- *   LISTVIEW_GetISearchString : not implemented
+ *   LISTVIEW_GetISearchString : not implemented 
  *   LISTVIEW_GetBkImage : not implemented
  *   LISTVIEW_SetBkImage : not implemented
@@ -37 +46 @@
  *   LISTVIEW_Arrange : empty stub
  *   LISTVIEW_ApproximateViewRect : incomplete
- *   LISTVIEW_Scroll : not implemented
+ *   LISTVIEW_Scroll : not implemented 
  *   LISTVIEW_Update : not completed
+ *
+ * Known differences in message stream from native control (not known if
+ * these differences cause problems):
+ *   LVM_INSERTITEM issues LVM_SETITEMSTATE and LVM_SETITEM in certain cases.
+ *   LVM_SETITEM does not always issue LVN_ITEMCHANGING/LVN_ITEMCHANGED.
+ *   WM_PAINT does LVN_GETDISPINFO in item order 0->n, native does n->0.
+ *   WM_SETREDRAW(True) native does LVN_GETDISPINFO for all items and
+ *     does *not* invoke DefWindowProc
+ *   WM_CREATE does not issue WM_QUERYUISTATE and associated registry
+ *     processing for "USEDOUBLECLICKTIME".
  */
 
@@ -44 +63 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "winbase.h"
+#include "winnt.h"
 #include "heap.h"
 #include "commctrl.h"
-#include "debugtools.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(listview);
 
 #ifdef __WIN32OS2__
@@ -55 +78 @@
 #include "header.h"
 
-#undef ListView_SetItemState
-#define ListView_SetItemState ListView_SetItemStateWine
-
 typedef struct
 {
@@ -69 +89 @@
 #endif
 
-DEFAULT_DEBUG_CHANNEL(listview);
-
-/* Some definitions for inline edit control */
-typedef BOOL (*EditlblCallback)(HWND, LPSTR, DWORD);
+/* Some definitions for inline edit control */    
+typedef BOOL (*EditlblCallbackW)(HWND, LPWSTR, DWORD);
+typedef BOOL (*EditlblCallbackA)(HWND, LPWSTR, DWORD);
+
+typedef struct tagLV_INTHIT
+{
+  LVHITTESTINFO  ht;
+  DWORD          distance;     /* distance to closest item    */
+  INT            iDistItem;    /* item number that is closest */
+} LV_INTHIT, *LPLV_INTHIT;
+        
 
 typedef struct tagEDITLABEL_ITEM
 {
-    WNDPROC EditWndProc;
-    DWORD param;
-    EditlblCallback EditLblCb;
+  WNDPROC EditWndProc;
+  DWORD param;
+  EditlblCallbackW EditLblCb;
 } EDITLABEL_ITEM;
 
 typedef struct tagLISTVIEW_SUBITEM
 {
-    LPSTR pszText;
-    INT iImage;
-    INT iSubItem;
-
+  LPWSTR pszText;
+  INT iImage;
+  INT iSubItem;
 } LISTVIEW_SUBITEM;
 
@@ -92 +118 @@
 {
   UINT state;
-  LPSTR pszText;
+  LPWSTR pszText;
   INT iImage;
   LPARAM lParam;
@@ -123 +149 @@
     DWORD             internalFlags;
 #endif
-    COLORREF clrBk;
-    COLORREF clrText;
-    COLORREF clrTextBk;
-    HIMAGELIST himlNormal;
-    HIMAGELIST himlSmall;
-    HIMAGELIST himlState;
-    BOOL bLButtonDown;
-    BOOL bRButtonDown;
-    INT nFocusedItem;
-    HDPA hdpaSelectionRanges;
-    INT nItemHeight;
-    INT nItemWidth;
-    INT nSelectionMark;
-    INT nHotItem;
-    SHORT notifyFormat;
-    RECT rcList;
-    RECT rcView;
-    SIZE iconSize;
-    SIZE iconSpacing;
-    UINT uCallbackMask;
-    HWND hwndHeader;
-    HFONT hDefaultFont;
-    HFONT hFont;
-    BOOL bFocus;
-    DWORD dwExStyle;    /* extended listview style */
-    HDPA hdpaItems;
-    PFNLVCOMPARE pfnCompare;
-    LPARAM lParamSort;
-    HWND hwndEdit;
-    INT nEditLabelItem;
-    EDITLABEL_ITEM *pedititem;
-    DWORD dwHoverTime;
-    INT nColumnCount; /* the number of columns in this control */
-
-    DWORD lastKeyPressTimestamp; /* Added */
-    WPARAM charCode; /* Added */
-    INT nSearchParamLength; /* Added */
-    CHAR szSearchParam[ MAX_PATH ]; /* Added */
+  HWND hwndSelf;
+  COLORREF clrBk;
+  COLORREF clrText;
+  COLORREF clrTextBk;
+  HIMAGELIST himlNormal;
+  HIMAGELIST himlSmall;
+  HIMAGELIST himlState;
+  BOOL bLButtonDown;
+  BOOL bRButtonDown;
+  INT nFocusedItem;
+  HDPA hdpaSelectionRanges;
+  INT nItemHeight;
+  INT nItemWidth;
+  INT nSelectionMark;
+  INT nHotItem;
+  SHORT notifyFormat;
+  RECT rcList;
+  RECT rcView;
+  SIZE iconSize;
+  SIZE iconSpacing;
+  UINT uCallbackMask;
+  HWND hwndHeader;
+  HFONT hDefaultFont;
+  HFONT hFont;
+  INT ntmHeight;               /*  from GetTextMetrics from above font */
+  INT ntmAveCharWidth;         /*  from GetTextMetrics from above font */
+  BOOL bFocus;
+  DWORD dwExStyle;             /* extended listview style */
+  HDPA hdpaItems;
+  PFNLVCOMPARE pfnCompare;
+  LPARAM lParamSort;
+  HWND hwndEdit;
+  INT nEditLabelItem;
+  EDITLABEL_ITEM *pedititem;
+  DWORD dwHoverTime;
+  INT nColumnCount;            /* the number of columns in this control */
+
+  DWORD lastKeyPressTimestamp; /* Added */
+  WPARAM charCode;             /* Added */
+  INT nSearchParamLength;      /* Added */
+  WCHAR szSearchParam[ MAX_PATH ]; /* Added */
 } LISTVIEW_INFO;
 
 /*
- * constants
+ * constants 
  */
 
@@ -179 +208 @@
 #define REPORT_MARGINX 2
 
-/* padding for icon in large icon display mode */
-#define ICON_TOP_PADDING 2
-#define ICON_BOTTOM_PADDING 2
-
-/* padding for label in large icon display mode */
-#define LABEL_VERT_OFFSET 2
+/* padding for icon in large icon display mode
+ *   ICON_TOP_PADDING_NOTHITABLE - space between top of box and area
+ *                                 that HITTEST will see.
+ *   ICON_TOP_PADDING_HITABLE - spacing between above and icon.
+ *   ICON_TOP_PADDING - sum of the two above.
+ *   ICON_BOTTOM_PADDING - between bottom of icon and top of text
+ *   LABEL_VERT_OFFSET - between bottom of text and end of box
+ */
+#define ICON_TOP_PADDING_NOTHITABLE  2
+#define ICON_TOP_PADDING_HITABLE     2
+#define ICON_TOP_PADDING ICON_TOP_PADDING_NOTHITABLE + ICON_TOP_PADDING_HITABLE
+#define ICON_BOTTOM_PADDING 4
+#define LABEL_VERT_OFFSET 10
 
 /* default label width for items in list and small icon display modes */
@@ -190 +226 @@
 
 /* default column width for items in list display mode */
-#define DEFAULT_COLUMN_WIDTH 96
+#define DEFAULT_COLUMN_WIDTH 96 
 
 /* Increment size of the horizontal scroll bar */
@@ -203 +239 @@
 /* Border for the icon caption */
 #define CAPTION_BORDER  2
-/*
+/* 
  * macros
  */
-#define ListView_LVNotify(hwnd,lCtrlId,plvnm) \
-    (BOOL)SendMessageA((hwnd),WM_NOTIFY,(WPARAM)(INT)lCtrlId,(LPARAM)(LPNMLISTVIEW)(plvnm))
-#define ListView_Notify(hwnd,lCtrlId,pnmh) \
-    (BOOL)SendMessageA((hwnd),WM_NOTIFY,(WPARAM)(INT)lCtrlId,(LPARAM)(LPNMHDR)(pnmh))
 /* retrieve the number of items in the listview */
 #define GETITEMCOUNT(infoPtr) ((infoPtr)->hdpaItems->nItemCount)
-
-HWND CreateEditLabel(LPCSTR text, DWORD style, INT x, INT y,
-    INT width, INT height, HWND parent, HINSTANCE hinst,
-    EditlblCallback EditLblCb, DWORD param);
-
-/*
- * forward declarations
- */
-static LRESULT LISTVIEW_GetItemA(HWND hwnd, LPLVITEMA lpLVItem, BOOL internal);
+#define HDM_INSERTITEMT(isW) ( (isW) ? HDM_INSERTITEMW : HDM_INSERTITEMA )
+
+HWND CreateEditLabelT(LPCWSTR text, DWORD style, INT x, INT y, 
+        INT width, INT height, HWND parent, HINSTANCE hinst, 
+        EditlblCallbackW EditLblCb, DWORD param, BOOL isW);
+ 
+/* 
+ * forward declarations 
+ */
+static LRESULT LISTVIEW_GetItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL internal, BOOL isW);
+static INT LISTVIEW_SuperHitTestItem(HWND, LPLV_INTHIT, BOOL);
 static INT LISTVIEW_HitTestItem(HWND, LPLVHITTESTINFO, BOOL);
 static INT LISTVIEW_GetCountPerRow(HWND);
@@ -228 +262 @@
 static VOID LISTVIEW_AddGroupSelection(HWND, INT);
 static VOID LISTVIEW_AddSelection(HWND, INT);
-static BOOL LISTVIEW_AddSubItem(HWND, LPLVITEMA);
+static BOOL LISTVIEW_AddSubItemT(HWND, LPLVITEMW, BOOL);
 static INT LISTVIEW_FindInsertPosition(HDPA, INT);
 static INT LISTVIEW_GetItemHeight(HWND);
+static BOOL LISTVIEW_GetItemBoundBox(HWND, INT, LPRECT);
 static BOOL LISTVIEW_GetItemPosition(HWND, INT, LPPOINT);
 static LRESULT LISTVIEW_GetItemRect(HWND, INT, LPRECT);
@@ -239 +274 @@
 static LISTVIEW_SUBITEM* LISTVIEW_GetSubItem(HDPA, INT);
 static LRESULT LISTVIEW_GetViewRect(HWND, LPRECT);
-static BOOL LISTVIEW_InitItem(HWND, LISTVIEW_ITEM *, LPLVITEMA);
-static BOOL LISTVIEW_InitSubItem(HWND, LISTVIEW_SUBITEM *, LPLVITEMA);
+static BOOL LISTVIEW_InitItemT(HWND, LISTVIEW_ITEM *, LPLVITEMW, BOOL);
+static BOOL LISTVIEW_InitSubItemT(HWND, LISTVIEW_SUBITEM *, LPLVITEMW, BOOL);
 static LRESULT LISTVIEW_MouseSelection(HWND, POINT);
 static BOOL LISTVIEW_RemoveColumn(HDPA, INT);
 static BOOL LISTVIEW_RemoveSubItem(HDPA, INT);
 static VOID LISTVIEW_SetGroupSelection(HWND, INT);
-static BOOL LISTVIEW_SetItem(HWND, LPLVITEMA);
+static BOOL LISTVIEW_SetItemT(HWND, LPLVITEMW, BOOL);
 static BOOL LISTVIEW_SetItemFocus(HWND, INT);
 static BOOL LISTVIEW_SetItemPosition(HWND, INT, LONG, LONG);
 static VOID LISTVIEW_UpdateScroll(HWND);
 static VOID LISTVIEW_SetSelection(HWND, INT);
-static VOID LISTVIEW_UpdateSize(HWND);
-static BOOL LISTVIEW_SetSubItem(HWND, LPLVITEMA);
+static BOOL LISTVIEW_UpdateSize(HWND);
+static BOOL LISTVIEW_SetSubItemT(HWND, LPLVITEMW, BOOL);
 static LRESULT LISTVIEW_SetViewRect(HWND, LPRECT);
 static BOOL LISTVIEW_ToggleSelection(HWND, INT);
 static VOID LISTVIEW_UnsupportedStyles(LONG lStyle);
-static HWND LISTVIEW_EditLabelA(HWND hwnd, INT nItem);
-static BOOL LISTVIEW_EndEditLabel(HWND hwnd, LPSTR pszText, DWORD nItem);
+static HWND LISTVIEW_EditLabelT(HWND hwnd, INT nItem, BOOL isW);
+static BOOL LISTVIEW_EndEditLabelW(HWND hwnd, LPWSTR pszText, DWORD nItem);
+static BOOL LISTVIEW_EndEditLabelA(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);
-#ifdef __WIN32OS2__
-static LRESULT LISTVIEW_GetStringWidth(HWND hwnd,HDC hdc,LPWSTR lpszText,BOOL unicode);
-#define LISTVIEW_GetStringWidthA(a,b) LISTVIEW_GetStringWidth(a,0,(LPWSTR)b,FALSE)
-#else
-static LRESULT LISTVIEW_GetStringWidthA(HWND hwnd, LPCSTR lpszText);
-#endif
+static LRESULT LISTVIEW_SortItems(HWND hwnd, PFNLVCOMPARE pfnCompare, LPARAM lParamSort);
+static LRESULT LISTVIEW_GetStringWidthT(HWND hwnd, LPCWSTR lpszText, BOOL isW);
 static INT LISTVIEW_ProcessLetterKeys( HWND hwnd, WPARAM charCode, LPARAM keyData );
 static BOOL LISTVIEW_KeySelection(HWND hwnd, INT nItem);
 static LRESULT LISTVIEW_GetItemState(HWND hwnd, INT nItem, UINT uMask);
-static LRESULT LISTVIEW_SetItemState(HWND hwnd, INT nItem, LPLVITEMA lpLVItem);
+static LRESULT LISTVIEW_SetItemState(HWND hwnd, INT nItem, LPLVITEMW lpLVItem);
 static BOOL LISTVIEW_IsSelected(HWND hwnd, INT nItem);
 static VOID LISTVIEW_RemoveSelectionRange(HWND hwnd, INT lItem, INT uItem);
 static void LISTVIEW_FillBackground(HWND hwnd, HDC hdc, LPRECT rc);
+static void ListView_UpdateLargeItemLabelRect (HWND hwnd, const LISTVIEW_INFO* infoPtr, int nItem, RECT *rect);
+static LRESULT LISTVIEW_GetColumnT(HWND, INT, LPLVCOLUMNW, BOOL);
 
 /******** Defines that LISTVIEW_ProcessLetterKeys uses ****************/
 #define KEY_DELAY       450
 
+#define COUNTOF(array) (sizeof(array)/sizeof(array[0]))
+
+static inline BOOL is_textW(LPCWSTR text)
+{
+  return text != NULL && text != LPSTR_TEXTCALLBACKW;
+}
+
+static inline BOOL is_textT(LPCWSTR text, BOOL isW)
+{
+  /* we can ignore isW since LPSTR_TEXTCALLBACKW == LPSTR_TEXTCALLBACKA */
+  return is_textW(text);
+}
+
+static inline int textlenT(LPCWSTR text, BOOL isW)
+{
+  return !is_textT(text, isW) ? 0 :
+         isW ? lstrlenW(text) : lstrlenA((LPCSTR)text);
+}
+
+static inline void textcpynT(LPWSTR dest, BOOL isDestW, LPCWSTR src, BOOL isSrcW, INT max)
+{
+  if (isDestW)
+    if (isSrcW) lstrcpynW(dest, src, max);
+    else MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, dest, max);
+  else
+    if (isSrcW) WideCharToMultiByte(CP_ACP, 0, src, -1, (LPSTR)dest, max, NULL, NULL);
+    else lstrcpynA((LPSTR)dest, (LPCSTR)src, max);
+}
+
+static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW)
+{
+  return NULL;
+}
+
+static inline LPCSTR debugstr_tn(LPCWSTR text, BOOL isW, INT n)
+{
+  return NULL;
+}
+
+static inline LPWSTR textdupTtoW(LPCWSTR text, BOOL isW)
+{
+  LPWSTR wstr = (LPWSTR)text;
+  
+  TRACE("(text=%s, isW=%d)\n", debugstr_t(text, isW), isW);  
+  if (!isW && text)
+  {
+    INT len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)text, -1, NULL, 0);
+    wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+    if (wstr) MultiByteToWideChar(CP_ACP, 0, (LPCSTR)text, -1, wstr, len);
+  }
+  TRACE("   wstr=%s\n", debugstr_w(wstr));
+  return wstr;
+}
+
+static inline void textfreeT(LPWSTR wstr, BOOL isW)
+{
+  if (!isW && wstr) HeapFree(GetProcessHeap(), 0, wstr);
+}
+
+/*
+ * dest is a pointer to a Unicode string
+ * src is a pointer to a string (Unicode if isW, ANSI if !isW)
+ */
+static inline BOOL textsetptrT(LPWSTR *dest, LPWSTR src, BOOL isW)
+{
+    LPWSTR pszText = textdupTtoW(src, isW);
+    BOOL bResult = TRUE;
+    if (*dest == LPSTR_TEXTCALLBACKW) *dest = NULL;
+    bResult = Str_SetPtrW(dest, pszText);
+    textfreeT(pszText, isW);
+    return bResult;
+}
+
+static inline LRESULT CallWindowProcT(WNDPROC proc, HWND hwnd, UINT uMsg, 
+                                      WPARAM wParam, LPARAM lParam, BOOL isW)
+{
+  if (isW)
+    return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam);
+  else
+    return CallWindowProcA(proc, hwnd, uMsg, wParam, lParam);
+}
+
+static inline BOOL notify(HWND self, INT code, LPNMHDR pnmh)
+{
+  pnmh->hwndFrom = self;
+  pnmh->idFrom = GetWindowLongW(self, GWL_ID);
+  pnmh->code = code;
+  return (BOOL)SendMessageW(GetParent(self), WM_NOTIFY, 
+                            (WPARAM)pnmh->idFrom, (LPARAM)pnmh);
+}
+
+static inline BOOL hdr_notify(HWND self, INT code)
+{
+  NMHDR nmh;
+  return notify(self, code, &nmh);
+}
+
+static inline BOOL listview_notify(HWND self, INT code, LPNMLISTVIEW plvnm)
+{
+  return notify(self, code, (LPNMHDR)plvnm);
+}
+
+static int tabNotification[] = {
+  LVN_BEGINLABELEDITW, LVN_BEGINLABELEDITA, 
+  LVN_ENDLABELEDITW, LVN_ENDLABELEDITA,
+  LVN_GETDISPINFOW, LVN_GETDISPINFOA,
+  LVN_SETDISPINFOW, LVN_SETDISPINFOA,
+  LVN_ODFINDITEMW, LVN_ODFINDITEMA,
+  LVN_GETINFOTIPW, LVN_GETINFOTIPA,
+  0
+};
+
+static int get_ansi_notification(INT unicodeNotificationCode)
+{
+  int *pTabNotif = tabNotification;
+  while (*pTabNotif && (unicodeNotificationCode != *pTabNotif++));
+  if (*pTabNotif) return *pTabNotif;
+  ERR("unknown notification %x\n", unicodeNotificationCode);
+  return unicodeNotificationCode;
+}
+
+/*
+  Send notification. depends on dispinfoW having same 
+  structure as dispinfoA.
+  self : listview handle
+  notificationCode : *Unicode* notification code
+  pdi : dispinfo structure (can be unicode or ansi)
+  isW : TRUE if dispinfo is Unicode
+*/
+static BOOL dispinfo_notifyT(HWND self, INT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(self, 0);
+  BOOL bResult = FALSE;
+  BOOL convertToAnsi = FALSE, convertToUnicode = FALSE;
+  INT realNotifCode;
+  INT cchTempBufMax = 0, savCchTextMax = 0;
+  LPWSTR pszTempBuf = NULL, savPszText = NULL;
+
+  TRACE("(self=%x, code=%x, pdi=%p, isW=%d)\n", self, notificationCode, pdi, isW);
+  TRACE("   notifyFormat=%s\n",
+        infoPtr->notifyFormat == NFR_UNICODE ? "NFR_UNICODE" :
+        infoPtr->notifyFormat == NFR_ANSI ? "NFR_ANSI" : "(not set)");
+  if (infoPtr->notifyFormat == NFR_ANSI)
+    realNotifCode = get_ansi_notification(notificationCode);
+  else
+    realNotifCode = notificationCode;
+
+  if (is_textT(pdi->item.pszText, isW))
+  {
+    if (isW && infoPtr->notifyFormat == NFR_ANSI)
+        convertToAnsi = TRUE;
+    if (!isW && infoPtr->notifyFormat == NFR_UNICODE)
+        convertToUnicode = TRUE;
+  }
+  
+  if (convertToAnsi || convertToUnicode)
+  {
+    TRACE("   we have to convert the text to the correct format\n");
+    if (notificationCode != LVN_GETDISPINFOW)
+    { /* length of existing text */
+      cchTempBufMax = convertToUnicode ?
+      MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, NULL, 0):
+      WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL);
+    }
+    else
+      cchTempBufMax = pdi->item.cchTextMax;
+
+    pszTempBuf = HeapAlloc(GetProcessHeap(), 0, 
+        (convertToUnicode ? sizeof(WCHAR) : sizeof(CHAR)) * cchTempBufMax);
+    if (!pszTempBuf) return FALSE;
+    if (convertToUnicode)
+      MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, 
+                          pszTempBuf, cchTempBufMax);
+    else
+      WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) pszTempBuf,
+                          cchTempBufMax, NULL, NULL);
+    TRACE("   text=%s\n", debugstr_t(pszTempBuf, convertToUnicode));
+    savCchTextMax = pdi->item.cchTextMax;
+    savPszText = pdi->item.pszText;
+    pdi->item.pszText = pszTempBuf;
+    pdi->item.cchTextMax = cchTempBufMax;
+  } 
+  
+  bResult = notify(self, realNotifCode, (LPNMHDR)pdi);
+  
+  if (convertToUnicode || convertToAnsi)
+  { /* convert back result */
+    TRACE("   returned text=%s\n", debugstr_t(pdi->item.pszText, convertToUnicode));
+    if (convertToUnicode) /* note : pointer can be changed by app ! */
+      WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) savPszText,
+                          savCchTextMax, NULL, NULL);
+    else
+      MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1,
+                          savPszText, savCchTextMax);
+    pdi->item.pszText = savPszText; /* restores our buffer */
+    pdi->item.cchTextMax = savCchTextMax;
+    HeapFree(GetProcessHeap(), 0, pszTempBuf);
+  }
+  return bResult;
+}
+
+static inline LRESULT LISTVIEW_GetItemW(HWND hwnd, LPLVITEMW lpLVItem, BOOL internal)
+{
+  return LISTVIEW_GetItemT(hwnd, lpLVItem, internal, TRUE);
+}
+
+static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n)
+{
+  int res;
+
+  n = min(min(n, strlenW(s1)), strlenW(s2));
+  res = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n);
+  return res ? res - 2 : res;
+}
+
+static char* debuglvitem_t(LPLVITEMW lpLVItem, BOOL isW)
+{
+  static int index = 0;
+  static char buffers[20][256];
+  char* buf = buffers[index++ % 20];
+  if (lpLVItem == NULL) return "(null)";
+  return buf;
+}
+
+static char* debuglvcolumn_t(LPLVCOLUMNW lpColumn, BOOL isW)
+{
+  static int index = 0;
+  static char buffers[20][256];
+  char* buf = buffers[index++ % 20];
+  if (lpColumn == NULL) return "(null)";
+  return buf;
+}
+
+static void LISTVIEW_DumpListview(LISTVIEW_INFO *iP, INT line)
+{
+  DWORD dwStyle = GetWindowLongW (iP->hwndSelf, GWL_STYLE);
+  TRACE("listview %08x at line %d, clrBk=0x%06lx, clrText=0x%06lx, clrTextBk=0x%06lx, ItemHeight=%d, ItemWidth=%d, Style=0x%08lx\n",
+        iP->hwndSelf, line, iP->clrBk, iP->clrText, iP->clrTextBk,
+        iP->nItemHeight, iP->nItemWidth, dwStyle);
+  TRACE("listview %08x at line %d, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08lx\n",
+        iP->hwndSelf, line, iP->himlNormal, iP->himlSmall, iP->himlState,
+        iP->nFocusedItem, iP->nHotItem, iP->dwExStyle);
+}
 
 static BOOL
@@ -281 +557 @@
                                RECT rc)
 {
-  LISTVIEW_INFO *infoPtr;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   NMLVCUSTOMDRAW nmcdhdr;
   LPNMCUSTOMDRAW nmcd;
 
-  TRACE("drawstage:%lx hdc:%x\n", dwDrawStage, hdc);
-
-  infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  TRACE("(hwnd=%x, dwDrawStage=%lx, hdc=%x, rc=?)\n", hwnd, dwDrawStage, hdc);
 
   nmcd= & nmcdhdr.nmcd;
   nmcd->hdr.hwndFrom = hwnd;
-  nmcd->hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
+  nmcd->hdr.idFrom =  GetWindowLongW( hwnd, GWL_ID);
   nmcd->hdr.code   = NM_CUSTOMDRAW;
   nmcd->dwDrawStage= dwDrawStage;
@@ -305 +579 @@
   nmcdhdr.clrTextBk= infoPtr->clrBk;
 
-  return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-              (WPARAM) GetWindowLongA( hwnd, GWL_ID), (LPARAM)&nmcdhdr);
+  return (BOOL)SendMessageW (GetParent (hwnd), WM_NOTIFY,
+              (WPARAM) GetWindowLongW( hwnd, GWL_ID), (LPARAM)&nmcdhdr);
 }
 
 static BOOL
 LISTVIEW_SendCustomDrawItemNotify (HWND hwnd, HDC hdc,
-                                   UINT iItem, UINT iSubItem,
+                                   UINT iItem, UINT iSubItem, 
                                    UINT uItemDrawState)
 {
@@ -321 +595 @@
  INT retval;
  RECT itemRect;
- LVITEMA item;
-
- infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
- ZeroMemory(&item,sizeof(LVITEMA));
+ LVITEMW item;
+
+ infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+ ZeroMemory(&item,sizeof(item));
  item.iItem = iItem;
  item.mask = LVIF_PARAM;
- ListView_GetItemA(hwnd,&item);
+ ListView_GetItemW(hwnd,&item);
 
  dwDrawStage=CDDS_ITEM | uItemDrawState;
@@ -343 +617 @@
  nmcd= & nmcdhdr.nmcd;
  nmcd->hdr.hwndFrom = hwnd;
- nmcd->hdr.idFrom =  GetWindowLongA( hwnd, GWL_ID);
+ nmcd->hdr.idFrom =  GetWindowLongW( hwnd, GWL_ID);
  nmcd->hdr.code   = NM_CUSTOMDRAW;
  nmcd->dwDrawStage= dwDrawStage;
- nmcd->hdc                = hdc;
+ nmcd->hdc        = hdc;
  nmcd->rc.left    = itemRect.left;
  nmcd->rc.right   = itemRect.right;
@@ -358 +632 @@
  nmcdhdr.iSubItem   =iSubItem;
 
- TRACE("drawstage:%lx hdc:%x item:%lx, itemstate:%x, lItemlParam:%lx\n",
-                  nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
-          nmcd->uItemState, nmcd->lItemlParam);
-
- retval=SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                 (WPARAM) GetWindowLongA( hwnd, GWL_ID), (LPARAM)&nmcdhdr);
+ TRACE("drawstage=%lx hdc=%x item=%lx, itemstate=%x, lItemlParam=%lx\n",
+       nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
+       nmcd->uItemState, nmcd->lItemlParam);
+
+ retval=SendMessageW (GetParent (hwnd), WM_NOTIFY,
+                 (WPARAM) GetWindowLongW( hwnd, GWL_ID), (LPARAM)&nmcdhdr);
 
  infoPtr->clrText=nmcdhdr.clrText;
@@ -372 +646 @@
 
 /*************************************************************************
- *      LISTVIEW_ProcessLetterKeys
- *
- *  Processes keyboard messages generated by pressing the letter keys
+ *              LISTVIEW_ProcessLetterKeys
+ *
+ *  Processes keyboard messages generated by pressing the letter keys 
  *  on the keyboard.
- *  What this does is perform a case insensitive search from the
+ *  What this does is perform a case insensitive search from the 
  *  current position with the following quirks:
- *  - If two chars or more are pressed in quick succession we search
+ *  - If two chars or more are pressed in quick succession we search 
  *    for the corresponding string (e.g. 'abc').
- *  - If there is a delay we wipe away the current search string and
+ *  - If there is a delay we wipe away the current search string and 
  *    restart with just that char.
- *  - If the user keeps pressing the same character, whether slowly or
- *    fast, so that the search string is entirely composed of this
- *    character ('aaaaa' for instance), then we search for first item
+ *  - If the user keeps pressing the same character, whether slowly or 
+ *    fast, so that the search string is entirely composed of this 
+ *    character ('aaaaa' for instance), then we search for first item 
  *    that starting with that character.
- *  - If the user types the above character in quick succession, then
- *    we must also search for the corresponding string ('aaaaa'), and
+ *  - If the user types the above character in quick succession, then 
+ *    we must also search for the corresponding string ('aaaaa'), and 
  *    go to that string if there is a match.
  *
@@ -396 +670 @@
  * BUGS
  *
- *  - The current implementation has a list of characters it will
- *    accept and it ignores averything else. In particular it will
- *    ignore accentuated characters which seems to match what
- *    Windows does. But I'm not sure it makes sense to follow
+ *  - The current implementation has a list of characters it will 
+ *    accept and it ignores averything else. In particular it will 
+ *    ignore accentuated characters which seems to match what 
+ *    Windows does. But I'm not sure it makes sense to follow 
  *    Windows there.
  *  - We don't sound a beep when the search fails.
@@ -417 +691 @@
     INT nSize;
     INT endidx,idx;
-    LVITEMA item;
-    CHAR buffer[MAX_PATH];
+    LVITEMW item;
+    WCHAR buffer[MAX_PATH];
     DWORD timestamp,elapsed;
 
@@ -425 +699 @@
         return 0;
 
-    infoPtr=(LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+    infoPtr=(LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
     if (!infoPtr)
         return 0;
@@ -458 +732 @@
     infoPtr->lastKeyPressTimestamp=timestamp;
     if (elapsed < KEY_DELAY) {
-        if (infoPtr->nSearchParamLength < sizeof(infoPtr->szSearchParam)) {
+        if (infoPtr->nSearchParamLength < COUNTOF(infoPtr->szSearchParam)) {
             infoPtr->szSearchParam[infoPtr->nSearchParamLength++]=charCode;
         }
@@ -499 +773 @@
         item.iSubItem = 0;
         item.pszText = buffer;
-        item.cchTextMax = sizeof(buffer);
-        ListView_GetItemA( hwnd, &item );
+        item.cchTextMax = COUNTOF(buffer);
+        ListView_GetItemW( hwnd, &item );
 
         /* check for a match */
-        if (strncasecmp(item.pszText,infoPtr->szSearchParam,infoPtr->nSearchParamLength) == 0) {
+        if (lstrncmpiW(item.pszText,infoPtr->szSearchParam,infoPtr->nSearchParamLength) == 0) {
             nItem=idx;
             break;
         } else if ( (charCode != 0) && (nItem == -1) && (nItem != infoPtr->nFocusedItem) &&
-                    (strncasecmp(item.pszText,infoPtr->szSearchParam,1) == 0) ) {
+                    (lstrncmpiW(item.pszText,infoPtr->szSearchParam,1) == 0) ) {
             /* This would work but we must keep looking for a longer match */
             nItem=idx;
@@ -526 +800 @@
 
 /*************************************************************************
- * LISTVIEW_UpdateHeaderSize [Internal]
+ * LISTVIEW_UpdateHeaderSize [Internal] 
  *
  * Function to resize the header control
@@ -541 +815 @@
 static VOID LISTVIEW_UpdateHeaderSize(HWND hwnd, INT nNewScrollPos)
 {
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
     RECT winRect;
     POINT point[2];
@@ -559 +833 @@
     point[1].x += (nNewScrollPos * LISTVIEW_SCROLL_DIV_SIZE);
 #endif
-
     SetWindowPos(infoPtr->hwndHeader,0,
         point[0].x,point[0].y,point[1].x,point[1].y,
@@ -567 +840 @@
 /***
  * DESCRIPTION:
- * Update the scrollbars. This functions should be called whenever
+ * Update the scrollbars. This functions should be called whenever 
  * the content, size or view changes.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -579 +852 @@
 static VOID LISTVIEW_UpdateScroll(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
   INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
   SCROLLINFO scrollInfo;
-  LONG dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG dwStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView =  dwStyle & LVS_TYPEMASK;
 
@@ -697 +970 @@
 static VOID LISTVIEW_UpdateScroll(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); 
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView =  lStyle & LVS_TYPEMASK;
   INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
@@ -704 +977 @@
   SCROLLINFO scrollInfo;
 
-
+  if (lStyle & LVS_NOSCROLL) return;
+  
   ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
   scrollInfo.cbSize = sizeof(SCROLLINFO);
@@ -719 +993 @@
     if((nNumOfItems % nCountPerColumn) == 0)
     {
-      scrollInfo.nMax--;
+        scrollInfo.nMax--;
+    }
+    else
+    {
+        scrollInfo.nMax++;
     }
     scrollInfo.nPos = ListView_GetTopIndex(hwnd) / nCountPerColumn;
@@ -739 +1017 @@
     /* update horizontal scrollbar */
     nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
-    if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) == FALSE
+    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.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);
+    SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE); 
 
     /* Update the Header Control */
@@ -800 +1078 @@
  * Prints a message for unsupported window styles.
  * A kind of TODO list for window styles.
- *
+ * 
  * PARAMETER(S):
  * [I] LONG : window style
@@ -809 +1087 @@
 static VOID LISTVIEW_UnsupportedStyles(LONG lStyle)
 {
-  if ((LVS_TYPEMASK & lStyle) == LVS_EDITLABELS)
-  {
+  if ((LVS_TYPESTYLEMASK & lStyle) == LVS_NOSCROLL)
+    FIXME("  LVS_NOSCROLL\n");
+
+  if (lStyle & LVS_EDITLABELS)
     FIXME("  LVS_EDITLABELS\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_NOLABELWRAP)
-  {
+
+  if (lStyle & LVS_NOLABELWRAP)
     FIXME("  LVS_NOLABELWRAP\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_NOSCROLL)
-  {
-    FIXME("  LVS_NOSCROLL\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_NOSORTHEADER)
-  {
-    FIXME("  LVS_NOSORTHEADER\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_OWNERDRAWFIXED)
-  {
-    FIXME("  LVS_OWNERDRAWFIXED\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_SHAREIMAGELISTS)
-  {
+
+  if (lStyle & LVS_SHAREIMAGELISTS)
     FIXME("  LVS_SHAREIMAGELISTS\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_SORTASCENDING)
-  {
+
+  if (lStyle & LVS_SORTASCENDING)
     FIXME("  LVS_SORTASCENDING\n");
-  }
-
-  if ((LVS_TYPEMASK & lStyle) == LVS_SORTDESCENDING)
-  {
+
+  if (lStyle & LVS_SORTDESCENDING)
     FIXME("  LVS_SORTDESCENDING\n");
-  }
 }
 
@@ -853 +1109 @@
  * DESCRIPTION:
  * Aligns the items with the top edge of the window.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -862 +1118 @@
 static VOID LISTVIEW_AlignTop(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
   POINT ptItem;
   RECT rcView;
-  INT i;
-
+  INT i, off_x=0, off_y=0;
+  
   if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
   {
-    ZeroMemory(&ptItem, sizeof(POINT));
+    /* Since SetItemPosition uses upper-left of icon, and for
+       style=LVS_ICON the icon is not left adjusted, get the offset */
+    if (uView == LVS_ICON) 
+    {
+      off_y = ICON_TOP_PADDING;
+      off_x = (infoPtr->iconSpacing.cx - infoPtr->iconSize.cx) / 2;
+    }
+    ptItem.x = off_x;
+    ptItem.y = off_y;
     ZeroMemory(&rcView, sizeof(RECT));
 
@@ -880 +1144 @@
         if (ptItem.x + infoPtr->nItemWidth > nListWidth)
         {
-          ptItem.x = 0;
+          ptItem.x = off_x;
           ptItem.y += infoPtr->nItemHeight;
         }
-
-        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);
@@ -895 +1159 @@
       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;
       }
@@ -910 +1174 @@
  * DESCRIPTION:
  * Aligns the items with the left edge of the window.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -919 +1183 @@
 static VOID LISTVIEW_AlignLeft(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
   POINT ptItem;
   RECT rcView;
-  INT i;
-
+  INT i, off_x=0, off_y=0;
+  
   if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
   {
-    ZeroMemory(&ptItem, sizeof(POINT));
+    /* Since SetItemPosition uses upper-left of icon, and for
+       style=LVS_ICON the icon is not left adjusted, get the offset */
+    if (uView == LVS_ICON) 
+    {
+      off_y = ICON_TOP_PADDING;
+      off_x = (infoPtr->iconSpacing.cx - infoPtr->iconSize.cx) / 2;
+    }
+    ptItem.x = off_x;
+    ptItem.y = off_y;
     ZeroMemory(&rcView, sizeof(RECT));
 
@@ -937 +1209 @@
         if (ptItem.y + infoPtr->nItemHeight > nListHeight)
         {
-          ptItem.y = 0;
+          ptItem.y = off_y;
           ptItem.x += infoPtr->nItemWidth;
         }
 
-        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);
@@ -952 +1224 @@
       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;
       }
@@ -967 +1239 @@
  * DESCRIPTION:
  * Set the bounding rectangle of all the items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -978 +1250 @@
 static LRESULT LISTVIEW_SetViewRect(HWND hwnd, LPRECT lprcView)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
   BOOL bResult = FALSE;
 
-  TRACE("(hwnd=%x, left=%d, top=%d, right=%d, bottom=%d)\n", hwnd,
+  TRACE("(hwnd=%x, left=%d, top=%d, right=%d, bottom=%d)\n", hwnd, 
         lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
-
+  
   if (lprcView != NULL)
   {
@@ -999 +1271 @@
  * DESCRIPTION:
  * Retrieves the bounding rectangle of all the items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1010 +1282 @@
 static LRESULT LISTVIEW_GetViewRect(HWND hwnd, LPRECT lprcView)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
   BOOL bResult = FALSE;
   POINT ptOrigin;
@@ -1027 +1299 @@
     }
 
-    TRACE("(left=%d, top=%d, right=%d, bottom=%d)\n",
+    TRACE("(left=%d, top=%d, right=%d, bottom=%d)\n", 
           lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
   }
@@ -1037 +1309 @@
  * DESCRIPTION:
  * Retrieves the subitem pointer associated with the subitem index.
- *
+ * 
  * PARAMETER(S):
  * [I] HDPA : DPA handle for a specific item
@@ -1046 +1318 @@
  *   FAILURE : NULL
  */
-static LISTVIEW_SUBITEM* LISTVIEW_GetSubItemPtr(HDPA hdpaSubItems,
+static LISTVIEW_SUBITEM* LISTVIEW_GetSubItemPtr(HDPA hdpaSubItems, 
                                                 INT nSubItem)
 {
@@ -1070 +1342 @@
  * DESCRIPTION:
  * Calculates the width of an item.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -1080 +1352 @@
 static INT LISTVIEW_GetItemWidth(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG style = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = style & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG style = GetWindowLongW(hwnd, GWL_STYLE); 
+  UINT uView = style & LVS_TYPEMASK; 
   INT nHeaderItemCount;
   RECT rcHeaderItem;
@@ -1117 +1389 @@
   {
     for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
-    {
+    { 
       nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, i);
       nItemWidth = max(nItemWidth, nLabelWidth);
     }
-
+    
     /* default label size */
     if (GETITEMCOUNT(infoPtr) == 0)
@@ -1137 +1409 @@
         /* add padding */
         nItemWidth += WIDTH_PADDING;
-
+      
         if (infoPtr->himlSmall != NULL)
         {
@@ -1161 +1433 @@
  * DESCRIPTION:
  * Calculates the width of a specific item.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPSTR : string
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPSTR : string  
  *
  * RETURN:
@@ -1171 +1443 @@
 static INT LISTVIEW_CalculateWidth(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nHeaderItemCount;
   RECT rcHeaderItem;
@@ -1216 +1488 @@
         /* add padding */
         nItemWidth += WIDTH_PADDING;
-
+      
         if (infoPtr->himlSmall != NULL)
         {
@@ -1229 +1501 @@
     }
   }
-
+  
   return nItemWidth;
 }
@@ -1235 +1507 @@
 /***
  * DESCRIPTION:
+ * Retrieves and saves important text metrics info for the current
+ * Listview font.
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
+ */
+static VOID LISTVIEW_SaveTextMetrics(HWND hwnd)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  TEXTMETRICW tm;
+  HDC hdc = GetDC(hwnd);
+  HFONT hOldFont = SelectObject(hdc, infoPtr->hFont);
+  INT oldHeight, oldACW;
+
+  GetTextMetricsW(hdc, &tm);
+
+  oldHeight = infoPtr->ntmHeight;
+  oldACW = infoPtr->ntmAveCharWidth;
+  infoPtr->ntmHeight = tm.tmHeight;
+  infoPtr->ntmAveCharWidth = tm.tmAveCharWidth;
+
+  SelectObject(hdc, hOldFont);
+  ReleaseDC(hwnd, hdc);
+  TRACE("tmHeight old=%d,new=%d; tmAveCharWidth old=%d,new=%d\n",
+        oldHeight, infoPtr->ntmHeight, oldACW, infoPtr->ntmAveCharWidth);
+}
+
+
+/***
+ * DESCRIPTION:
  * Calculates the height of an item.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LONG : window style
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
  *
  * RETURN:
@@ -1246 +1548 @@
 static INT LISTVIEW_GetItemHeight(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 #ifdef __WIN32OS2__
   DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
@@ -1261 +1563 @@
   else
   {
-    TEXTMETRICA tm;
-    HDC hdc = GetDC(hwnd);
-    HFONT hOldFont = SelectObject(hdc, infoPtr->hFont);
-    GetTextMetricsA(hdc, &tm);
-
     if(infoPtr->himlState || infoPtr->himlSmall)
-      nItemHeight = max(tm.tmHeight, infoPtr->iconSize.cy) + HEIGHT_PADDING;
+      nItemHeight = max(infoPtr->ntmHeight, infoPtr->iconSize.cy) + HEIGHT_PADDING;
     else
-      nItemHeight = tm.tmHeight;
-
-    SelectObject(hdc, hOldFont);
-    ReleaseDC(hwnd, hdc);
+      nItemHeight = infoPtr->ntmHeight;
 #ifdef __WIN32OS2__
-    if(dwStyle & LVS_OWNERDRAWFIXED) {
+  if(dwStyle & LVS_OWNERDRAWFIXED) {
         /* Get item height */
 
@@ -1290 +1584 @@
 #endif
   }
-
   return nItemHeight;
 }
@@ -1297 +1590 @@
 static void LISTVIEW_PrintSelectionRanges(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LISTVIEW_SELECTION *selection;
   INT topSelection = infoPtr->hdpaSelectionRanges->nItemCount;
@@ -1324 +1617 @@
  * 0 : if Item 1 == Item 2
  */
-static INT CALLBACK LISTVIEW_CompareSelectionRanges(LPVOID range1, LPVOID range2,
+static INT CALLBACK LISTVIEW_CompareSelectionRanges(LPVOID range1, LPVOID range2, 
                                                     LPARAM flags)
 {
@@ -1330 +1623 @@
   int l2 = ((LISTVIEW_SELECTION*)(range2))->lower;
   int u1 = ((LISTVIEW_SELECTION*)(range1))->upper;
-  int u2 = ((LISTVIEW_SELECTION*)(range2))->upper;
+  int u2 = ((LISTVIEW_SELECTION*)(range2))->upper; 
   int rc=0;
 
   if (u1 < l2)
     rc= -1;
-
+ 
   if (u2 < l1)
      rc= 1;
@@ -1345 +1638 @@
 * DESCRIPTION:
 * Adds a selection range.
-*
+* 
 * PARAMETER(S):
 * [I] HWND : window handle
 * [I] INT : lower item index
-* [I] INT : upper item index
+* [I] INT : upper item index 
 *
 * RETURN:
@@ -1356 +1649 @@
 static VOID LISTVIEW_AddSelectionRange(HWND hwnd, INT lItem, INT uItem)
 {
- LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+ LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
  LISTVIEW_SELECTION *selection;
  INT topSelection = infoPtr->hdpaSelectionRanges->nItemCount;
@@ -1365 +1658 @@
  selection->upper = uItem;
 
- TRACE("Add range %i - %i\n",lItem,uItem);
+ TRACE("Add range %i - %i\n", lItem, uItem);
  if (topSelection)
  {
@@ -1383 +1676 @@
                       LISTVIEW_CompareSelectionRanges,
                       0,0);
-   selection->upper --;
+   selection->upper --; 
    if (lowerzero)
      lowerzero=FALSE;
@@ -1394 +1687 @@
      TRACE("Merge with index %i (%lu - %lu)\n",index,checkselection->lower,
            checkselection->upper);
-
+     
      checkselection->lower = min(selection->lower,checkselection->lower);
      checkselection->upper = max(selection->upper,checkselection->upper);
-
-     TRACE("New range (%lu - %lu)\n", checkselection->lower,
+    
+     TRACE("New range (%lu - %lu)\n", checkselection->lower, 
            checkselection->upper);
 
-     COMCTL32_Free(selection);
-
+     COMCTL32_Free(selection);    
+ 
      /* merge now common selection ranges in the lower group*/
      do
      {
-        checkselection->upper ++;
+        checkselection->upper ++; 
         if (checkselection->lower == 0)
           lowerzero = TRUE;
@@ -1412 +1705 @@
           checkselection->lower --;
 
-        TRACE("search lower range (%lu - %lu)\n", checkselection->lower,
+        TRACE("search lower range (%lu - %lu)\n", checkselection->lower, 
               checkselection->upper);
 
@@ -1420 +1713 @@
                                 0);
 
-        checkselection->upper --;
+        checkselection->upper --; 
         if (lowerzero)
           lowerzero = FALSE;
         else
-      checkselection->lower ++;
-
-    if (mergeindex >=0  && mergeindex != index)
+          checkselection->lower ++;
+
+        if (mergeindex >=0  && mergeindex != index)
         {
-      TRACE("Merge with index %i\n",mergeindex);
+          TRACE("Merge with index %i\n",mergeindex);
           checkselection2 = DPA_GetPtr(infoPtr->hdpaSelectionRanges,
                                        mergeindex);
-          checkselection->lower = min(checkselection->lower,
+          checkselection->lower = min(checkselection->lower, 
                                       checkselection2->lower);
           checkselection->upper = max(checkselection->upper,
@@ -1448 +1741 @@
        if (checkselection->lower == 0)
          lowerzero = TRUE;
-       else
+       else 
          checkselection->lower --;
 
-       TRACE("search upper range %i (%lu - %lu)\n",index,
+       TRACE("search upper range %i (%lu - %lu)\n",index, 
              checkselection->lower, checkselection->upper);
 
@@ -1457 +1750 @@
        mergeindex = DPA_Search(infoPtr->hdpaSelectionRanges, checkselection,
                                index+1,
-                   LISTVIEW_CompareSelectionRanges, 0,
-                   0);
-
-       checkselection->upper --;
+                               LISTVIEW_CompareSelectionRanges, 0,
+                               0);
+
+       checkselection->upper --; 
        if (lowerzero)
          lowerzero = FALSE;
@@ -1468 +1761 @@
        if (mergeindex >=0 && mergeindex !=index)
        {
-     TRACE("Merge with index %i\n",mergeindex);
-     checkselection2 = DPA_GetPtr(infoPtr->hdpaSelectionRanges,
-                      mergeindex);
-     checkselection->lower = min(checkselection->lower,
-                     checkselection2->lower);
-     checkselection->upper = max(checkselection->upper,
-                     checkselection2->upper);
-     COMCTL32_Free(checkselection2);
-     DPA_DeletePtr(infoPtr->hdpaSelectionRanges,mergeindex);
+         TRACE("Merge with index %i\n",mergeindex);
+         checkselection2 = DPA_GetPtr(infoPtr->hdpaSelectionRanges,
+                                      mergeindex);
+         checkselection->lower = min(checkselection->lower, 
+                                     checkselection2->lower);
+         checkselection->upper = max(checkselection->upper,
+                                     checkselection2->upper);
+         COMCTL32_Free(checkselection2);
+         DPA_DeletePtr(infoPtr->hdpaSelectionRanges,mergeindex);
        }
     }
@@ -1485 +1778 @@
 
      index = DPA_Search(infoPtr->hdpaSelectionRanges, selection, 0,
-                       LISTVIEW_CompareSelectionRanges, 0,
+                       LISTVIEW_CompareSelectionRanges, 0, 
                        DPAS_INSERTAFTER);
 
@@ -1491 +1784 @@
      if (index == -1)
        index = 0;
-     DPA_InsertPtr(infoPtr->hdpaSelectionRanges,index,selection);
+     DPA_InsertPtr(infoPtr->hdpaSelectionRanges,index,selection); 
    }
- }
+ } 
  else
  {
@@ -1499 +1792 @@
  }
  /*
-  * Incase of error
+  * Incase of error 
   */
  DPA_Sort(infoPtr->hdpaSelectionRanges,LISTVIEW_CompareSelectionRanges,0);
@@ -1508 +1801 @@
 * DESCRIPTION:
 * check if a specified index is selected.
-*
+* 
 * PARAMETER(S):
 * [I] HWND : window handle
-* [I] INT : item index
+* [I] INT : item index 
 *
 * RETURN:
@@ -1518 +1811 @@
 static BOOL LISTVIEW_IsSelected(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LISTVIEW_SELECTION selection;
   INT index;
@@ -1547 +1840 @@
 static LRESULT LISTVIEW_RemoveAllSelections(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LISTVIEW_SELECTION *selection;
   INT i;
-  LVITEMA item;
-
+  LVITEMW item;
+  
   TRACE("(0x%x)\n",hwnd);
 
-  ZeroMemory(&item,sizeof(LVITEMA));
+  ZeroMemory(&item,sizeof(item));
   item.stateMask = LVIS_SELECTED;
 
@@ -1567 +1860 @@
       LISTVIEW_RemoveSelectionRange(hwnd,selection->lower,selection->upper);
     }
-  }
+  } 
   while (infoPtr->hdpaSelectionRanges->nItemCount>0);
 
   TRACE("done\n");
-  return TRUE;
+  return TRUE; 
 }
 
@@ -1577 +1870 @@
 * DESCRIPTION:
 * Removes a range selections.
-*
+* 
 * PARAMETER(S):
 * [I] HWND : window handle
 * [I] INT : lower item index
-* [I] INT : upper item index
+* [I] INT : upper item index 
 *
 * RETURN:
@@ -1588 +1881 @@
 static VOID LISTVIEW_RemoveSelectionRange(HWND hwnd, INT lItem, INT uItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LISTVIEW_SELECTION removeselection,*checkselection;
   INT index;
@@ -1601 +1894 @@
                      LISTVIEW_CompareSelectionRanges,
                      0,0);
-
+  
   if (index == -1)
     return;
 
-
+ 
   checkselection = DPA_GetPtr(infoPtr->hdpaSelectionRanges,
                               index);
@@ -1613 +1906 @@
 
   /* case 1: Same */
-  if ((checkselection->upper == removeselection.upper) &&
+  if ((checkselection->upper == removeselection.upper) && 
      (checkselection->lower == removeselection.lower))
   {
@@ -1620 +1913 @@
   }
   /* case 2: engulf */
-  else if (((checkselection->upper < removeselection.upper) &&
+  else if (((checkselection->upper < removeselection.upper) && 
       (checkselection->lower > removeselection.lower))||
      ((checkselection->upper <= removeselection.upper) &&
@@ -1658 +1951 @@
     /* bisect the range */
     LISTVIEW_SELECTION *newselection;
-
+    
     newselection = (LISTVIEW_SELECTION *)
                           COMCTL32_Alloc(sizeof(LISTVIEW_SELECTION));
@@ -1674 +1967 @@
 * DESCRIPTION:
 * Updates the various indices after an item has been inserted or deleted.
-*
+* 
 * PARAMETER(S):
 * [I] HWND : window handle
-* [I] INT : item index
+* [I] INT : item index 
 * [I] INT : Direction of shift, +1 or -1.
 *
@@ -1685 +1978 @@
 static VOID LISTVIEW_ShiftIndices(HWND hwnd, INT nItem, INT direction)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LISTVIEW_SELECTION selection,*checkselection;
   INT index;
@@ -1698 +1991 @@
                      0,DPAS_SORTED|DPAS_INSERTAFTER);
 
-  while ((index < infoPtr->hdpaSelectionRanges->nItemCount)&&(index != -1))
+  while ((index < infoPtr->hdpaSelectionRanges->nItemCount)&&(index != -1)) 
   {
     checkselection = DPA_GetPtr(infoPtr->hdpaSelectionRanges,index);
@@ -1742 +2035 @@
  * DESCRIPTION:
  * Adds a block of selections.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
  *
  * RETURN:
@@ -1752 +2045 @@
 static VOID LISTVIEW_AddGroupSelection(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nFirst = min(infoPtr->nSelectionMark, nItem);
   INT nLast = max(infoPtr->nSelectionMark, nItem);
   INT i;
-  LVITEMA item;
+  LVITEMW item;
 
   if (nFirst == -1)
     nFirst = nItem;
 
-  ZeroMemory(&item,sizeof(LVITEMA));
+  ZeroMemory(&item,sizeof(item));
   item.stateMask = LVIS_SELECTED;
   item.state = LVIS_SELECTED;
 
   for (i = nFirst; i <= nLast; i++)
-  {
     LISTVIEW_SetItemState(hwnd,i,&item);
-  }
 
   LISTVIEW_SetItemFocus(hwnd, nItem);
@@ -1778 +2069 @@
  * DESCRIPTION:
  * Adds a single selection.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
  *
  * RETURN:
@@ -1788 +2079 @@
 static VOID LISTVIEW_AddSelection(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LVITEMA item;
-
-  ZeroMemory(&item,sizeof(LVITEMA));
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LVITEMW item;
+
+  ZeroMemory(&item,sizeof(item));
   item.state = LVIS_SELECTED;
   item.stateMask = LVIS_SELECTED;
@@ -1804 +2095 @@
  * DESCRIPTION:
  * Selects or unselects an item.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
- *
- * RETURN:
- *   SELECT: TRUE
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
+ *
+ * RETURN:
+ *   SELECT: TRUE 
  *   UNSELECT : FALSE
  */
 static BOOL LISTVIEW_ToggleSelection(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   BOOL bResult;
-  LVITEMA item;
-
-  ZeroMemory(&item,sizeof(LVITEMA));
+  LVITEMW item;
+
+  ZeroMemory(&item,sizeof(item));
   item.stateMask = LVIS_SELECTED;
 
   if (LISTVIEW_IsSelected(hwnd,nItem))
   {
-
     LISTVIEW_SetItemState(hwnd,nItem,&item);
     bResult = FALSE;
@@ -1843 +2133 @@
 /***
  * DESCRIPTION:
- * Selects items based on view coordinates.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] RECT : selection rectangle
+ * Selects items based on view coordinates. 
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] RECT : selection rectangle  
  *
  * RETURN:
@@ -1854 +2144 @@
 static VOID LISTVIEW_SetSelectionRect(HWND hwnd, RECT rcSelRect)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   POINT ptItem;
   INT i;
-  LVITEMA item;
-
-  ZeroMemory(&item,sizeof(LVITEMA));
+  LVITEMW item;
+
+  ZeroMemory(&item,sizeof(item));
   item.stateMask = LVIS_SELECTED;
 
@@ -1867 +2157 @@
 
     if (PtInRect(&rcSelRect, ptItem) != FALSE)
-    {
       item.state = LVIS_SELECTED;
-      LISTVIEW_SetItemState(hwnd,i,&item);
-    }
     else
-    {
       item.state = 0;
-      LISTVIEW_SetItemState(hwnd,i,&item);
-    }
+    LISTVIEW_SetItemState(hwnd,i,&item);
   }
 }
@@ -1882 +2167 @@
  * DESCRIPTION:
  * Sets a single group selection.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
- *
- * RETURN:
- * None
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
+ *
+ * RETURN:
+ * None 
  */
 static VOID LISTVIEW_SetGroupSelection(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
-  LVITEMA item;
-
-  ZeroMemory(&item,sizeof(LVITEMA));
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LVITEMW item;
+
+  ZeroMemory(&item,sizeof(item));
   item.stateMask = LVIS_SELECTED;
 
@@ -1917 +2202 @@
     {
       if ((i < nFirst) || (i > nLast))
-      {
         item.state = 0;
-        LISTVIEW_SetItemState(hwnd,i,&item);
-      }
       else
-      {
         item.state = LVIS_SELECTED;
-        LISTVIEW_SetItemState(hwnd,i,&item);
-      }
+      LISTVIEW_SetItemState(hwnd,i,&item);
     }
   }
   else
   {
-    POINT ptItem;
-    POINT ptSelMark;
+    RECT rcItem;
+    RECT rcSelMark;
     RECT rcSel;
-    LISTVIEW_GetItemPosition(hwnd, nItem, &ptItem);
-    LISTVIEW_GetItemPosition(hwnd, infoPtr->nSelectionMark, &ptSelMark);
-    rcSel.left = min(ptSelMark.x, ptItem.x);
-    rcSel.top = min(ptSelMark.y, ptItem.y);
-    rcSel.right = max(ptSelMark.x, ptItem.x) + infoPtr->nItemWidth;
-    rcSel.bottom = max(ptSelMark.y, ptItem.y) + infoPtr->nItemHeight;
+    LISTVIEW_GetItemBoundBox(hwnd, nItem, &rcItem);
+    LISTVIEW_GetItemBoundBox(hwnd, infoPtr->nSelectionMark, &rcSelMark);
+    rcSel.left = min(rcSelMark.left, rcItem.left);
+    rcSel.top = min(rcSelMark.top, rcItem.top);
+    rcSel.right = max(rcSelMark.right, rcItem.right);
+    rcSel.bottom = max(rcSelMark.bottom, rcItem.bottom);
     LISTVIEW_SetSelectionRect(hwnd, rcSel);
+    TRACE("item %d (%d,%d)-(%d,%d), mark %d (%d,%d)-(%d,%d), sel (%d,%d)-(%d,%d)\n",
+          nItem, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom,
+          infoPtr->nSelectionMark,
+          rcSelMark.left, rcSelMark.top, rcSelMark.right, rcSelMark.bottom,
+          rcSel.left, rcSel.top, rcSel.right, rcSel.bottom);
+
   }
 
@@ -1948 +2234 @@
  * DESCRIPTION:
  * Manages the item focus.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
  *
  * RETURN:
@@ -1959 +2245 @@
 static BOOL LISTVIEW_SetItemFocus(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   BOOL bResult = FALSE;
-  LVITEMA lvItem;
+  LVITEMW lvItem;
 
   if (infoPtr->nFocusedItem != nItem)
@@ -1970 +2256 @@
       bResult = TRUE;
       infoPtr->nFocusedItem = -1;
-      ZeroMemory(&lvItem, sizeof(LVITEMA));
+      ZeroMemory(&lvItem, sizeof(lvItem));
       lvItem.stateMask = LVIS_FOCUSED;
-      ListView_SetItemState(hwnd, oldFocus, &lvItem);
+      ListView_SetItemState(hwnd, oldFocus, &lvItem); 
 
     }
@@ -1983 +2269 @@
     ListView_EnsureVisible(hwnd, nItem, FALSE);
   }
-
-  return bResult;
+  
+  return bResult; 
 }
 
@@ -1990 +2276 @@
  * DESCRIPTION:
  * Sets a single selection.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
  *
  * RETURN:
@@ -2000 +2286 @@
 static VOID LISTVIEW_SetSelection(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LVITEMA lvItem;
-
-  ZeroMemory(&lvItem, sizeof(LVITEMA));
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LVITEMW lvItem;
+
+  ZeroMemory(&lvItem, sizeof(lvItem));
   lvItem.stateMask = LVIS_FOCUSED;
-  ListView_SetItemState(hwnd, infoPtr->nFocusedItem, &lvItem);
+  ListView_SetItemState(hwnd, infoPtr->nFocusedItem, &lvItem); 
 
   LISTVIEW_RemoveAllSelections(hwnd);
@@ -2020 +2306 @@
  * DESCRIPTION:
  * Set selection(s) with keyboard.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index 
  *
  * RETURN:
@@ -2031 +2317 @@
 static BOOL LISTVIEW_KeySelection(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   WORD wShift = HIWORD(GetKeyState(VK_SHIFT));
   WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL));
@@ -2042 +2328 @@
     {
       bResult = TRUE;
-      LISTVIEW_SetSelection(hwnd, nItem);
+      LISTVIEW_SetSelection(hwnd, nItem); 
       ListView_EnsureVisible(hwnd, nItem, FALSE);
     }
@@ -2050 +2336 @@
       {
         bResult = TRUE;
-        LISTVIEW_SetGroupSelection(hwnd, nItem);
+        LISTVIEW_SetGroupSelection(hwnd, nItem); 
       }
       else if (wCtrl)
@@ -2059 +2345 @@
       {
         bResult = TRUE;
-        LISTVIEW_SetSelection(hwnd, nItem);
+        LISTVIEW_SetSelection(hwnd, nItem); 
         ListView_EnsureVisible(hwnd, nItem, FALSE);
       }
@@ -2084 +2370 @@
  * LVS_EX_TRACKSELECT: An item is automatically selected when the cursor remains
  * over the item for a certain period of time.
- *
+ * 
  */
 static LRESULT LISTVIEW_MouseHover(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   POINT pt;
 
@@ -2116 +2402 @@
 static LRESULT LISTVIEW_MouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   TRACKMOUSEEVENT trackinfo;
-
+ 
   /* see if we are supposed to be tracking mouse hovering */
   if(infoPtr->dwExStyle & LVS_EX_TRACKSELECT) {
@@ -2137 +2423 @@
     }
   }
-
+  
   return 0;
 }
@@ -2144 +2430 @@
  * DESCRIPTION:
  * Selects an item based on coordinates.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2155 +2441 @@
 static LRESULT LISTVIEW_MouseSelection(HWND hwnd, POINT pt)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   RECT rcItem;
   INT i,topindex,bottomindex;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
 
@@ -2164 +2450 @@
   if (uView == LVS_REPORT)
   {
-    bottomindex = topindex + LISTVIEW_GetCountPerColumn(hwnd) + 1;
+    bottomindex = topindex + LISTVIEW_GetCountPerColumn(hwnd) + 1;  
     bottomindex = min(bottomindex,GETITEMCOUNT(infoPtr));
   }
@@ -2172 +2458 @@
   }
 
-  for (i = topindex; i < bottomindex; i++)
+  for (i = topindex; i < bottomindex; i++) 
   {
     rcItem.left = LVIR_SELECTBOUNDS;
@@ -2190 +2476 @@
  * DESCRIPTION:
  * Removes a column.
- *
+ * 
  * PARAMETER(S):
  * [IO] HDPA : dynamic pointer array handle
@@ -2216 +2502 @@
     }
   }
-
+    
   return bResult;
 }
@@ -2223 +2509 @@
  * DESCRIPTION:
  * Removes a subitem at a given position.
- *
+ * 
  * PARAMETER(S):
  * [IO] HDPA : dynamic pointer array handle
@@ -2245 +2531 @@
       {
         /* free string */
-        if ((lpSubItem->pszText != NULL) &&
-            (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
-        {
+        if (is_textW(lpSubItem->pszText))
           COMCTL32_Free(lpSubItem->pszText);
-        }
-
+        
         /* free item */
         COMCTL32_Free(lpSubItem);
@@ -2256 +2539 @@
         /* free dpa memory */
         if (DPA_DeletePtr(hdpaSubItems, i) == NULL)
-        {
           return FALSE;
-        }
       }
       else if (lpSubItem->iSubItem > nSubItem)
-      {
         return TRUE;
-      }
-    }
-  }
-
+    }
+  }    
+  
   return TRUE;
 }
@@ -2273 +2552 @@
  * DESCRIPTION:
  * Compares the item information.
- *
- * PARAMETER(S):
- * [I] LISTVIEW_ITEM *: destination item
+ * 
+ * PARAMETER(S):
+ * [I] LISTVIEW_ITEM *: destination item 
  * [I] LPLVITEM : source item
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE it it's ANSI
  *
  * RETURN:
@@ -2283 +2563 @@
  */
 #ifdef __WIN32OS2__
-static UINT LISTVIEW_GetItemChanges(LISTVIEW_ITEM *lpItem, LPLVITEMA lpLVItem, DWORD lStyle)
+static UINT LISTVIEW_GetItemChangesT(LISTVIEW_ITEM *lpItem, LPLVITEMW lpLVItem, BOOL isW, DWORD lStyle)
 #else
-static UINT LISTVIEW_GetItemChanges(LISTVIEW_ITEM *lpItem, LPLVITEMA lpLVItem)
+static UINT LISTVIEW_GetItemChangesT(LISTVIEW_ITEM *lpItem, LPLVITEMW lpLVItem, BOOL isW)
 #endif
 {
@@ -2294 +2574 @@
     if (lpLVItem->mask & LVIF_STATE)
     {
-      if ((lpItem->state & lpLVItem->stateMask) !=
+      if ((lpItem->state & lpLVItem->stateMask) != 
           (lpLVItem->state & lpLVItem->stateMask))
+        uChanged |= LVIF_STATE; 
+    }
+
+    if (lpLVItem->mask & LVIF_IMAGE)
+    {
+      if (lpItem->iImage != lpLVItem->iImage)
+        uChanged |= LVIF_IMAGE; 
+    }
+  
+    if (lpLVItem->mask & LVIF_PARAM)
+    {
+      if (lpItem->lParam != lpLVItem->lParam)
+        uChanged |= LVIF_PARAM; 
+    }
+    
+    if (lpLVItem->mask & LVIF_INDENT)
+    {
+      if (lpItem->iIndent != lpLVItem->iIndent)
+        uChanged |= LVIF_INDENT; 
+    }
+
+    if (lpLVItem->mask & LVIF_TEXT) 
+    {
+      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKW) 
       {
-        uChanged |= LVIF_STATE;
-      }
-    }
-
-    if (lpLVItem->mask & LVIF_IMAGE)
-    {
-      if (lpItem->iImage != lpLVItem->iImage)
-      {
-        uChanged |= LVIF_IMAGE;
-      }
-    }
-
-    if (lpLVItem->mask & LVIF_PARAM)
-    {
-      if (lpItem->lParam != lpLVItem->lParam)
-      {
-        uChanged |= LVIF_PARAM;
-      }
-    }
-
-    if (lpLVItem->mask & LVIF_INDENT)
-    {
-      if (lpItem->iIndent != lpLVItem->iIndent)
-      {
-        uChanged |= LVIF_INDENT;
-      }
-    }
-
-    if (lpLVItem->mask & LVIF_TEXT)
-    {
-      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA)
-      {
-        if (lpItem->pszText != LPSTR_TEXTCALLBACKA)
-        {
-          uChanged |= LVIF_TEXT;
-        }
+        if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
+          uChanged |= LVIF_TEXT; 
       }
       else
       {
-        if (lpItem->pszText == LPSTR_TEXTCALLBACKA)
+        if (lpItem->pszText == LPSTR_TEXTCALLBACKW)
         {
-          uChanged |= LVIF_TEXT;
+          uChanged |= LVIF_TEXT; 
         }
-    else
-    {
-      if (lpLVItem->pszText)
-      {
+        else
+        {
+          if (lpLVItem->pszText)
+          {
 #ifdef __WIN32OS2__
         if(lStyle & LVS_OWNERDRAWFIXED) {
@@ -2355 +2625 @@
         else
 #endif
-        if (lpItem->pszText)
-        {
-          if (strcmp(lpLVItem->pszText, lpItem->pszText) != 0)
-          {
-        uChanged |= LVIF_TEXT;
-          }
-        }
-        else
-        {
-          uChanged |= LVIF_TEXT;
-        }
+            if (lpItem->pszText)
+            {
+              LPWSTR pszText = textdupTtoW(lpLVItem->pszText, isW);
+              if (pszText && strcmpW(pszText, lpItem->pszText))
+                uChanged |= LVIF_TEXT;
+              textfreeT(pszText, isW);
+            }
+            else
+            {
+              uChanged |= LVIF_TEXT;
+            }
+          }
+          else
+          {
+            if (lpItem->pszText)
+              uChanged |= LVIF_TEXT;
+          }
+        }
       }
-      else
-      {
-        if (lpItem->pszText)
-        {
-          uChanged |= LVIF_TEXT;
-        }
-      }
-    }
-      }
     }
   }
@@ -2384 +2652 @@
  * DESCRIPTION:
  * Initializes item attributes.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [O] LISTVIEW_ITEM *: destination item
- * [I] LPLVITEM : source item
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [O] LISTVIEW_ITEM *: destination item 
+ * [I] LPLVITEM : source item 
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -2394 +2663 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_InitItem(HWND hwnd, LISTVIEW_ITEM *lpItem,
-                              LPLVITEMA lpLVItem)
-{
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+static BOOL LISTVIEW_InitItemT(HWND hwnd, LISTVIEW_ITEM *lpItem, 
+                              LPLVITEMW lpLVItem, BOOL isW)
+{
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   BOOL bResult = FALSE;
 
@@ -2403 +2672 @@
   {
     bResult = TRUE;
-
+    
     if (lpLVItem->mask & LVIF_STATE)
     {
@@ -2409 +2678 @@
       lpItem->state |= (lpLVItem->state & lpLVItem->stateMask);
     }
-
+    
     if (lpLVItem->mask & LVIF_IMAGE)
-    {
       lpItem->iImage = lpLVItem->iImage;
-    }
-
+  
     if (lpLVItem->mask & LVIF_PARAM)
-    {
       lpItem->lParam = lpLVItem->lParam;
-    }
-
+    
     if (lpLVItem->mask & LVIF_INDENT)
-    {
       lpItem->iIndent = lpLVItem->iIndent;
-    }
-
-    if (lpLVItem->mask & LVIF_TEXT)
-    {
-      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA)
+
+    if (lpLVItem->mask & LVIF_TEXT) 
+    {
+      if (lpLVItem->pszText == LPSTR_TEXTCALLBACKW) 
       {
         if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
-        {
           return FALSE;
-        }
-
-        if ((lpItem->pszText != NULL) &&
-            (lpItem->pszText != LPSTR_TEXTCALLBACKA))
-        {
+
+        if (is_textW(lpItem->pszText))
           COMCTL32_Free(lpItem->pszText);
-        }
-
-        lpItem->pszText = LPSTR_TEXTCALLBACKA;
+    
+        lpItem->pszText = LPSTR_TEXTCALLBACKW;
       }
-      else
-      {
-        if (lpItem->pszText == LPSTR_TEXTCALLBACKA)
-        {
-          lpItem->pszText = NULL;
-        }
-
-        bResult = Str_SetPtrA(&lpItem->pszText, lpLVItem->pszText);
-      }
+      else 
+        bResult = textsetptrT(&lpItem->pszText, lpLVItem->pszText, isW);
     }
   }
@@ -2468 +2719 @@
  * [O] LISTVIEW_SUBITEM *: destination subitem
  * [I] LPLVITEM : source subitem
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -2473 +2725 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_InitSubItem(HWND hwnd, LISTVIEW_SUBITEM *lpSubItem,
-                                   LPLVITEMA lpLVItem)
-{
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+static BOOL LISTVIEW_InitSubItemT(HWND hwnd, LISTVIEW_SUBITEM *lpSubItem, 
+                                  LPLVITEMW lpLVItem, BOOL isW)
+{
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   BOOL bResult = FALSE;
-
+  
+  TRACE("(hwnd=%x, lpSubItem=%p, lpLVItem=%s, isW=%d)\n", 
+        hwnd, lpSubItem, debuglvitem_t(lpLVItem, isW), isW);
+  
   if ((lpSubItem != NULL) && (lpLVItem != NULL))
   {
@@ -2488 +2743 @@
 
       if (lpLVItem->mask & LVIF_IMAGE)
+        lpSubItem->iImage = lpLVItem->iImage;
+      
+      if (lpLVItem->mask & LVIF_TEXT) 
       {
-        lpSubItem->iImage = lpLVItem->iImage;
-      }
-
-      if (lpLVItem->mask & LVIF_TEXT)
-      {
-        if (lpLVItem->pszText == LPSTR_TEXTCALLBACKA)
+        if (lpLVItem->pszText == LPSTR_TEXTCALLBACKW) 
         {
           if ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
-          {
             return FALSE;
-          }
-
-          if ((lpSubItem->pszText != NULL) &&
-              (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
-          {
+
+          if (is_textW(lpSubItem->pszText))
             COMCTL32_Free(lpSubItem->pszText);
-          }
-
-          lpSubItem->pszText = LPSTR_TEXTCALLBACKA;
+    
+          lpSubItem->pszText = LPSTR_TEXTCALLBACKW;
         }
-        else
-        {
-          if (lpSubItem->pszText == LPSTR_TEXTCALLBACKA)
-          {
-            lpSubItem->pszText = NULL;
-          }
-#ifdef __WIN32OS2__
-          else {
-             //No need to change anything if text is the same
-             if(lpSubItem->pszText && !strcmp(lpSubItem->pszText, lpLVItem->pszText)) {
-                 return FALSE;
-             }
-          }
-#endif
-          bResult = Str_SetPtrA(&lpSubItem->pszText, lpLVItem->pszText);
-        }
+        else 
+          bResult = textsetptrT(&lpSubItem->pszText, lpLVItem->pszText, isW);
       }
     }
@@ -2535 +2769 @@
  * DESCRIPTION:
  * Adds a subitem at a given position (column index).
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new subitem atttributes
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new subitem atttributes 
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -2544 +2779 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_AddSubItem(HWND hwnd, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static BOOL LISTVIEW_AddSubItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LISTVIEW_SUBITEM *lpSubItem = NULL;
   BOOL bResult = FALSE;
   HDPA hdpaSubItems;
   INT nPosition, nItem;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+
+  TRACE("(hwnd=%x, lpLVItem=%s, isW=%d)\n", hwnd, debuglvitem_t(lpLVItem, isW), isW);
+  
   if (lStyle & LVS_OWNERDATA)
     return FALSE;
@@ -2564 +2801 @@
       if (lpSubItem != NULL)
       {
-    ZeroMemory(lpSubItem, sizeof(LISTVIEW_SUBITEM));
-        if (LISTVIEW_InitSubItem(hwnd, lpSubItem, lpLVItem) != FALSE)
+        ZeroMemory(lpSubItem, sizeof(LISTVIEW_SUBITEM));
+        if (LISTVIEW_InitSubItemT(hwnd, lpSubItem, lpLVItem, isW))
         {
-          nPosition = LISTVIEW_FindInsertPosition(hdpaSubItems,
+          nPosition = LISTVIEW_FindInsertPosition(hdpaSubItems, 
                                                   lpSubItem->iSubItem);
           nItem = DPA_InsertPtr(hdpaSubItems, nPosition, lpSubItem);
-          if (nItem != -1)
-          {
-            bResult = TRUE;
-          }
+          if (nItem != -1) bResult = TRUE;
         }
       }
     }
   }
-
-  /* cleanup if unsuccessful */
-  if ((bResult == FALSE) && (lpSubItem != NULL))
-  {
-    COMCTL32_Free(lpSubItem);
-  }
-
+  
+  /* cleanup if unsuccessful */   
+  if (!bResult && lpSubItem) COMCTL32_Free(lpSubItem);
+  
   return bResult;
 }
@@ -2591 +2822 @@
  * DESCRIPTION:
  * Finds the dpa insert position (array index).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2608 +2839 @@
   {
     lpSubItem = (LISTVIEW_SUBITEM *)DPA_GetPtr(hdpaSubItems, i);
-    if (lpSubItem != NULL)
-    {
-      if (lpSubItem->iSubItem > nSubItem)
-      {
-        return i;
-      }
-    }
+    if (lpSubItem && lpSubItem->iSubItem > nSubItem)
+      return i;
   }
 
@@ -2623 +2849 @@
  * DESCRIPTION:
  * Retrieves a listview subitem at a given position (column index).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2643 +2869 @@
     {
       if (lpSubItem->iSubItem == nSubItem)
-      {
         return lpSubItem;
-      }
       else if (lpSubItem->iSubItem > nSubItem)
-      {
         return NULL;
-      }
-    }
-  }
-
+    }
+  }
+  
   return NULL;
 }
@@ -2659 +2881 @@
  * DESCRIPTION:
  * Sets item attributes.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new item atttributes
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new item atttributes 
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -2668 +2891 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_SetItem(HWND hwnd, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static BOOL LISTVIEW_SetMainItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   BOOL bResult = FALSE;
   HDPA hdpaSubItems;
   LISTVIEW_ITEM *lpItem;
   NMLISTVIEW nmlv;
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uChanged;
   UINT uView = lStyle & LVS_TYPEMASK;
@@ -2682 +2904 @@
   RECT rcItem;
 
+  TRACE("(hwnd=%x, lpLVItem=%s, isW=%d)\n", hwnd, debuglvitem_t(lpLVItem, isW), isW);
+    
   if (lStyle & LVS_OWNERDATA)
   {
     if ((lpLVItem->iSubItem == 0)&&(lpLVItem->mask == LVIF_STATE))
     {
-      LVITEMA itm;
-
-      ZeroMemory(&itm,sizeof(LVITEMA));
+      LVITEMW itm;
+
+      ZeroMemory(&itm, sizeof(itm));
       itm.mask = LVIF_STATE | LVIF_PARAM;
       itm.stateMask = LVIS_FOCUSED | LVIS_SELECTED;
       itm.iItem = lpLVItem->iItem;
       itm.iSubItem = 0;
-      ListView_GetItemA(hwnd,&itm);
-
+      ListView_GetItemW(hwnd, &itm);
+      
 
       ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-      nmlv.hdr.hwndFrom = hwnd;
-      nmlv.hdr.idFrom = lCtrlId;
-      nmlv.hdr.code = LVN_ITEMCHANGING;
       nmlv.uNewState = lpLVItem->state;
       nmlv.uOldState = itm.state;
@@ -2706 +2927 @@
       nmlv.iItem = lpLVItem->iItem;
 
-      if ((itm.state & lpLVItem->stateMask) !=
+      if ((itm.state & lpLVItem->stateMask) != 
           (lpLVItem->state & lpLVItem->stateMask))
       {
         /* send LVN_ITEMCHANGING notification */
-        if (!ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv))
+        if (!listview_notify(hwnd, LVN_ITEMCHANGING, &nmlv))
         {
           if (lpLVItem->stateMask & LVIS_FOCUSED)
@@ -2723 +2944 @@
             if (lpLVItem->state & LVIS_SELECTED)
             {
-                if (lStyle & LVS_SINGLESEL)
-                {
-                  LISTVIEW_RemoveAllSelections(hwnd);
-                }
+              if (lStyle & LVS_SINGLESEL) LISTVIEW_RemoveAllSelections(hwnd);
               LISTVIEW_AddSelectionRange(hwnd,lpLVItem->iItem,lpLVItem->iItem);
             }
@@ -2734 +2952 @@
           }
 
-          nmlv.hdr.code = LVN_ITEMCHANGED;
-
-          ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
-
-      rcItem.left = LVIR_BOUNDS;
-      LISTVIEW_GetItemRect(hwnd, lpLVItem->iItem, &rcItem);
+          listview_notify(hwnd, LVN_ITEMCHANGED, &nmlv);
+
+          rcItem.left = LVIR_BOUNDS;
+          LISTVIEW_GetItemRect(hwnd, lpLVItem->iItem, &rcItem);
 #ifdef __WIN32OS2__
-          if(lStyle & LVS_OWNERDRAWFIXED && rcItem.left == REPORT_MARGINX) {
-              rcItem.left = 0;
-          }
+            if(lStyle & LVS_OWNERDRAWFIXED && rcItem.left == REPORT_MARGINX) {
+               rcItem.left = 0;
+            }
 #endif
-      InvalidateRect(hwnd, &rcItem, TRUE);
+          InvalidateRect(hwnd, &rcItem, TRUE);
         }
       }
@@ -2764 +2980 @@
         {
           ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-          nmlv.hdr.hwndFrom = hwnd;
-          nmlv.hdr.idFrom = lCtrlId;
-          nmlv.hdr.code = LVN_ITEMCHANGING;
           nmlv.lParam = lpItem->lParam;
 #ifdef __WIN32OS2__
-          uChanged = LISTVIEW_GetItemChanges(lpItem, lpLVItem, lStyle);
+          uChanged = LISTVIEW_GetItemChangesT(lpItem, lpLVItem, isW, lStyle);
 #else
-          uChanged = LISTVIEW_GetItemChanges(lpItem, lpLVItem);
+          uChanged = LISTVIEW_GetItemChangesT(lpItem, lpLVItem, isW);
 #endif
           if (uChanged != 0)
@@ -2789 +3002 @@
                  */
                 if (lStyle & LVS_SINGLESEL)
-                {
                   LISTVIEW_RemoveAllSelections(hwnd);
-                }
-
-            LISTVIEW_AddSelectionRange(hwnd,lpLVItem->iItem,
+
+                LISTVIEW_AddSelectionRange(hwnd,lpLVItem->iItem,
                                              lpLVItem->iItem);
               }
@@ -2801 +3012 @@
                                               lpLVItem->iItem);
               }
-          if (nmlv.uNewState & LVIS_FOCUSED)
+              if (nmlv.uNewState & LVIS_FOCUSED)
               {
                 /*
                  * This is a fun hoop to jump to try to catch if
                  * the user is calling us directly to call focus or if
-                 * this function is being called as a result of a
-                 * SetItemFocus call.
+                 * this function is being called as a result of a 
+                 * SetItemFocus call. 
                  */
 #ifdef __WIN32OS2__
@@ -2820 +3031 @@
                   LISTVIEW_SetItemFocus(hwnd, lpLVItem->iItem);
 #endif
-              }
+              }           
             }
-
+            
             nmlv.uChanged = uChanged;
             nmlv.iItem = lpLVItem->iItem;
             nmlv.lParam = lpItem->lParam;
             /* send LVN_ITEMCHANGING notification */
-            ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
+            listview_notify(hwnd, LVN_ITEMCHANGING, &nmlv);
 
             /* copy information */
-            bResult = LISTVIEW_InitItem(hwnd, lpItem, lpLVItem);
+            bResult = LISTVIEW_InitItemT(hwnd, lpItem, lpLVItem, isW);
 
             /* if LVS_LIST or LVS_SMALLICON, update the width of the items
@@ -2836 +3047 @@
             if((uView == LVS_LIST) || (uView == LVS_SMALLICON))
             {
-              item_width = LISTVIEW_GetStringWidthA(hwnd, lpItem->pszText);
+              item_width = LISTVIEW_GetStringWidthT(hwnd, lpItem->pszText, TRUE);
 
               if(item_width > infoPtr->nItemWidth)
@@ -2843 +3054 @@
 
             /* send LVN_ITEMCHANGED notification */
-            nmlv.hdr.code = LVN_ITEMCHANGED;
-            ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
+            listview_notify(hwnd, LVN_ITEMCHANGED, &nmlv);
           }
           else
@@ -2850 +3060 @@
             bResult = TRUE;
           }
-
+          
           if (uChanged)
           {
             rcItem.left = LVIR_BOUNDS;
-        LISTVIEW_GetItemRect(hwnd, lpLVItem->iItem, &rcItem);
+            LISTVIEW_GetItemRect(hwnd, lpLVItem->iItem, &rcItem);
 #ifdef __WIN32OS2__
             if(lStyle & LVS_OWNERDRAWFIXED && rcItem.left == REPORT_MARGINX) {
@@ -2873 +3083 @@
  * DESCRIPTION:
  * Sets subitem attributes.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : new subitem atttributes
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new subitem atttributes 
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -2882 +3093 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_SetSubItem(HWND hwnd, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static BOOL LISTVIEW_SetSubItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   BOOL bResult = FALSE;
   HDPA hdpaSubItems;
   LISTVIEW_SUBITEM *lpSubItem;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   RECT rcItem;
 
+  TRACE("(hwnd=%x, lpLVItem=%s, isW=%d)\n", hwnd, debuglvitem_t(lpLVItem, isW), isW);
+  
   if (lStyle & LVS_OWNERDATA)
     return FALSE;
@@ -2906 +3119 @@
           lpSubItem = LISTVIEW_GetSubItem(hdpaSubItems, lpLVItem->iSubItem);
           if (lpSubItem != NULL)
-          {
-            bResult = LISTVIEW_InitSubItem(hwnd, lpSubItem, lpLVItem);
-          }
+            bResult = LISTVIEW_InitSubItemT(hwnd, lpSubItem, lpLVItem, isW);
           else
-          {
-            bResult = LISTVIEW_AddSubItem(hwnd, lpLVItem);
-          }
-
+            bResult = LISTVIEW_AddSubItemT(hwnd, lpLVItem, isW);
 #ifdef __WIN32OS2__
           if(bResult) {
 #endif
           rcItem.left = LVIR_BOUNDS;
-      LISTVIEW_GetItemRect(hwnd, lpLVItem->iItem, &rcItem);
-      InvalidateRect(hwnd, &rcItem, FALSE);
+          LISTVIEW_GetItemRect(hwnd, lpLVItem->iItem, &rcItem);
+          InvalidateRect(hwnd, &rcItem, FALSE);
 #ifdef __WIN32OS2__
           }
 #endif
-        }
+        } 
       }
     }
@@ -2933 +3141 @@
 /***
  * DESCRIPTION:
+ * Sets item attributes.
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEM : new item atttributes 
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static BOOL LISTVIEW_SetItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  if (!lpLVItem || lpLVItem->iItem < 0 || 
+      lpLVItem->iItem>=GETITEMCOUNT(infoPtr))
+    return FALSE;
+  if (lpLVItem->iSubItem == 0)
+    return LISTVIEW_SetMainItemT(hwnd, lpLVItem, isW);
+  else
+    return LISTVIEW_SetSubItemT(hwnd, lpLVItem, isW);
+}
+
+/***
+ * DESCRIPTION:
  * Retrieves the index of the item at coordinate (0, 0) of the client area.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2943 +3177 @@
 static INT LISTVIEW_GetTopIndex(HWND hwnd)
 {
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
   INT nItem = 0;
@@ -2951 +3185 @@
   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);
-      }
-    }
+    if ((lStyle & WS_HSCROLL) && GetScrollInfo(hwnd, SB_HORZ, &scrollInfo))
+      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 ((lStyle & WS_VSCROLL) && GetScrollInfo(hwnd, SB_VERT, &scrollInfo))
+      nItem = scrollInfo.nPos;
+  }
+  
   return nItem;
 }
@@ -2979 +3203 @@
  * DESCRIPTION:
  * Draws a subitem.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -2990 +3214 @@
  * None
  */
-static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem,
+static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem, 
                                  RECT rcItem, BOOL Selected)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  CHAR szDispText[DISP_TEXT_SIZE];
-  LVITEMA lvItem;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); 
+  WCHAR szDispText[DISP_TEXT_SIZE];
+  LVITEMW lvItem;
+  LVCOLUMNW lvColumn;
   UINT textoutOptions = ETO_CLIPPED | ETO_OPAQUE;
   RECT rcTemp;
+  INT textLeft;
+  INT nLabelWidth = 0;
 
   TRACE("(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d)\n", hwnd, hdc,
@@ -3003 +3230 @@
 
   /* get information needed for drawing the item */
-  ZeroMemory(&lvItem, sizeof(LVITEMA));
+  ZeroMemory(&lvItem, sizeof(lvItem));
   lvItem.mask = LVIF_TEXT;
   lvItem.iItem = nItem;
@@ -3009 +3236 @@
   lvItem.cchTextMax = DISP_TEXT_SIZE;
   lvItem.pszText = szDispText;
-  LISTVIEW_GetItemA(hwnd, &lvItem, TRUE);
+  *lvItem.pszText = '\0';
+  LISTVIEW_GetItemW(hwnd, &lvItem, TRUE);
+  TRACE("   lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
+  
+  ZeroMemory(&lvColumn, sizeof(lvColumn));
+  lvColumn.mask = LVCF_FMT;
+  LISTVIEW_GetColumnT(hwnd, nSubItem, &lvColumn, TRUE);
+  textLeft = rcItem.left;
+  if (lvColumn.fmt != LVCFMT_LEFT)
+  {
+    if ((nLabelWidth = LISTVIEW_GetStringWidthT(hwnd, lvItem.pszText, TRUE)))
+    {
+      if (lvColumn.fmt == LVCFMT_RIGHT)
+        textLeft = rcItem.right - nLabelWidth;
+      else
+        textLeft = rcItem.left + (rcItem.right-rcItem.left-nLabelWidth)/2;
+    }
+  }
+    
 
   /* redraw the background of the item */
   rcTemp = rcItem;
   if(infoPtr->nColumnCount == (nSubItem + 1))
-    rcTemp.right = infoPtr->rcList.right;
+    rcTemp.right  = infoPtr->rcList.right;
   else
-    rcTemp.right+=WIDTH_PADDING;
+    rcTemp.right += WIDTH_PADDING;
 
   LISTVIEW_FillBackground(hwnd, hdc, &rcTemp);
@@ -3050 +3295 @@
   }
 
-  ExtTextOutA(hdc, rcItem.left, rcItem.top, textoutOptions,
-              &rcItem, lvItem.pszText, lstrlenA(lvItem.pszText), NULL);
+  ExtTextOutW(hdc, textLeft, rcItem.top, textoutOptions, 
+              &rcItem, lvItem.pszText, lstrlenW(lvItem.pszText), NULL);
 
   if (Selected)
@@ -3062 +3307 @@
       rec.left = rec.right;
       rec.right = rec.left+REPORT_MARGINX;
-      ExtTextOutA(hdc, rec.left , rec.top, textoutOptions,
+      ExtTextOutW(hdc, rec.left , rec.top, textoutOptions,
         &rec, NULL, 0, NULL);
     }
@@ -3068 +3313 @@
     rec.right = rec.left;
     rec.left = rec.left - REPORT_MARGINX;
-    ExtTextOutA(hdc, rec.left , rec.top, textoutOptions,
+    ExtTextOutW(hdc, rec.left , rec.top, textoutOptions,
     &rec, NULL, 0, NULL);
   }
@@ -3077 +3322 @@
  * DESCRIPTION:
  * Draws an item.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3089 +3334 @@
 static VOID LISTVIEW_DrawItem(HWND hwnd, HDC hdc, INT nItem, RECT rcItem, BOOL FullSelect, RECT* SuggestedFocus)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  CHAR szDispText[DISP_TEXT_SIZE];
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); 
+  WCHAR szDispText[DISP_TEXT_SIZE];
   INT nLabelWidth;
-  LVITEMA lvItem;
+  LVITEMW lvItem;
   INT nMixMode;
   DWORD dwBkColor;
@@ -3105 +3350 @@
 
   /* get information needed for drawing the item */
-  ZeroMemory(&lvItem, sizeof(LVITEMA));
+  ZeroMemory(&lvItem, sizeof(lvItem));
   lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE | LVIF_INDENT;
   lvItem.stateMask = LVIS_SELECTED |  LVIS_STATEIMAGEMASK;
@@ -3112 +3357 @@
   lvItem.cchTextMax = DISP_TEXT_SIZE;
   lvItem.pszText = szDispText;
-  LISTVIEW_GetItemA(hwnd, &lvItem, TRUE);
+  *lvItem.pszText = '\0';
+  LISTVIEW_GetItemW(hwnd, &lvItem, TRUE);
+  TRACE("   lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
 
   /* redraw the background of the item */
@@ -3126 +3373 @@
   if (lvItem.iIndent>0 && infoPtr->iconSize.cx > 0)
   {
-    rcItem.left += infoPtr->iconSize.cx * lvItem.iIndent;
+    rcItem.left += infoPtr->iconSize.cx * lvItem.iIndent; 
 
     if (SuggestedFocus)
       SuggestedFocus->left += infoPtr->iconSize.cx * lvItem.iIndent;
-  }
+  } 
 
   /* state icons */
   if (infoPtr->himlState != NULL)
   {
-     UINT uStateImage = (lvItem.state & LVIS_STATEIMAGEMASK) >> 12;
+     UINT uStateImage = (lvItem.state & LVIS_STATEIMAGEMASK) >> 12; 
      if (uStateImage > 0)
      {
-       ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, rcItem.left,
+       ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, rcItem.left, 
                       rcItem.top, ILD_NORMAL);
      }
-
-     rcItem.left += infoPtr->iconSize.cx;
+ 
+     rcItem.left += infoPtr->iconSize.cx; 
      if (SuggestedFocus)
        SuggestedFocus->left += infoPtr->iconSize.cx;
      bImage = TRUE;
   }
-
+  
   /* small icons */
   if (infoPtr->himlSmall != NULL)
@@ -3155 +3402 @@
     {
       ImageList_SetBkColor(infoPtr->himlSmall, CLR_NONE);
-      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left,
+      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left, 
                      rcItem.top, ILD_SELECTED);
     }
@@ -3161 +3408 @@
     {
       ImageList_SetBkColor(infoPtr->himlSmall, CLR_NONE);
-      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left,
+      ImageList_Draw(infoPtr->himlSmall, lvItem.iImage, hdc, rcItem.left, 
                      rcItem.top, ILD_NORMAL);
     }
-
-    rcItem.left += infoPtr->iconSize.cx;
+    
+    rcItem.left += infoPtr->iconSize.cx; 
 
     if (SuggestedFocus)
@@ -3178 +3425 @@
   if ((lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus != FALSE))
   {
-    /* set item colors */
+    /* set item colors */ 
     dwBkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
     dwTextColor = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
@@ -3184 +3431 @@
     nMixMode = SetROP2(hdc, R2_XORPEN);
   }
-  else if ((GetWindowLongA(hwnd, GWL_STYLE) & LVS_SHOWSELALWAYS) &&
+  else if ((GetWindowLongW(hwnd, GWL_STYLE) & LVS_SHOWSELALWAYS) && 
            (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus == FALSE))
   {
@@ -3211 +3458 @@
     nMixMode = SetROP2(hdc, R2_COPYPEN);
   }
-
-  nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText);
+  
+  nLabelWidth = ListView_GetStringWidthW(hwnd, lvItem.pszText);
   if (rcItem.left + nLabelWidth < rcItem.right)
   {
@@ -3220 +3467 @@
       rcItem.right += IMAGE_PADDING;
   }
-
-  /* draw label */
+  
+  /* draw label */  
   dwTextX = rcItem.left + 1;
   if (bImage)
@@ -3227 +3474 @@
 
   if (lvItem.pszText)
-    ExtTextOutA(hdc, dwTextX, rcItem.top, textoutOptions,
-                &rcItem, lvItem.pszText, lstrlenA(lvItem.pszText), NULL);
+    ExtTextOutW(hdc, dwTextX, rcItem.top, textoutOptions,
+                &rcItem, lvItem.pszText, lstrlenW(lvItem.pszText), NULL);
 
   if ((FullSelect)&&(Header_GetItemCount(infoPtr->hwndHeader) > 1))
@@ -3237 +3484 @@
     rec.left = rec.right;
     rec.right = rec.left+REPORT_MARGINX;
-    ExtTextOutA(hdc, rec.left , rec.top, textoutOptions,
+    ExtTextOutW(hdc, rec.left , rec.top, textoutOptions, 
     &rec, NULL, 0, NULL);
   }
-
+  
   if (!FullSelect)
       CopyRect(SuggestedFocus,&rcItem);
@@ -3257 +3504 @@
  * DESCRIPTION:
  * Draws an item when in large icon display mode.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] HDC : device context handle
- * [I] LISTVIEW_ITEM * : item
  * [I] INT : item index
- * [I] RECT * : clipping rectangle
+ * [I] RECT : clipping rectangle
+ * [O] RECT * : The text rectangle about which to draw the focus
  *
  * RETURN:
@@ -3271 +3518 @@
                                    RECT *SuggestedFocus)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  CHAR szDispText[DISP_TEXT_SIZE];
-  INT nDrawPosX = rcItem.left;
-  INT nLabelWidth, rcWidth;
-  TEXTMETRICA tm;
-  LVITEMA lvItem;
-  UINT textoutOptions = ETO_CLIPPED | ETO_OPAQUE;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); 
+  WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
+  LVITEMW lvItem;
+  UINT uFormat = DT_TOP | DT_CENTER | DT_WORDBREAK | DT_NOPREFIX |
+                 DT_EDITCONTROL ;
+  /* Maintain this format in line with the one in LISTVIEW_UpdateLargeItemLabelRect*/
   RECT rcTemp;
 
   TRACE("(hwnd=%x, hdc=%x, nItem=%d, left=%d, top=%d, right=%d, bottom=%d)\n",
-        hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right,
-        rcItem.bottom);
+        hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right, rcItem.bottom);
 
   /* get information needed for drawing the item */
-  ZeroMemory(&lvItem, sizeof(LVITEMA));
+  ZeroMemory(&lvItem, sizeof(lvItem));
   lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
   lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
@@ -3292 +3537 @@
   lvItem.cchTextMax = DISP_TEXT_SIZE;
   lvItem.pszText = szDispText;
-  LISTVIEW_GetItemA(hwnd, &lvItem, TRUE);
+  *lvItem.pszText = '\0';
+  LISTVIEW_GetItemW(hwnd, &lvItem, FALSE);
+  TRACE("   lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
 
   /* redraw the background of the item */
@@ -3300 +3547 @@
   else
     rcTemp.right+=WIDTH_PADDING;
-
+    /* The comment doesn't say WIDTH_PADDING applies to large icons */
+  
+  TRACE("background rect (%d,%d)-(%d,%d)\n",
+        rcTemp.left, rcTemp.top, rcTemp.right, rcTemp.bottom);
+  
   LISTVIEW_FillBackground(hwnd, hdc, &rcTemp);
 
+
+  /* Figure out text colours etc. depending on state
+   * At least the following states exist; there may be more.
+   * Many items may be selected
+   * At most one item may have the focus
+   * The application may not actually be active currently
+   * 1. The item is not selected in any way
+   * 2. The cursor is flying over the icon or text and the text is being 
+   *    expanded because it is not fully displayed currently.
+   * 3. The item is selected and is focussed, i.e. the user has not clicked
+   *    in the blank area of the window, and the window (or application?)
+   *    still has the focus.
+   * 4. As 3 except that a different window has the focus
+   * 5. The item is the selected item of all the items, but the user has
+   *    clicked somewhere else on the window.
+   * Only a few of these are handled currently. In particular 2 is not yet
+   * handled since we do not support the functionality currently (or at least
+   * we didn't when I wrote this)
+   */
+
   if (lvItem.state & LVIS_SELECTED)
   {
-    /* set item colors */
+    /* set item colors */ 
     SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
     SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
+    SetBkMode (hdc, OPAQUE);
     /* set raster mode */
     SetROP2(hdc, R2_XORPEN);
+    /* When exactly is it in XOR? while being dragged? */
   }
   else
@@ -3317 +3590 @@
     {
        SetBkMode(hdc, TRANSPARENT);
-       textoutOptions &= ~ETO_OPAQUE;
     }
     else
@@ -3330 +3602 @@
   }
 
+  /* In cases 2,3 and 5 (see above) the full text is displayed, with word
+   * wrapping and long words split.
+   * In cases 1 and 4 only a portion of the text is displayed with word
+   * wrapping and both word and end ellipsis.  (I don't yet know about path
+   * ellipsis)
+   */
+  uFormat |= ( (lvItem.state & LVIS_FOCUSED) && infoPtr->bFocus) ?
+          DT_NOCLIP
+      :
+          DT_WORD_ELLIPSIS | DT_END_ELLIPSIS;
+
+  /* draw the icon */
   if (infoPtr->himlNormal != NULL)
   {
-    rcItem.top += ICON_TOP_PADDING;
-    nDrawPosX += (infoPtr->iconSpacing.cx - infoPtr->iconSize.cx) / 2;
-    if ((lvItem.state & LVIS_SELECTED) && (lvItem.iImage>=0))
-    {
-      ImageList_Draw(infoPtr->himlNormal, lvItem.iImage, hdc, nDrawPosX,
-                     rcItem.top, ILD_SELECTED);
-    }
-    else if (lvItem.iImage>=0)
-    {
-      ImageList_Draw(infoPtr->himlNormal, lvItem.iImage, hdc, nDrawPosX,
-                     rcItem.top, ILD_NORMAL);
-    }
-  }
+    if (lvItem.iImage >= 0)
+    {
+      ImageList_Draw (infoPtr->himlNormal, lvItem.iImage, hdc, rcItem.left, 
+                      rcItem.top,
+                      (lvItem.state & LVIS_SELECTED) ? ILD_SELECTED : ILD_NORMAL);
+    }
+  }
+
+  /* Draw the text below the icon */
 
   /* Don't bother painting item being edited */
-  if (infoPtr->hwndEdit && lvItem.state & LVIS_FOCUSED)
+  if ((infoPtr->hwndEdit && (lvItem.state & LVIS_FOCUSED)) ||
+      !lstrlenW(lvItem.pszText))
+  {
+    SetRectEmpty(SuggestedFocus);
     return;
-
+  }
+
+  /* Since rcItem.left is left point of icon, compute left point of item box */
+  rcItem.left -= ((infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2);
+  rcItem.right = rcItem.left + infoPtr->nItemWidth;
+  rcItem.bottom = rcItem.top + infoPtr->nItemHeight;
+  TRACE("bound box for text+icon (%d,%d)-(%d,%d), iS.cx=%ld, nItemWidth=%d\n",
+        rcItem.left, rcItem.top, rcItem.right, rcItem.bottom,
+        infoPtr->iconSize.cx, infoPtr->nItemWidth);
+  TRACE("rcList (%d,%d)-(%d,%d), rcView (%d,%d)-(%d,%d)\n",
+        infoPtr->rcList.left,    infoPtr->rcList.top,
+        infoPtr->rcList.right,   infoPtr->rcList.bottom,
+        infoPtr->rcView.left,    infoPtr->rcView.top,
+        infoPtr->rcView.right,   infoPtr->rcView.bottom);
+  
   InflateRect(&rcItem, -(2*CAPTION_BORDER), 0);
-  rcItem.top += infoPtr->iconSize.cy + ICON_BOTTOM_PADDING;
-  nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText);
-  GetTextMetricsA(hdc, &tm);
-
-  /* append an ellipse ('...') if the caption won't fit in the rect */
-  rcWidth = max(0, rcItem.right - rcItem.left);
-  if (nLabelWidth > rcWidth)
-  {
-      INT i, len, eos, nCharsFit;
-      /* give or take a couple, how many average sized chars would fit? */
-      nCharsFit = tm.tmAveCharWidth > 0 ? (rcWidth/tm.tmAveCharWidth)+2 : 0;
-      /* place the ellipse accordingly, without overrunning the buffer */
-      len = strlen(szDispText);
-      eos = min((nCharsFit > 1 && nCharsFit < len) ? nCharsFit+3 : len+2,
-                sizeof(szDispText)-1);
-
-      nLabelWidth = ListView_GetStringWidthA(hwnd, szDispText);
-      while ((nLabelWidth > rcWidth) && (eos > 3))
-      {
-     for (i = 1; i < 4; i++)
-        szDispText[eos-i] = '.';
-         /* shift the ellipse one char to the left for each iteration */
-         szDispText[eos--] = '\0';
-         nLabelWidth = ListView_GetStringWidthA(hwnd, szDispText);
-      }
-  }
-
-  InflateRect(&rcItem, 2*CAPTION_BORDER, 0);
-  nDrawPosX = infoPtr->iconSpacing.cx - 2*CAPTION_BORDER - nLabelWidth;
-  if (nDrawPosX > 1)
-  {
-    rcItem.left += nDrawPosX / 2;
-    rcItem.right = rcItem.left + nLabelWidth + 2*CAPTION_BORDER;
-  }
-  else
-  {
-    rcItem.left += 1;
-    rcItem.right = rcItem.left + infoPtr->iconSpacing.cx - 1;
-  }
-
-  /* draw label */
-  rcItem.bottom = rcItem.top + tm.tmHeight + HEIGHT_PADDING;
-
-  ExtTextOutA(hdc, rcItem.left + CAPTION_BORDER, rcItem.top, textoutOptions,
-              &rcItem, lvItem.pszText, lstrlenA(lvItem.pszText), NULL);
-
-
-  CopyRect(SuggestedFocus,&rcItem);
+  rcItem.top += infoPtr->iconSize.cy + ICON_BOTTOM_PADDING; 
+
+
+  /* draw label */  
+
+  /* I am sure of most of the uFormat values.  However I am not sure about
+   * whether we need or do not need the following:
+   * DT_EXTERNALLEADING, DT_INTERNAL, DT_CALCRECT, DT_NOFULLWIDTHCHARBREAK,
+   * DT_PATH_ELLIPSIS, DT_RTLREADING, 
+   * We certainly do not need
+   * DT_BOTTOM, DT_VCENTER, DT_MODIFYSTRING, DT_LEFT, DT_RIGHT, DT_PREFIXONLY,
+   * DT_SINGLELINE, DT_TABSTOP, DT_EXPANDTABS
+   */
+
+  /* If the text is being drawn without clipping (i.e. the full text) then we
+   * need to jump through a few hoops to ensure that it all gets displayed and
+   * that the background is complete
+   */
+  if (uFormat & DT_NOCLIP)
+  {
+      RECT rcBack=rcItem;
+      HBRUSH hBrush = CreateSolidBrush(GetBkColor (hdc));
+      int dx, dy, old_wid, new_wid;
+      DrawTextW (hdc, lvItem.pszText, -1, &rcItem, uFormat | DT_CALCRECT);
+      /* Microsoft, in their great wisdom, have decided that the rectangle
+       * returned by DrawText on DT_CALCRECT will only guarantee the dimension,
+       * not the location.  So we have to do the centring ourselves (and take
+       * responsibility for agreeing off-by-one consistency with them).
+       */
+      old_wid = rcItem.right-rcItem.left;
+      new_wid = rcBack.right - rcBack.left;
+      dx = rcBack.left - rcItem.left + (new_wid-old_wid)/2;
+      dy = rcBack.top - rcItem.top;
+      OffsetRect (&rcItem, dx, dy);
+      FillRect(hdc, &rcItem, hBrush);
+      DeleteObject(hBrush);
+  }
+  /* else ? What if we are losing the focus? will we not get a complete 
+   * background?
+   */
+  DrawTextW (hdc, lvItem.pszText, -1, &rcItem, uFormat);
+
+  CopyRect(SuggestedFocus, &rcItem);
 }
 
@@ -3404 +3696 @@
  * DESCRIPTION:
  * Draws listview items when in report display mode.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle 
  *
  * RETURN:
@@ -3414 +3706 @@
 static VOID LISTVIEW_RefreshReport(HWND hwnd, HDC hdc, DWORD cdmode)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd,0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd,0);
   SCROLLINFO scrollInfo;
   INT nDrawPosY = infoPtr->rcList.top;
@@ -3424 +3716 @@
   BOOL FullSelected;
   DWORD cditemmode = CDRF_DODEFAULT;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   INT scrollOffset;
 
@@ -3438 +3730 @@
 
   /* send cache hint notification */
-  if (GetWindowLongA(hwnd,GWL_STYLE) & LVS_OWNERDATA)
+  if (GetWindowLongW(hwnd,GWL_STYLE) & LVS_OWNERDATA)
   {
     NMLVCACHEHINT nmlv;
 
     nmlv.hdr.hwndFrom = hwnd;
-    nmlv.hdr.idFrom = GetWindowLongA(hwnd,GWL_ID);
+    nmlv.hdr.idFrom = GetWindowLongW(hwnd,GWL_ID);
     nmlv.hdr.code = LVN_ODCACHEHINT;
     nmlv.iFrom = nItem;
     nmlv.iTo   = nLast;
 
-    SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)nmlv.hdr.idFrom,
+    SendMessageW(GetParent(hwnd), WM_NOTIFY, (WPARAM)nmlv.hdr.idFrom,
                  (LPARAM)&nmlv);
   }
@@ -3475 +3767 @@
     if (lStyle & LVS_OWNERDRAWFIXED)
     {
-        UINT uID = GetWindowLongA( hwnd, GWL_ID);
+        UINT uID = GetWindowLongW( hwnd, GWL_ID);
         DRAWITEMSTRUCT dis;
-        LVITEMA item;
+        LVITEMW item;
         RECT br;
 
-        TRACE("Owner Drawn\n");
+        TRACE("Owner Drawn\n");    
         dis.CtlType = ODT_LISTVIEW;
         dis.CtlID = uID;
@@ -3486 +3778 @@
         dis.itemAction = ODA_DRAWENTIRE;
         dis.itemState = 0;
-
+       
         if (LISTVIEW_IsSelected(hwnd,nItem)) dis.itemState|=ODS_SELECTED;
         if (nItem==infoPtr->nFocusedItem)   dis.itemState|=ODS_FOCUS;
@@ -3495 +3787 @@
         Header_GetItemRect(infoPtr->hwndHeader, nColumnCount-1, &br);
 
-        dis.rcItem.left = -scrollOffset;
+        dis.rcItem.left = -scrollOffset; 
         dis.rcItem.right = max(dis.rcItem.left, br.right - scrollOffset);
         dis.rcItem.top = nDrawPosY;
         dis.rcItem.bottom = dis.rcItem.top + infoPtr->nItemHeight;
-
-        ZeroMemory(&item,sizeof(LVITEMA));
+       
+        ZeroMemory(&item,sizeof(item));
         item.iItem = nItem;
         item.mask = LVIF_PARAM;
-        ListView_GetItemA(hwnd,&item);
+        ListView_GetItemW(hwnd, &item);
 
         dis.itemData = item.lParam;
 
-        if (SendMessageA(GetParent(hwnd),WM_DRAWITEM,(WPARAM)uID,(LPARAM)&dis))
+        if (SendMessageW(GetParent(hwnd),WM_DRAWITEM,(WPARAM)uID,(LPARAM)&dis))
         {
           nDrawPosY += infoPtr->nItemHeight;
@@ -3525 +3817 @@
       ir.top = nDrawPosY;
       ir.bottom = ir.top + infoPtr->nItemHeight;
-
+      
       CopyRect(&SuggestedFocusRect,&ir);
     }
@@ -3551 +3843 @@
       {
         LISTVIEW_DrawItem(hwnd, hdc, nItem, rcItem, FullSelected,
-                          &SuggestedFocusRect);
+                          &SuggestedFocusRect); 
       }
-      else
+      else 
       {
-        LISTVIEW_DrawSubItem(hwnd, hdc, nItem, j, rcItem,
-                              FullSelected);
+        LISTVIEW_DrawSubItem(hwnd, hdc, nItem, j, rcItem, FullSelected);
       }
 
       if (cditemmode & CDRF_NOTIFYPOSTPAINT)
-        LISTVIEW_SendCustomDrawItemNotify(hwnd, hdc, nItem, 0,
-                      CDDS_ITEMPOSTPAINT);
+        LISTVIEW_SendCustomDrawItemNotify(hwnd, hdc, nItem, 0, 
+                                      CDDS_ITEMPOSTPAINT);
     }
     /*
@@ -3572 +3863 @@
         rop = SetROP2(hdc, R2_XORPEN);
 
-      Rectangle(hdc, SuggestedFocusRect.left, SuggestedFocusRect.top,
-                SuggestedFocusRect.right,SuggestedFocusRect.bottom);
+      Rectangle(hdc, SuggestedFocusRect.left, SuggestedFocusRect.top, 
+                SuggestedFocusRect.right,SuggestedFocusRect.bottom); 
 
       if (rop)
@@ -3585 +3876 @@
  * DESCRIPTION:
  * Retrieves the number of items that can fit vertically in the client area.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3594 +3885 @@
 static INT LISTVIEW_GetCountPerRow(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd,0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd,0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left;
   INT nCountPerRow = 1;
@@ -3601 +3892 @@
   if (nListWidth > 0)
   {
-    if (uView == LVS_REPORT)
-    {
-      nCountPerRow = 1;
-    }
-    else
+    if (uView != LVS_REPORT)
     {
       nCountPerRow =  nListWidth / infoPtr->nItemWidth;
-      if (nCountPerRow == 0)
-      {
-        nCountPerRow = 1;
-      }
+      if (nCountPerRow == 0) nCountPerRow = 1;
     }
   }
@@ -3620 +3904 @@
 /***
  * DESCRIPTION:
- * Retrieves the number of items that can fit horizontally in the client
+ * Retrieves the number of items that can fit horizontally in the client 
  * area.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3631 +3915 @@
 static INT LISTVIEW_GetCountPerColumn(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd,0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd,0);
   INT nListHeight = infoPtr->rcList.bottom - infoPtr->rcList.top;
   INT nCountPerColumn = 1;
@@ -3643 +3927 @@
   {
     nCountPerColumn =  nListHeight / infoPtr->nItemHeight;
-    if (nCountPerColumn == 0)
-    {
-      nCountPerColumn = 1;
-    }
+    if (nCountPerColumn == 0) nCountPerColumn = 1;
   }
 
@@ -3654 +3935 @@
 /***
  * DESCRIPTION:
- * Retrieves the number of columns needed to display all the items when in
+ * Retrieves the number of columns needed to display all the items when in 
  * list display mode.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3665 +3946 @@
 static INT LISTVIEW_GetColumnCount(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   INT nColumnCount = 0;
 
   if ((lStyle & LVS_TYPEMASK) == LVS_LIST)
   {
-    if (infoPtr->rcList.right % infoPtr->nItemWidth == 0)
-    {
-      nColumnCount = infoPtr->rcList.right / infoPtr->nItemWidth;
-    }
-    else
-    {
-      nColumnCount = infoPtr->rcList.right / infoPtr->nItemWidth + 1;
-    }
+    nColumnCount = infoPtr->rcList.right / infoPtr->nItemWidth;
+    if (infoPtr->rcList.right % infoPtr->nItemWidth) nColumnCount++;
   }
 
   return nColumnCount;
-}
-
+}  
+  
 
 /***
  * DESCRIPTION:
  * Draws listview items when in list display mode.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle 
  *
  * RETURN:
@@ -3698 +3973 @@
 static VOID LISTVIEW_RefreshList(HWND hwnd, HDC hdc, DWORD cdmode)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   RECT rcItem, FocusRect, rcTemp;
   INT i, j;
@@ -3744 +4019 @@
        */
       if (LISTVIEW_GetItemState(hwnd,nItem,LVIS_FOCUSED) && infoPtr->bFocus)
-      Rectangle(hdc, FocusRect.left, FocusRect.top,
+      Rectangle(hdc, FocusRect.left, FocusRect.top, 
                 FocusRect.right,FocusRect.bottom);
 
       if (cditemmode & CDRF_NOTIFYPOSTPAINT)
-        LISTVIEW_SendCustomDrawItemNotify(hwnd, hdc, nItem, 0,
+        LISTVIEW_SendCustomDrawItemNotify(hwnd, hdc, nItem, 0, 
                                           CDDS_ITEMPOSTPAINT);
-
+ 
     }
   }
@@ -3758 +4033 @@
  * DESCRIPTION:
  * Draws listview items when in icon or small icon display mode.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle 
  *
  * RETURN:
@@ -3768 +4043 @@
 static VOID LISTVIEW_RefreshIcon(HWND hwnd, HDC hdc, BOOL bSmall, DWORD cdmode)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   POINT ptPosition;
   POINT ptOrigin;
@@ -3798 +4073 @@
     ptPosition.x += ptOrigin.x;
     ptPosition.y += ptOrigin.y;
-
+      
     if (ptPosition.y + infoPtr->nItemHeight > infoPtr->rcList.top)
     {
@@ -3811 +4086 @@
             rcItem.bottom = rcItem.top + infoPtr->nItemHeight;
             rcItem.right = rcItem.left + infoPtr->nItemWidth;
-            if (bSmall == FALSE)
-            {
+            if (bSmall)
+              LISTVIEW_DrawItem(hwnd, hdc, i, rcItem, FALSE, &SuggestedFocus);
+            else
               LISTVIEW_DrawLargeItem(hwnd, hdc, i, rcItem, &SuggestedFocus);
-            }
-            else
-            {
-              LISTVIEW_DrawItem(hwnd, hdc, i, rcItem, FALSE, &SuggestedFocus);
-            }
             /*
              * Draw Focus Rect
              */
-            if (LISTVIEW_GetItemState(hwnd,i,LVIS_FOCUSED) &&
-                infoPtr->bFocus)
-              Rectangle(hdc, SuggestedFocus.left, SuggestedFocus.top,
-                    SuggestedFocus.right,SuggestedFocus.bottom);
+            if (LISTVIEW_GetItemState(hwnd,i,LVIS_FOCUSED) && 
+                infoPtr->bFocus && !IsRectEmpty(&SuggestedFocus))
+              Rectangle(hdc, SuggestedFocus.left, SuggestedFocus.top, 
+                        SuggestedFocus.right,SuggestedFocus.bottom); 
           }
         }
@@ -3831 +4102 @@
     }
     if (cditemmode & CDRF_NOTIFYPOSTPAINT)
-        LISTVIEW_SendCustomDrawItemNotify(hwnd, hdc, i, 0,
+        LISTVIEW_SendCustomDrawItemNotify(hwnd, hdc, i, 0, 
                                           CDDS_ITEMPOSTPAINT);
   }
@@ -3839 +4110 @@
  * DESCRIPTION:
  * Draws listview items.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] HDC : device context handle
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] HDC : device context handle 
  *
  * RETURN:
@@ -3849 +4120 @@
 static VOID LISTVIEW_Refresh(HWND hwnd, HDC hdc)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   HFONT hOldFont;
   HPEN hPen, hOldPen;
@@ -3860 +4131 @@
 #endif
 
+  LISTVIEW_DumpListview (infoPtr, __LINE__);
+
   GetClientRect(hwnd, &rect);
   cdmode = LISTVIEW_SendCustomDrawNotify(hwnd,CDDS_PREPAINT,hdc,rect);
@@ -3873 +4146 @@
 
   /* select transparent brush (for drawing the focus box) */
-  SelectObject(hdc, GetStockObject(NULL_BRUSH));
+  SelectObject(hdc, GetStockObject(NULL_BRUSH)); 
 
   if (uView == LVS_LIST)
-  {
-    LISTVIEW_RefreshList(hwnd, hdc, cdmode);
-  }
+    LISTVIEW_RefreshList(hwnd, hdc, cdmode); 
   else if (uView == LVS_REPORT)
-  {
     LISTVIEW_RefreshReport(hwnd, hdc, cdmode);
-  }
   else if (uView == LVS_SMALLICON)
-  {
     LISTVIEW_RefreshIcon(hwnd, hdc, TRUE, cdmode);
-  }
   else if (uView == LVS_ICON)
-  {
     LISTVIEW_RefreshIcon(hwnd, hdc, FALSE, cdmode);
-  }
 
   /* unselect objects */
   SelectObject(hdc, hOldFont);
   SelectObject(hdc, hOldPen);
-
+  
   /* delete pen */
   DeleteObject(hPen);
-
+ 
   if (cdmode & CDRF_NOTIFYPOSTPAINT)
       LISTVIEW_SendCustomDrawNotify(hwnd, CDDS_POSTPAINT, hdc, rect);
@@ -3907 +4172 @@
  * DESCRIPTION:
  * Calculates the approximate width and height of a given number of items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -3917 +4182 @@
  * Returns a DWORD. The width in the low word and the height in high word.
  */
-static LRESULT LISTVIEW_ApproximateViewRect(HWND hwnd, INT nItemCount,
+static LRESULT LISTVIEW_ApproximateViewRect(HWND hwnd, INT nItemCount, 
                                             WORD wWidth, WORD wHeight)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nItemCountPerColumn = 1;
   INT nColumnCount = 0;
@@ -3927 +4192 @@
 
   if (nItemCount == -1)
-  {
     nItemCount = GETITEMCOUNT(infoPtr);
-  }
 
   if (uView == LVS_LIST)
@@ -3940 +4203 @@
 
     if (wHeight < infoPtr->nItemHeight)
-    {
       wHeight = infoPtr->nItemHeight;
-    }
 
     if (nItemCount > 0)
@@ -3950 +4211 @@
         nItemCountPerColumn = wHeight / infoPtr->nItemHeight;
         if (nItemCountPerColumn == 0)
-        {
           nItemCountPerColumn = 1;
-        }
-
+        
         if (nItemCount % nItemCountPerColumn != 0)
-        {
           nColumnCount = nItemCount / nItemCountPerColumn;
-        }
         else
-        {
           nColumnCount = nItemCount / nItemCountPerColumn + 1;
-        }
       }
     }
@@ -3972 +4227 @@
   }
   else if (uView == LVS_REPORT)
-  {
-    /* TO DO */
-  }
+    FIXME("uView == LVS_REPORT: not implemented\n"); 
   else if (uView == LVS_SMALLICON)
-  {
-    /* TO DO */
-  }
+    FIXME("uView == LVS_SMALLICON: not implemented\n"); 
   else if (uView == LVS_ICON)
-  {
-    /* TO DO */
-  }
-
+    FIXME("uView == LVS_ICON: not implemented\n"); 
+ 
   return dwViewRect;
 }
@@ -3990 +4239 @@
  * DESCRIPTION:
  * Arranges listview items in icon display mode.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4001 +4250 @@
 static LRESULT LISTVIEW_Arrange(HWND hwnd, INT nAlignCode)
 {
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK; 
   BOOL bResult = FALSE;
 
@@ -4009 +4258 @@
     {
     case LVA_ALIGNLEFT:
-      /* TO DO */
+      FIXME("nAlignCode=LVA_ALIGNLEFT: not implemented\n"); 
       break;
     case LVA_ALIGNTOP:
-      /* TO DO */
+      FIXME("nAlignCode=LVA_ALIGNTOP: not implemented\n"); 
       break;
     case LVA_DEFAULT:
-      /* TO DO */
+      FIXME("nAlignCode=LVA_DEFAULT: not implemented\n"); 
       break;
     case LVA_SNAPTOGRID:
-      /* TO DO */
+      FIXME("nAlignCode=LVA_SNAPTOGRID: not implemented\n"); 
       break;
     }
@@ -4032 +4281 @@
  * DESCRIPTION:
  * Removes all listview items and subitems.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4042 +4291 @@
 static LRESULT LISTVIEW_DeleteAllItems(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
   LISTVIEW_ITEM *lpItem;
@@ -4051 +4299 @@
   BOOL bSuppress;
   BOOL bResult = FALSE;
-  INT i;
-  INT j;
   HDPA hdpaSubItems;
 
@@ -4071 +4317 @@
   if (GETITEMCOUNT(infoPtr) > 0)
   {
-    /* initialize memory */
+    INT i, j;
+    
+    /* send LVN_DELETEALLITEMS notification */
+    /* verify if subsequent LVN_DELETEITEM notifications should be 
+       suppressed */
     ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-
-    /* send LVN_DELETEALLITEMS notification */
-    nmlv.hdr.hwndFrom = hwnd;
-    nmlv.hdr.idFrom = lCtrlId;
-    nmlv.hdr.code = LVN_DELETEALLITEMS;
     nmlv.iItem = -1;
-
-    /* verify if subsequent LVN_DELETEITEM notifications should be
-       suppressed */
-    bSuppress = ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
+    bSuppress = listview_notify(hwnd, LVN_DELETEALLITEMS, &nmlv);
 
     for (i = 0; i < GETITEMCOUNT(infoPtr); i++)
@@ -4095 +4337 @@
           {
             /* free subitem string */
-            if ((lpSubItem->pszText != NULL) &&
-                (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
-            {
+            if (is_textW(lpSubItem->pszText)) 
               COMCTL32_Free(lpSubItem->pszText);
-            }
-
+        
             /* free subitem */
             COMCTL32_Free(lpSubItem);
-          }
+          }    
         }
 
@@ -4109 +4348 @@
         if (lpItem != NULL)
         {
-          if (bSuppress == FALSE)
+          if (!bSuppress)
           {
             /* send LVN_DELETEITEM notification */
-            nmlv.hdr.code = LVN_DELETEITEM;
             nmlv.iItem = i;
             nmlv.lParam = lpItem->lParam;
-            ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
+            listview_notify(hwnd, LVN_DELETEITEM, &nmlv);
           }
 
           /* free item string */
-          if ((lpItem->pszText != NULL) &&
-              (lpItem->pszText != LPSTR_TEXTCALLBACKA))
-          {
+          if (is_textW(lpItem->pszText))
             COMCTL32_Free(lpItem->pszText);
-          }
-
+      
           /* free item */
           COMCTL32_Free(lpItem);
         }
-
+        
         DPA_Destroy(hdpaSubItems);
       }
@@ -4135 +4370 @@
     /* reinitialize listview memory */
     bResult = DPA_DeleteAllPtrs(infoPtr->hdpaItems);
-
+    
     /* align items (set position of each item) */
     if ((uView == LVS_ICON) || (uView == LVS_SMALLICON))
@@ -4148 +4383 @@
       }
     }
-
+    
     LISTVIEW_UpdateScroll(hwnd);
 
@@ -4154 +4389 @@
     InvalidateRect(hwnd, NULL, TRUE);
   }
-
+  
   return bResult;
 }
@@ -4161 +4396 @@
  * DESCRIPTION:
  * Removes a column from the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4172 +4407 @@
 static LRESULT LISTVIEW_DeleteColumn(HWND hwnd, INT nColumn)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
-  UINT uOwnerData = GetWindowLongA(hwnd, GWL_STYLE) & LVS_OWNERDATA;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  UINT uOwnerData = GetWindowLongW(hwnd, GWL_STYLE) & LVS_OWNERDATA;
   BOOL bResult = FALSE;
 
@@ -4202 +4437 @@
  * DESCRIPTION:
  * Removes an item from the listview control.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index  
  *
  * RETURN:
@@ -4213 +4448 @@
 static LRESULT LISTVIEW_DeleteItem(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  LONG lCtrlId = GetWindowLongW(hwnd, GWL_ID);
   NMLISTVIEW nmlv;
   BOOL bResult = FALSE;
@@ -4223 +4458 @@
   LISTVIEW_SUBITEM *lpSubItem;
   INT i;
-  LVITEMA item;
-
-  TRACE("(hwnd=%x,nItem=%d)\n", hwnd, nItem);
-
-
+  LVITEMW item;
+
+  TRACE("(hwnd=%x, nItem=%d)\n", hwnd, nItem);
+ 
+  
   /* First, send LVN_DELETEITEM notification. */
   memset(&nmlv, 0, sizeof (NMLISTVIEW));
@@ -4234 +4469 @@
   nmlv.hdr.code = LVN_DELETEITEM;
   nmlv.iItem = nItem;
-  SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId,
+  SendMessageW(GetParent(hwnd), WM_NOTIFY, (WPARAM)lCtrlId, 
                (LPARAM)&nmlv);
 
 
   /* remove it from the selection range */
-  ZeroMemory(&item,sizeof(LVITEMA));
+  ZeroMemory(&item,sizeof(item));
   item.stateMask = LVIS_SELECTED;
   LISTVIEW_SetItemState(hwnd,nItem,&item);
@@ -4264 +4499 @@
         {
           /* free item string */
-          if ((lpSubItem->pszText != NULL) &&
-              (lpSubItem->pszText != LPSTR_TEXTCALLBACKA))
-          {
+          if (is_textW(lpSubItem->pszText))
             COMCTL32_Free(lpSubItem->pszText);
-          }
-
+        
           /* free item */
           COMCTL32_Free(lpSubItem);
-        }
+        }    
       }
-
+  
       lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
       if (lpItem != NULL)
       {
         /* free item string */
-        if ((lpItem->pszText != NULL) &&
-            (lpItem->pszText != LPSTR_TEXTCALLBACKA))
-        {
+        if (is_textW(lpItem->pszText))
           COMCTL32_Free(lpItem->pszText);
-        }
-
+      
         /* free item */
         COMCTL32_Free(lpItem);
       }
-
+    
       bResult = DPA_Destroy(hdpaSubItems);
     }
@@ -4298 +4527 @@
     {
       if (lStyle & LVS_ALIGNLEFT)
-      {
         LISTVIEW_AlignLeft(hwnd);
-      }
       else
-      {
         LISTVIEW_AlignTop(hwnd);
-      }
     }
 
@@ -4312 +4537 @@
     InvalidateRect(hwnd, NULL, TRUE);
   }
-
+  
   return bResult;
 }
@@ -4330 +4555 @@
 static LRESULT LISTVIEW_GetEditControl(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   return infoPtr->hwndEdit;
 }
@@ -4343 +4568 @@
  * [I] LPSTR : modified text
  * [I] DWORD : item index
+ * [I] isW : TRUE if psxText is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -4348 +4574 @@
  *   FAILURE : FALSE
  */
-
-static BOOL LISTVIEW_EndEditLabel(HWND hwnd, LPSTR pszText, DWORD nItem)
-{
-  NMLVDISPINFOA dispInfo;
+static BOOL LISTVIEW_EndEditLabelT(HWND hwnd, LPWSTR pszText, DWORD nItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+  NMLVDISPINFOW dispInfo;
   LISTVIEW_ITEM *lpItem;
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   HDPA hdpaSubItems;
-  BOOL bUpdateItemText;
   LISTVIEW_ITEM lvItemRef;
-  LVITEMA item;
-
-  ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));
-
+  LVITEMW item;
+  BOOL bResult = TRUE;
+
+  TRACE("(hwnd=%x, pszText=%s, nItem=%ld, isW=%d)\n", hwnd, debugstr_t(pszText, isW), nItem, isW);
+  
   if (!(lStyle & LVS_OWNERDATA))
   {
-    if (NULL == (hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem)))
-      return FALSE;
-
-    if (NULL == (lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0)))
-      return FALSE;
+    if (!(hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem)))
+          return FALSE;
+
+    if (!(lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0)))
+          return FALSE;
   }
   else
   {
     ZeroMemory(&lvItemRef,sizeof(LISTVIEW_ITEM));
-    ZeroMemory(&item,sizeof(LVITEMA));
+    ZeroMemory(&item,sizeof(item));
     item.iItem = nItem;
     item.iSubItem = 0;
     item.mask = LVIF_PARAM | LVIF_STATE;
-    ListView_GetItemA(hwnd,&item);
+    ListView_GetItemW(hwnd, &item);
     lvItemRef.state = item.state;
     lvItemRef.iImage = item.iImage;
@@ -4385 +4609 @@
   }
 
-  dispInfo.hdr.hwndFrom = hwnd;
-  dispInfo.hdr.idFrom = nCtrlId;
-  dispInfo.hdr.code = LVN_ENDLABELEDITA;
+  ZeroMemory(&dispInfo, sizeof(dispInfo));
   dispInfo.item.mask = 0;
   dispInfo.item.iItem = nItem;
@@ -4393 +4615 @@
   dispInfo.item.stateMask = 0;
   dispInfo.item.pszText = pszText;
-  dispInfo.item.cchTextMax = pszText ? strlen(pszText) : 0;
+  dispInfo.item.cchTextMax = textlenT(pszText, isW);
   dispInfo.item.iImage = lpItem->iImage;
   dispInfo.item.lParam = lpItem->lParam;
   infoPtr->hwndEdit = 0;
 
-  bUpdateItemText = ListView_Notify(GetParent(hwnd), nCtrlId, &dispInfo);
-
   /* Do we need to update the Item Text */
-  if(bUpdateItemText)
-  {
-    if ((lpItem->pszText != LPSTR_TEXTCALLBACKA)&&(!(lStyle & LVS_OWNERDATA)))
-    {
-        Str_SetPtrA(&lpItem->pszText, pszText);
-    }
-  }
-
-  return TRUE;
-}
-
-/***
- * DESCRIPTION:
- * Begin in place editing of specified list view item
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
+  if(dispinfo_notifyT(hwnd, LVN_ENDLABELEDITW, &dispInfo, isW))
+    if (lpItem->pszText != LPSTR_TEXTCALLBACKW && !(lStyle & LVS_OWNERDATA))
+      bResult = textsetptrT(&lpItem->pszText, pszText, isW);
+  
+  return bResult;
+}
+
+/***
+ * DESCRIPTION:
+ * Callback implementation for editlabel control
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPSTR : modified text
+ * [I] DWORD : item index
  *
  * RETURN:
@@ -4424 +4641 @@
  *   FAILURE : FALSE
  */
-
-static HWND LISTVIEW_EditLabelA(HWND hwnd, INT nItem)
-{
-  NMLVDISPINFOA dispInfo;
+static BOOL LISTVIEW_EndEditLabelW(HWND hwnd, LPWSTR pszText, DWORD nItem)
+{
+    return LISTVIEW_EndEditLabelT(hwnd, pszText, nItem, TRUE);
+}
+
+/***
+ * DESCRIPTION:
+ * Callback implementation for editlabel control
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPSTR : modified text
+ * [I] DWORD : item index
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static BOOL LISTVIEW_EndEditLabelA(HWND hwnd, LPSTR pszText, DWORD nItem)
+{
+    return LISTVIEW_EndEditLabelT(hwnd, (LPWSTR)pszText, nItem, FALSE);
+}
+
+/***
+ * DESCRIPTION:
+ * Begin in place editing of specified list view item
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
+ * [I] isW : TRUE if it's a Unicode req, FALSE if ASCII
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static HWND LISTVIEW_EditLabelT(HWND hwnd, INT nItem, BOOL isW)
+{
+  NMLVDISPINFOW dispInfo;
   RECT rect;
   LISTVIEW_ITEM *lpItem;
-  HWND hedit;
-  HINSTANCE hinst = GetWindowLongA(hwnd, GWL_HINSTANCE);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  HWND hedit; 
+  HINSTANCE hinst = GetWindowLongW(hwnd, GWL_HINSTANCE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   HDPA hdpaSubItems;
-  CHAR szDispText[DISP_TEXT_SIZE];
-  LVITEMA lvItem,item;
+  WCHAR szDispText[DISP_TEXT_SIZE];
+  LVITEMW lvItem;
   LISTVIEW_ITEM lvItemRef;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-
-  if (~GetWindowLongA(hwnd, GWL_STYLE) & LVS_EDITLABELS)
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+ 
+  if (~GetWindowLongW(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);
 
-  ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));
   if (!(lStyle & LVS_OWNERDATA))
   {
     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;
+  } 
   else
   {
+    LVITEMW item;
     ZeroMemory(&lvItemRef,sizeof(LISTVIEW_ITEM));
-    ZeroMemory(&item,sizeof(LVITEMA));
+    ZeroMemory(&item, sizeof(item));
     item.iItem = nItem;
     item.iSubItem = 0;
     item.mask = LVIF_PARAM | LVIF_STATE;
-    ListView_GetItemA(hwnd,&item);
+    ListView_GetItemW(hwnd, &item);
     lvItemRef.iImage = item.iImage;
     lvItemRef.state = item.state;
@@ -4476 +4725 @@
 
   /* get information needed for drawing the item */
-  ZeroMemory(&lvItem, sizeof(LVITEMA));
+  ZeroMemory(&lvItem, sizeof(lvItem));
   lvItem.mask = LVIF_TEXT;
   lvItem.iItem = nItem;
@@ -4482 +4731 @@
   lvItem.cchTextMax = DISP_TEXT_SIZE;
   lvItem.pszText = szDispText;
-  ListView_GetItemA(hwnd, &lvItem);
-
-  dispInfo.hdr.hwndFrom = hwnd;
-  dispInfo.hdr.idFrom = nCtrlId;
-  dispInfo.hdr.code = LVN_BEGINLABELEDITA;
+  *lvItem.pszText = '\0';
+  LISTVIEW_GetItemT(hwnd, &lvItem, FALSE, isW);
+
+  ZeroMemory(&dispInfo, sizeof(dispInfo));
   dispInfo.item.mask = 0;
   dispInfo.item.iItem = nItem;
@@ -4492 +4740 @@
   dispInfo.item.stateMask = 0;
   dispInfo.item.pszText = lvItem.pszText;
-  dispInfo.item.cchTextMax = strlen(lvItem.pszText);
+  dispInfo.item.cchTextMax = lstrlenW(lvItem.pszText);
   dispInfo.item.iImage = lpItem->iImage;
   dispInfo.item.lParam = lpItem->lParam;
 
-  if (ListView_LVNotify(GetParent(hwnd), nCtrlId, &dispInfo))
-      return 0;
+  if (dispinfo_notifyT(hwnd, LVN_BEGINLABELEDITW, &dispInfo, isW))
+          return 0;
 
   rect.left = LVIR_LABEL;
   if (!LISTVIEW_GetItemRect(hwnd, nItem, &rect))
-      return 0;
-
-  if (!(hedit = CreateEditLabel(szDispText , WS_VISIBLE,
-         rect.left-2, rect.top-1, 0,
-         rect.bottom - rect.top+2,
-         hwnd, hinst, LISTVIEW_EndEditLabel, nItem)))
-     return 0;
+          return 0;
+ 
+  if (!(hedit = CreateEditLabelT(szDispText , WS_VISIBLE, 
+                 rect.left-2, rect.top-1, 0, rect.bottom - rect.top+2, hwnd, hinst, 
+                 isW ? LISTVIEW_EndEditLabelW : (EditlblCallbackW)LISTVIEW_EndEditLabelA,
+                 nItem, isW)))
+         return 0;
 
   infoPtr->hwndEdit = hedit;
-  SetFocus(hedit);
-  SendMessageA(hedit, EM_SETSEL, 0, -1);
+  SetFocus(hedit); 
+  SendMessageW(hedit, EM_SETSEL, 0, -1);
 
   return hedit;
@@ -4520 +4768 @@
  * DESCRIPTION:
  * Ensures the specified item is visible, scrolling into view if necessary.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4849 +5097 @@
 }
 #endif
+
 /***
  * DESCRIPTION:
  * Retrieves the nearest item, given a position and a direction.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -4863 +5112 @@
 static INT LISTVIEW_GetNearestItem(HWND hwnd, POINT pt, UINT vkDirection)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LVHITTESTINFO lvHitTestInfo;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LV_INTHIT lvIntHit;
   INT nItem = -1;
   RECT rcView;
 
+  TRACE("point %ld,%ld, direction %s\n", pt.x, pt.y,
+        (vkDirection == VK_DOWN) ? "VK_DOWN" :
+        ((vkDirection == VK_UP) ? "VK_UP" :
+        ((vkDirection == VK_LEFT) ? "VK_LEFT" : "VK_RIGHT")));
+
   if (LISTVIEW_GetViewRect(hwnd, &rcView) != FALSE)
   {
-    ZeroMemory(&lvHitTestInfo, sizeof(LVHITTESTINFO));
-    LISTVIEW_GetOrigin(hwnd, &lvHitTestInfo.pt);
-    lvHitTestInfo.pt.x += pt.x;
-    lvHitTestInfo.pt.y += pt.y;
-
-    do
-    {
-      if (vkDirection == VK_DOWN)
-      {
-        lvHitTestInfo.pt.y += infoPtr->nItemHeight;
-      }
-      else if (vkDirection == VK_UP)
-      {
-        lvHitTestInfo.pt.y -= infoPtr->nItemHeight;
-      }
-      else if (vkDirection == VK_LEFT)
-      {
-        lvHitTestInfo.pt.x -= infoPtr->nItemWidth;
-      }
-      else if (vkDirection == VK_RIGHT)
-      {
-        lvHitTestInfo.pt.x += infoPtr->nItemWidth;
-      }
-
-      if (PtInRect(&rcView, lvHitTestInfo.pt) == FALSE)
-      {
-        return -1;
-      }
-      else
-      {
-        nItem = LISTVIEW_HitTestItem(hwnd, &lvHitTestInfo, TRUE);
-      }
-
-    }
-    while (nItem == -1);
+    ZeroMemory(&lvIntHit, sizeof(lvIntHit));
+    LISTVIEW_GetOrigin(hwnd, &lvIntHit.ht.pt);
+    lvIntHit.ht.pt.x += pt.x;
+    lvIntHit.ht.pt.y += pt.y;
+    
+    if (vkDirection == VK_DOWN)
+      lvIntHit.ht.pt.y += infoPtr->nItemHeight;
+    else if (vkDirection == VK_UP)
+      lvIntHit.ht.pt.y -= infoPtr->nItemHeight;
+    else if (vkDirection == VK_LEFT)
+      lvIntHit.ht.pt.x -= infoPtr->nItemWidth;
+    else if (vkDirection == VK_RIGHT)
+      lvIntHit.ht.pt.x += infoPtr->nItemWidth;
+
+    if (PtInRect(&rcView, lvIntHit.ht.pt) == FALSE)
+      return -1;
+    else
+    {
+      nItem = LISTVIEW_SuperHitTestItem(hwnd, &lvIntHit, TRUE);
+      return nItem == -1 ? lvIntHit.iDistItem : nItem;
+    }
   }
 
   return nItem;
-}
+}  
 
 /***
  * DESCRIPTION:
  * Searches for an item with specific characteristics.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : base item index
- * [I] LPLVFINDINFO : item information to look for
- *
+ * 
+ * PARAMETER(S):
+ * [I] hwnd : window handle
+ * [I] nStart : base item index
+ * [I] lpFindInfo : item information to look for
+ * 
  * RETURN:
  *   SUCCESS : index of item
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_FindItem(HWND hwnd, INT nStart,
-                                 LPLVFINDINFO lpFindInfo)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static LRESULT LISTVIEW_FindItemW(HWND hwnd, INT nStart, 
+                                  LPLVFINDINFOW lpFindInfo)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   POINT ptItem;
-  CHAR szDispText[DISP_TEXT_SIZE];
-  LVITEMA lvItem;
+  WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
+  LVITEMW lvItem;
   BOOL bWrap = FALSE;
   INT nItem = nStart;
@@ -4936 +5176 @@
   if ((nItem >= -1) && (lpFindInfo != NULL))
   {
-    ZeroMemory(&lvItem, sizeof(LVITEMA));
+    ZeroMemory(&lvItem, sizeof(lvItem));
 
     if (lpFindInfo->flags & LVFI_PARAM)
@@ -4942 +5182 @@
       lvItem.mask |= LVIF_PARAM;
     }
-
-    if (lpFindInfo->flags & LVFI_STRING)
+    
+    if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL))
     {
       lvItem.mask |= LVIF_TEXT;
@@ -4950 +5190 @@
     }
 
-    if (lpFindInfo->flags & LVFI_PARTIAL)
-    {
-      lvItem.mask |= LVIF_TEXT;
-      lvItem.pszText = szDispText;
-      lvItem.cchTextMax = DISP_TEXT_SIZE;
-    }
-
     if (lpFindInfo->flags & LVFI_WRAP)
-    {
       bWrap = TRUE;
-    }
 
     if (lpFindInfo->flags & LVFI_NEARESTXY)
@@ -4974 +5205 @@
         if (lpFindInfo->flags & LVFI_NEARESTXY)
         {
-          nItem = LISTVIEW_GetNearestItem(hwnd, ptItem,
+          nItem = LISTVIEW_GetNearestItem(hwnd, ptItem, 
                                           lpFindInfo->vkDirection);
           if (nItem != -1)
@@ -4989 +5220 @@
           nItem++;
         }
-
+        
         lvItem.iItem = nItem;
         lvItem.iSubItem = 0;
-        if (LISTVIEW_GetItemA(hwnd, &lvItem, TRUE) != FALSE)
+        if (LISTVIEW_GetItemW(hwnd, &lvItem, TRUE))
         {
           if (lvItem.mask & LVIF_TEXT)
@@ -4998 +5229 @@
             if (lpFindInfo->flags & LVFI_PARTIAL)
             {
-              if (strstr(lvItem.pszText, lpFindInfo->psz) == NULL)
+              if (strstrW(lvItem.pszText, lpFindInfo->psz) == NULL)
                 continue;
             }
             else
             {
-              if (strcmp(lvItem.pszText, lpFindInfo->psz) != 0)
+              if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0)
                 continue;
             }
           }
-
+          
           if (lvItem.mask & LVIF_PARAM)
           {
@@ -5013 +5244 @@
               continue;
           }
-
+          
           return nItem;
         }
       }
 
-      if (bWrap != FALSE)
+      if (bWrap)
       {
         nItem = -1;
@@ -5027 +5258 @@
       {
         return -1;
-      }
-    }
-  }
-
- return -1;
+      }       
+    }
+  }
+
+ return -1; 
+}
+
+/***
+ * DESCRIPTION:
+ * Searches for an item with specific characteristics.
+ * 
+ * PARAMETER(S):
+ * [I] hwnd : window handle
+ * [I] nStart : base item index
+ * [I] lpFindInfo : item information to look for
+ * 
+ * RETURN:
+ *   SUCCESS : index of item
+ *   FAILURE : -1
+ */
+static LRESULT LISTVIEW_FindItemA(HWND hwnd, INT nStart, 
+                                  LPLVFINDINFOA lpFindInfo)
+{
+  BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL);
+  LVFINDINFOW fiw;
+  LRESULT res;
+  
+  memcpy(&fiw, lpFindInfo, sizeof(fiw));
+  if (hasText) fiw.psz = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE);
+  res = LISTVIEW_FindItemW(hwnd, nStart, &fiw);
+  if (hasText) textfreeT((LPWSTR)fiw.psz, FALSE);
+  return res;
 }
 
@@ -5037 +5295 @@
  * DESCRIPTION:
  * Retrieves the background color of the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5046 +5304 @@
 static LRESULT LISTVIEW_GetBkColor(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   return infoPtr->clrBk;
@@ -5054 +5312 @@
  * DESCRIPTION:
  * Retrieves the background image of the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5072 +5330 @@
  * DESCRIPTION:
  * Retrieves the callback mask.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5081 +5339 @@
 static UINT LISTVIEW_GetCallbackMask(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   return infoPtr->uCallbackMask;
@@ -5089 +5347 @@
  * DESCRIPTION:
  * Retrieves column attributes.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT :  column index
- * [IO] LPLVCOLUMNA : column information
+ * [IO] LPLVCOLUMNW : column information
+ * [I] isW : if TRUE, then lpColumn is a LPLVCOLUMNW
+ *           otherwise it is in fact a LPLVCOLUMNA
  *
  * RETURN:
@@ -5099 +5359 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetColumnA(HWND hwnd, INT nItem, LPLVCOLUMNA lpColumn)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  HDITEMA hdi;
+static LRESULT LISTVIEW_GetColumnT(HWND hwnd, INT nItem, LPLVCOLUMNW lpColumn, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  HDITEMW hdi;
   BOOL bResult = FALSE;
-
+  
   if (lpColumn != NULL)
   {
+
+    TRACE("(hwnd=%x, col=%d, lpColumn=%s, isW=%d)\n", 
+        hwnd, nItem, debuglvcolumn_t(lpColumn, isW), isW);
+
     /* initialize memory */
-    ZeroMemory(&hdi, sizeof(HDITEMA));
-
+    ZeroMemory(&hdi, sizeof(hdi));
+    
     if (lpColumn->mask & LVCF_FMT)
-    {
       hdi.mask |= HDI_FORMAT;
-    }
 
     if (lpColumn->mask & LVCF_WIDTH)
-    {
       hdi.mask |= HDI_WIDTH;
-    }
 
     if (lpColumn->mask & LVCF_TEXT)
@@ -5128 +5388 @@
 
     if (lpColumn->mask & LVCF_IMAGE)
-    {
       hdi.mask |= HDI_IMAGE;
-    }
 
     if (lpColumn->mask & LVCF_ORDER)
-    {
       hdi.mask |= HDI_ORDER;
-    }
-
-    bResult = Header_GetItemA(infoPtr->hwndHeader, nItem, &hdi);
+
+    if (isW)
+      bResult = Header_GetItemW(infoPtr->hwndHeader, nItem, &hdi);
+    else
+      bResult = Header_GetItemA(infoPtr->hwndHeader, nItem, &hdi);
+
     if (bResult != FALSE)
     {
-      if (lpColumn->mask & LVCF_FMT)
+      if (lpColumn->mask & LVCF_FMT) 
       {
         lpColumn->fmt = 0;
 
         if (hdi.fmt & HDF_LEFT)
-        {
           lpColumn->fmt |= LVCFMT_LEFT;
-        }
         else if (hdi.fmt & HDF_RIGHT)
-        {
           lpColumn->fmt |= LVCFMT_RIGHT;
-        }
         else if (hdi.fmt & HDF_CENTER)
-        {
           lpColumn->fmt |= LVCFMT_CENTER;
-        }
 
         if (hdi.fmt & HDF_IMAGE)
-        {
           lpColumn->fmt |= LVCFMT_COL_HAS_IMAGES;
-        }
-
-    if (hdi.fmt & HDF_BITMAP_ON_RIGHT)
-    {
-      lpColumn->fmt |= LVCFMT_BITMAP_ON_RIGHT;
-    }
+
+        if (hdi.fmt & HDF_BITMAP_ON_RIGHT)
+          lpColumn->fmt |= LVCFMT_BITMAP_ON_RIGHT;
       }
 
       if (lpColumn->mask & LVCF_WIDTH)
-      {
         lpColumn->cx = hdi.cxy;
-      }
-
+      
       if (lpColumn->mask & LVCF_IMAGE)
-      {
         lpColumn->iImage = hdi.iImage;
-      }
 
       if (lpColumn->mask & LVCF_ORDER)
-      {
         lpColumn->iOrder = hdi.iOrder;
-      }
     }
   }
@@ -5188 +5432 @@
 }
 
-/* LISTVIEW_GetColumnW */
-
 
 static LRESULT LISTVIEW_GetColumnOrderArray(HWND hwnd, INT iCount, LPINT lpiArray)
 {
-/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); */
+/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); */
     INT i;
 
     if (!lpiArray)
-    return FALSE;
+        return FALSE;
 
     /* little hack */
     for (i = 0; i < iCount; i++)
-    lpiArray[i] = i;
+        lpiArray[i] = i;
 
     return TRUE;
@@ -5209 +5451 @@
  * DESCRIPTION:
  * Retrieves the column width.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5216 +5458 @@
  * RETURN:
  *   SUCCESS : column width
- *   FAILURE : zero
+ *   FAILURE : zero 
  */
 static LRESULT LISTVIEW_GetColumnWidth(HWND hwnd, INT nColumn)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nColumnWidth = 0;
-  HDITEMA hdi;
+  HDITEMW hdi;
 
   if (uView == LVS_LIST)
@@ -5232 +5474 @@
   {
     /* get column width from header */
-    ZeroMemory(&hdi, sizeof(HDITEMA));
+    ZeroMemory(&hdi, sizeof(hdi));
     hdi.mask = HDI_WIDTH;
-    if (Header_GetItemA(infoPtr->hwndHeader, nColumn, &hdi) != FALSE)
-    {
+    if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi) != FALSE)
       nColumnWidth = hdi.cxy;
-    }
   }
 
@@ -5245 +5485 @@
 /***
  * DESCRIPTION:
- * In list or report display mode, retrieves the number of items that can fit
- * vertically in the visible area. In icon or small icon display mode,
+ * In list or report display mode, retrieves the number of items that can fit 
+ * vertically in the visible area. In icon or small icon display mode, 
  * retrieves the total number of visible items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5257 +5497 @@
 static LRESULT LISTVIEW_GetCountPerPage(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT nItemCount = 0;
 
@@ -5265 +5505 @@
     if (infoPtr->rcList.right > infoPtr->nItemWidth)
     {
-      nItemCount = LISTVIEW_GetCountPerRow(hwnd) *
+      nItemCount = LISTVIEW_GetCountPerRow(hwnd) * 
                    LISTVIEW_GetCountPerColumn(hwnd);
     }
@@ -5299 +5539 @@
 
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
-    return (0);
+    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0)))
+        return (0);
 
     return (infoPtr->dwExStyle);
@@ -5308 +5548 @@
  * DESCRIPTION:
  * Retrieves the handle to the header control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5317 +5557 @@
 static LRESULT LISTVIEW_GetHeader(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   return infoPtr->hwndHeader;
@@ -5338 +5578 @@
 static LRESULT LISTVIEW_GetHoverTime(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   return infoPtr->dwHoverTime;
@@ -5346 +5586 @@
  * DESCRIPTION:
  * Retrieves an image list handle.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : image list identifier
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : image list identifier 
+ * 
  * RETURN:
  *   SUCCESS : image list handle
@@ -5357 +5597 @@
 static LRESULT LISTVIEW_GetImageList(HWND hwnd, INT nImageList)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   HIMAGELIST himl = NULL;
 
-  switch (nImageList)
+  switch (nImageList) 
   {
   case LVSIL_NORMAL:
@@ -5381 +5621 @@
  * DESCRIPTION:
  * Retrieves item attributes.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [IO] LPLVITEMA : item info
+ * 
+ * PARAMETER(S):
+ * [I] hwnd : window handle
+ * [IO] lpLVItem : item info
  * [I] internal : if true then we will use tricks that avoid copies
  *               but are not compatible with the regular interface
- *
- * RETURN:
- *   SUCCESS : TRUE
+ * [I] isW : if TRUE, then lpLVItem is a LPLVITEMW, 
+ *           if FALSE, the lpLVItem is a LPLVITEMA.
+ * 
+ * RETURN:
+ *   SUCCESS : TRUE 
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_GetItemA(HWND hwnd, LPLVITEMA lpLVItem, BOOL internal)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  NMLVDISPINFOA dispInfo;
+static LRESULT LISTVIEW_GetItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL internal, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+  NMLVDISPINFOW dispInfo;
   LISTVIEW_SUBITEM *lpSubItem;
   LISTVIEW_ITEM *lpItem;
-  INT* piImage;
-  LPSTR* ppszText;
-  LPARAM *plParam;
   HDPA hdpaSubItems;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  void* null = NULL;
+  INT* piImage = (INT*)&null;
+  LPWSTR* ppszText= (LPWSTR*)&null;
+  LPARAM* plParam = (LPARAM*)&null;
+
+  if (internal && !isW)
+  {
+    ERR("We can't have internal non-Unicode GetItem!\n");
+    return FALSE;
+  }
+  
   /* In the following:
    * lpLVItem describes the information requested by the user
    * lpItem/lpSubItem is what we have
-   * dispInfo is a structure we use to request the missing
+   * dispInfo is a structure we use to request the missing 
    *     information from the application
    */
 
-  TRACE("(hwnd=%x, lpLVItem=%p)\n", hwnd, lpLVItem);
-
-  if ((lpLVItem == NULL) ||
-      (lpLVItem->iItem < 0) ||
-      (lpLVItem->iItem >= GETITEMCOUNT(infoPtr))
-     )
+  TRACE("(hwnd=%x, lpLVItem=%s, internal=%d, isW=%d)\n", 
+        hwnd, debuglvitem_t(lpLVItem, isW), internal, isW);
+
+  if ((lpLVItem == NULL) || (lpLVItem->iItem < 0) ||
+      (lpLVItem->iItem >= GETITEMCOUNT(infoPtr)))
     return FALSE;
 
+  ZeroMemory(&dispInfo, sizeof(dispInfo));
+
   if (lStyle & LVS_OWNERDATA)
   {
     if (lpLVItem->mask & ~LVIF_STATE)
     {
-      dispInfo.hdr.hwndFrom = hwnd;
-      dispInfo.hdr.idFrom = lCtrlId;
-      dispInfo.hdr.code = LVN_GETDISPINFOA;
-      memcpy(&dispInfo.item,lpLVItem,sizeof(LVITEMA));
-
-      ListView_Notify(GetParent(hwnd), lCtrlId, &dispInfo);
-      memcpy(lpLVItem,&dispInfo.item,sizeof(LVITEMA));
+      memcpy(&dispInfo.item, lpLVItem, sizeof(LVITEMW));
+      dispinfo_notifyT(hwnd, LVN_GETDISPINFOW, &dispInfo, isW);
+      memcpy(lpLVItem, &dispInfo.item, sizeof(LVITEMW));
+      TRACE("   getdispinfo(1):lpLVItem=%s\n", debuglvitem_t(lpLVItem, isW));
     }
 
     if ((lpLVItem->mask & LVIF_STATE)&&(lpLVItem->iSubItem == 0))
     {
-      lpLVItem->state = 0;
+      lpLVItem->state = 0; 
       if (infoPtr->nFocusedItem == lpLVItem->iItem)
         lpLVItem->state |= LVIS_FOCUSED;
@@ -5444 +5691 @@
   }
 
-
   hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem);
-  if (hdpaSubItems == NULL)
+  if (hdpaSubItems == NULL) return FALSE;
+
+  if ( (lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0)) == NULL)
     return FALSE;
 
-  lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
-  if (lpItem == NULL)
-    return FALSE;
-
-  ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));
+  ZeroMemory(&dispInfo.item, sizeof(LVITEMW));
   if (lpLVItem->iSubItem == 0)
   {
@@ -5459 +5703 @@
     ppszText=&lpItem->pszText;
     plParam=&lpItem->lParam;
-    if ((infoPtr->uCallbackMask != 0) && (lpLVItem->mask & LVIF_STATE))
-    {
+    if ((lpLVItem->mask & LVIF_STATE) && infoPtr->uCallbackMask)
+    {        
       dispInfo.item.mask |= LVIF_STATE;
-      dispInfo.item.stateMask = infoPtr->uCallbackMask;
+      dispInfo.item.stateMask = infoPtr->uCallbackMask; 
     }
   }
@@ -5472 +5716 @@
       piImage=&lpSubItem->iImage;
       ppszText=&lpSubItem->pszText;
-      plParam=NULL;
-    }
-    else
-    {
-      piImage=NULL;
-      ppszText=NULL;
-      plParam=NULL;
-    }
-  }
-
-  if ((lpLVItem->mask & LVIF_IMAGE) &&
-      ((piImage==NULL) || (*piImage == I_IMAGECALLBACK)))
+    }
+  }
+
+  if ((lpLVItem->mask & LVIF_IMAGE) && (*piImage==I_IMAGECALLBACK))
   {
     dispInfo.item.mask |= LVIF_IMAGE;
   }
 
-  if ((lpLVItem->mask & LVIF_TEXT) &&
-      ((ppszText==NULL) || (*ppszText == LPSTR_TEXTCALLBACKA)))
+  if ((lpLVItem->mask & LVIF_TEXT) && !is_textW(*ppszText))
   {
     dispInfo.item.mask |= LVIF_TEXT;
     dispInfo.item.pszText = lpLVItem->pszText;
     dispInfo.item.cchTextMax = lpLVItem->cchTextMax;
+    if (dispInfo.item.pszText && lpLVItem->cchTextMax > 0) 
+      *dispInfo.item.pszText = '\0';
+    if (dispInfo.item.pszText && (*ppszText == NULL))
+      *dispInfo.item.pszText = '\0';
   }
 
@@ -5499 +5738 @@
   {
     /* We don't have all the requested info, query the application */
-    dispInfo.hdr.hwndFrom = hwnd;
-    dispInfo.hdr.idFrom = lCtrlId;
-    dispInfo.hdr.code = LVN_GETDISPINFOA;
     dispInfo.item.iItem = lpLVItem->iItem;
     dispInfo.item.iSubItem = lpLVItem->iSubItem;
     dispInfo.item.lParam = lpItem->lParam;
-    ListView_Notify(GetParent(hwnd), lCtrlId, &dispInfo);
+    dispinfo_notifyT(hwnd, LVN_GETDISPINFOW, &dispInfo, isW);
+    TRACE("   getdispinfo(2):lpLVItem=%s\n", debuglvitem_t(&dispInfo.item, isW));
   }
 
@@ -5511 +5748 @@
   {
     lpLVItem->iImage = dispInfo.item.iImage;
-    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && piImage)
-    {
+    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && (*piImage==I_IMAGECALLBACK))
       *piImage = dispInfo.item.iImage;
-    }
   }
   else if (lpLVItem->mask & LVIF_IMAGE)
@@ -5524 +5759 @@
   {
     lpLVItem->lParam = dispInfo.item.lParam;
-    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && plParam)
-    {
+    if (dispInfo.item.mask & LVIF_DI_SETITEM)
       *plParam = dispInfo.item.lParam;
-    }
   }
   else if (lpLVItem->mask & LVIF_PARAM)
-  {
     lpLVItem->lParam = lpItem->lParam;
-  }
 
 #ifdef __WIN32OS2__
@@ -5542 +5773 @@
   if (dispInfo.item.mask & LVIF_TEXT)
   {
-    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && (ppszText != NULL))
-    {
-#ifdef __WIN32OS2__
-      dprintf(("LISTVIEW_GetItemA *ppszText (%x), dispInfo.item.pszText (%x);", *ppszText, dispInfo.item.pszText));
-      if (ppszText && (UINT)*ppszText != -1) {
-        Str_SetPtrA(ppszText, dispInfo.item.pszText);
-      } /* endif */
-#else
-      Str_SetPtrA(ppszText, dispInfo.item.pszText);
-#endif
-    }
+    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && *ppszText) 
+      textsetptrT(ppszText, dispInfo.item.pszText, isW);
+    
     /* If lpLVItem->pszText==dispInfo.item.pszText a copy is unnecessary, but */
     /* some apps give a new pointer in ListView_Notify so we can't be sure.  */
-    if (lpLVItem->pszText!=dispInfo.item.pszText) {
-      lstrcpynA(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
-    }
-
-    if (ppszText == NULL)
-    {
-       lstrcpynA(lpLVItem->pszText, "", lpLVItem->cchTextMax);
-    }
+    if (lpLVItem->pszText != dispInfo.item.pszText) 
+        textcpynT(lpLVItem->pszText, isW, dispInfo.item.pszText, isW, lpLVItem->cchTextMax);
+    
   }
   else if (lpLVItem->mask & LVIF_TEXT)
   {
-    if (internal==TRUE)
-    {
-      lpLVItem->pszText=*ppszText;
-    } else {
-      lstrcpynA(lpLVItem->pszText, *ppszText, lpLVItem->cchTextMax);
-    }
+    if (internal) lpLVItem->pszText = *ppszText;
+    else textcpynT(lpLVItem->pszText, isW, *ppszText, TRUE, lpLVItem->cchTextMax);
   }
 
@@ -5583 +5797 @@
 
       lpLVItem->state &= ~LVIS_SELECTED;
-      if ((dispInfo.item.stateMask & LVIS_SELECTED) &&
-         (LISTVIEW_IsSelected(hwnd,dispInfo.item.iItem)))
+      if ((dispInfo.item.stateMask & LVIS_SELECTED) && 
+          LISTVIEW_IsSelected(hwnd,dispInfo.item.iItem))
         lpLVItem->state |= LVIS_SELECTED;
     }
@@ -5592 +5806 @@
 
       lpLVItem->state &= ~LVIS_SELECTED;
-      if ((lpLVItem->stateMask & LVIS_SELECTED) &&
-          (LISTVIEW_IsSelected(hwnd,lpLVItem->iItem)))
+      if ((lpLVItem->stateMask & LVIS_SELECTED) && 
+          LISTVIEW_IsSelected(hwnd,lpLVItem->iItem))
          lpLVItem->state |= LVIS_SELECTED;
     }
 
     if (lpLVItem->mask & LVIF_PARAM)
-    {
       lpLVItem->lParam = lpItem->lParam;
-    }
 
     if (lpLVItem->mask & LVIF_INDENT)
-    {
       lpLVItem->iIndent = lpItem->iIndent;
-    }
   }
 
@@ -5611 +5821 @@
 }
 
-/* LISTVIEW_GetItemW */
 /* LISTVIEW_GetHotCursor */
 
@@ -5627 +5836 @@
 static LRESULT LISTVIEW_GetHotItem(HWND hwnd)
 {
-    LISTVIEW_INFO *infoPtr;
-
-    /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
-    return (-1);
-
-    return (infoPtr->nHotItem);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  return infoPtr->nHotItem;
 }
 
@@ -5641 +5846 @@
  * DESCRIPTION:
  * Retrieves the number of items in the listview control.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  * Number of items.
@@ -5650 +5855 @@
 static LRESULT LISTVIEW_GetItemCount(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   return GETITEMCOUNT(infoPtr);
@@ -5657 +5862 @@
 /***
  * DESCRIPTION:
- * Retrieves the position (upper-left) of the listview control item.
- *
+ * Retrieves the rectangle enclosing the item icon and text.
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
- * [O] LPPOINT : coordinate information
+ * [O] LPRECT : coordinate information
  *
  * RETURN:
@@ -5668 +5873 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem,
-                                     LPPOINT lpptPosition)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+static BOOL LISTVIEW_GetItemBoundBox(HWND hwnd, INT nItem, LPRECT lpRect)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+  UINT uView = lStyle & LVS_TYPEMASK;
   BOOL bResult = FALSE;
   HDPA hdpaSubItems;
@@ -5679 +5884 @@
   INT nRow;
 
-  TRACE("(hwnd=%x,nItem=%d,lpptPosition=%p)\n", hwnd, nItem,
-        lpptPosition);
-
-  if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) &&
-      (lpptPosition != NULL))
+  TRACE("(hwnd=%x,nItem=%d,lpRect=%p)\n", hwnd, nItem, lpRect);
+  
+  if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) && 
+      (lpRect != NULL))
   {
     if (uView == LVS_LIST)
@@ -5695 +5899 @@
         if (nRow == 0)
         {
-          lpptPosition->x = nItem / nCountPerColumn * infoPtr->nItemWidth;
-          lpptPosition->y = 0;
+          lpRect->left = nItem / nCountPerColumn * infoPtr->nItemWidth;
+          lpRect->top = 0;
         }
         else
         {
-          lpptPosition->x = (nItem / nCountPerColumn -1) * infoPtr->nItemWidth;
-          lpptPosition->y = (nRow + nCountPerColumn) * infoPtr->nItemHeight;
+          lpRect->left = (nItem / nCountPerColumn -1) * infoPtr->nItemWidth;
+          lpRect->top = (nRow + nCountPerColumn) * infoPtr->nItemHeight;
         }
       }
       else
       {
-        lpptPosition->x = nItem / nCountPerColumn * infoPtr->nItemWidth;
-        lpptPosition->y = nItem % nCountPerColumn * infoPtr->nItemHeight;
+        lpRect->left = nItem / nCountPerColumn * infoPtr->nItemWidth;
+        lpRect->top = nItem % nCountPerColumn * infoPtr->nItemHeight;
       }
     }
     else if (uView == LVS_REPORT)
     {
-      SCROLLINFO scrollInfo;
       bResult = TRUE;
-      lpptPosition->x = REPORT_MARGINX;
-      lpptPosition->y = ((nItem - ListView_GetTopIndex(hwnd)) *
+      lpRect->left = REPORT_MARGINX;
+      lpRect->top = ((nItem - ListView_GetTopIndex(hwnd)) * 
                          infoPtr->nItemHeight) + infoPtr->rcList.top;
 
-      /* Adjust position by scrollbar offset */
-      ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
-      scrollInfo.cbSize = sizeof(SCROLLINFO);
-      scrollInfo.fMask = SIF_POS;
-      GetScrollInfo(hwnd, SB_HORZ, &scrollInfo);
-      lpptPosition->x -= scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE;
-    }
-    else
-    {
-      hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem);
-      if (hdpaSubItems != NULL)
+      if (!(lStyle & LVS_NOSCROLL))
       {
-        lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
-        if (lpItem != NULL)
+        SCROLLINFO scrollInfo;
+        /* Adjust position by scrollbar offset */
+        ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
+        scrollInfo.cbSize = sizeof(SCROLLINFO);
+        scrollInfo.fMask = SIF_POS;
+        GetScrollInfo(hwnd, SB_HORZ, &scrollInfo);
+        lpRect->left -= scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE;
+      }
+    }
+    else /* either LVS_ICON or LVS_SMALLICON */
+    {
+      if ((hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem)))
+      {
+        if ((lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0)))
         {
           bResult = TRUE;
-          lpptPosition->x = lpItem->ptPosition.x;
-          lpptPosition->y = lpItem->ptPosition.y;
+          lpRect->left = lpItem->ptPosition.x;
+          lpRect->top = lpItem->ptPosition.y;
         }
       }
     }
   }
+  lpRect->right = lpRect->left + infoPtr->nItemWidth;
+  lpRect->bottom = lpRect->top + infoPtr->nItemHeight;
+  TRACE("result %s: (%d,%d)-(%d,%d)\n", bResult ? "TRUE" : "FALSE",
+        lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
   return bResult;
 }
@@ -5745 +5954 @@
 /***
  * DESCRIPTION:
+ * Retrieves the position (upper-left) of the listview control item.
+ * Note that for LVS_ICON style, the upper-left is that of the icon
+ * and not the bounding box.
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : item index
+ * [O] LPPOINT : coordinate information
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem, LPPOINT lpptPosition)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  BOOL bResult = FALSE;
+  RECT rcBounding;
+
+  TRACE("(hwnd=%x, nItem=%d, lpptPosition=%p)\n", hwnd, nItem, lpptPosition);
+
+  if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) &&
+      (lpptPosition != NULL))
+  {
+    bResult = LISTVIEW_GetItemBoundBox(hwnd, nItem, &rcBounding);
+    lpptPosition->x = rcBounding.left;
+    lpptPosition->y = rcBounding.top;
+    if (uView == LVS_ICON) 
+    {
+       lpptPosition->y += ICON_TOP_PADDING;
+       lpptPosition->x += (infoPtr->iconSpacing.cx - infoPtr->iconSize.cx) / 2;
+    }
+    TRACE("result %s (%ld,%ld)\n", bResult ? "TRUE" : "FALSE",
+          lpptPosition->x, lpptPosition->y);
+   }
+   return bResult;
+}
+
+/***
+ * Update the bounding rectangle around the text under a large icon.
+ * This depends on whether it has the focus or not.
+ * On entry the rectangle's top, left and right should be set.
+ * On return the bottom will also be set and the width may have been 
+ * modified.
+ *
+ * This appears to be weird, even in the Microsoft implementation.
+ */
+
+static void ListView_UpdateLargeItemLabelRect (
+        HWND hwnd,                    /* The window of the listview */
+        const LISTVIEW_INFO *infoPtr, /* The listview itself */
+        int nItem, /* The item for which we are calculating this */
+        RECT *rect) /* The rectangle to be updated */
+{
+    HDC hdc = GetDC (hwnd);
+    HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+
+    if (infoPtr->bFocus && infoPtr->nFocusedItem == nItem)
+    {
+        /* We (aim to) display the full text.  In Windows 95 it appears to 
+         * calculate the size assuming the specified font and then it draws
+         * the text in that region with the specified font except scaled to 
+         * 10 point (or the height of the system font or ...).  Thus if the
+         * window has 24 point Helvetica the highlit rectangle will be 
+         * taller than the text and if it is 7 point Helvetica then the text
+         * will be clipped.
+         * For now we will simply say that it is the correct size to display
+         * the text in the specified font.
+         */
+        LVITEMW lvItem;
+        lvItem.mask = LVIF_TEXT;
+        lvItem.iItem = nItem;
+        lvItem.iSubItem = 0;
+        /* We will specify INTERNAL and so will receive back a const
+         * pointer to the text, rather than specifying a buffer to which
+         * to copy it.
+         */
+        LISTVIEW_GetItemW (hwnd, &lvItem, TRUE);
+        DrawTextW (hdc, lvItem.pszText, -1, rect, DT_CALCRECT |
+                        DT_NOCLIP | DT_EDITCONTROL | DT_TOP | DT_CENTER |
+                        DT_WORDBREAK | DT_NOPREFIX);
+        /* Maintain this DT_* list in line with LISTVIEW_DrawLargeItem */
+    }
+    else
+    {
+        /* As far as I can see the text region seems to be trying to be
+         * "tall enough for two lines of text".  Once again (comctl32.dll ver
+         * 5.81?) it measures this on the basis of the selected font and then
+         * draws it with the same font except in 10 point size.  This can lead
+         * to more or less than the two rows appearing.
+         * Question; are we  supposed to be including DT_EXTERNALLEADING? 
+         * Question; should the width be shrunk to the space required to 
+         * display the two lines?
+         */
+        rect->bottom = rect->top + 2 * infoPtr->ntmHeight;
+    }
+
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (hwnd, hdc);
+}
+
+/***
+ * DESCRIPTION:
  * Retrieves the bounding rectangle for a listview control item.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -5759 +6072 @@
  *     LVIR_LABEL Returns the bounding rectangle of the item text.
  *     LVIR_SELECTBOUNDS Returns the union of the LVIR_ICON and LVIR_LABEL
- *  rectangles, but excludes columns in report view.
- *
+ *      rectangles, but excludes columns in report view.
+ * 
  * RETURN:
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
+ *
+ * NOTES
+ *   Note that the bounding rectangle of the label in the LVS_ICON view depends
+ *   upon whether the window has the focus currently and on whether the item
+ *   is the one with the focus.  Ensure that the control's record of which 
+ *   item has the focus agrees with the items' records.
  */
 static LRESULT LISTVIEW_GetItemRect(HWND hwnd, INT nItem, LPRECT lprc)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   BOOL bResult = FALSE;
   POINT ptOrigin;
   POINT ptItem;
-  HDC hdc;
-  HFONT hOldFont;
   INT nLeftPos;
   INT nLabelWidth;
   INT nIndent;
-  TEXTMETRICA tm;
-  LVITEMA lvItem;
+  LVITEMW lvItem;
+  RECT rcInternal;
 
   TRACE("(hwnd=%x, nItem=%d, lprc=%p)\n", hwnd, nItem, lprc);
@@ -5784 +6101 @@
   if (uView & LVS_REPORT)
   {
-    ZeroMemory(&lvItem, sizeof(LVITEMA));
+    ZeroMemory(&lvItem, sizeof(lvItem));
     lvItem.mask = LVIF_INDENT;
     lvItem.iItem = nItem;
     lvItem.iSubItem = 0;
-    LISTVIEW_GetItemA(hwnd, &lvItem, TRUE);
+    LISTVIEW_GetItemW(hwnd, &lvItem, TRUE);
 
     /* do indent */
     if (lvItem.iIndent>0 && infoPtr->iconSize.cx > 0)
-    {
-      nIndent = infoPtr->iconSize.cx * lvItem.iIndent;
-    }
+      nIndent = infoPtr->iconSize.cx * lvItem.iIndent; 
     else
-     nIndent = 0;
+      nIndent = 0;
   }
   else
     nIndent = 0;
-
+ 
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)) && (lprc != NULL))
   {
-    if (ListView_GetItemPosition(hwnd, nItem, &ptItem) != FALSE)
-    {
-      switch(lprc->left)
-      {
+      switch(lprc->left)  
+      {  
       case LVIR_ICON:
+        if (!ListView_GetItemPosition(hwnd, nItem, &ptItem)) break; 
         if (uView == LVS_ICON)
         {
@@ -5818 +6132 @@
               lprc->top = ptItem.y + ptOrigin.y;
               lprc->right = lprc->left + infoPtr->iconSize.cx;
-              lprc->bottom = (lprc->top + infoPtr->iconSize.cy +
+              lprc->bottom = (lprc->top + infoPtr->iconSize.cy + 
                               ICON_BOTTOM_PADDING + ICON_TOP_PADDING);
             }
@@ -5834 +6148 @@
             if (infoPtr->himlState != NULL)
               lprc->left += infoPtr->iconSize.cx;
-
+              
             if (infoPtr->himlSmall != NULL)
               lprc->right = lprc->left + infoPtr->iconSize.cx;
@@ -5841 +6155 @@
           }
         }
-        else
+        else 
         {
           bResult = TRUE;
@@ -5851 +6165 @@
 
           if (infoPtr->himlState != NULL)
-          {
             lprc->left += infoPtr->iconSize.cx;
-          }
-
+            
           if (infoPtr->himlSmall != NULL)
-          {
             lprc->right = lprc->left + infoPtr->iconSize.cx;
-          }
           else
-          {
             lprc->right = lprc->left;
-          }
         }
         break;
 
       case LVIR_LABEL:
+        if (!ListView_GetItemPosition(hwnd, nItem, &ptItem)) break;
         if (uView == LVS_ICON)
         {
@@ -5876 +6185 @@
               lprc->left = ptItem.x + ptOrigin.x;
               lprc->top = (ptItem.y + ptOrigin.y + infoPtr->iconSize.cy +
-                           ICON_BOTTOM_PADDING + ICON_TOP_PADDING);
+                           ICON_BOTTOM_PADDING);
               nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
               if (infoPtr->iconSpacing.cx - nLabelWidth > 1)
@@ -5887 +6196 @@
                 lprc->left += 1;
                 lprc->right = lprc->left + infoPtr->iconSpacing.cx - 1;
+                ListView_UpdateLargeItemLabelRect (hwnd, infoPtr, nItem, lprc);
               }
-
-              hdc = GetDC(hwnd);
-              hOldFont = SelectObject(hdc, infoPtr->hFont);
-              GetTextMetricsA(hdc, &tm);
-              lprc->bottom = lprc->top + tm.tmHeight + HEIGHT_PADDING;
-              SelectObject(hdc, hOldFont);
-              ReleaseDC(hwnd, hdc);
-            }
+            }              
           }
         }
@@ -5903 +6206 @@
           {
             bResult = TRUE;
-            nLeftPos = lprc->left = ptItem.x + ptOrigin.x;
+            nLeftPos = lprc->left = ptItem.x + ptOrigin.x; 
             lprc->top = ptItem.y + ptOrigin.y;
             lprc->bottom = lprc->top + infoPtr->nItemHeight;
-
+            
             if (infoPtr->himlState != NULL)
-            {
               lprc->left += infoPtr->iconSize.cx;
-            }
-
+            
             if (infoPtr->himlSmall != NULL)
-            {
               lprc->left += infoPtr->iconSize.cx;
-            }
-
+            
             nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
             nLabelWidth += TRAILING_PADDING;
             if (lprc->left + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
-            {
               lprc->right = lprc->left + nLabelWidth;
-            }
             else
-            {
               lprc->right = nLeftPos + infoPtr->nItemWidth;
-            }
           }
         }
@@ -5932 +6227 @@
         {
           bResult = TRUE;
-          if (uView & LVS_REPORT)
+          if (uView == LVS_REPORT)
             nLeftPos = lprc->left = ptItem.x + nIndent;
-          else
-            nLeftPos = lprc->left = ptItem.x;
+          else 
+            nLeftPos = lprc->left = ptItem.x; 
           lprc->top = ptItem.y;
           lprc->bottom = lprc->top + infoPtr->nItemHeight;
 
           if (infoPtr->himlState != NULL)
+            lprc->left += infoPtr->iconSize.cx;
+
+          if (infoPtr->himlSmall != NULL)
+            lprc->left += infoPtr->iconSize.cx;
+
+          if (uView != LVS_REPORT)
           {
-            lprc->left += infoPtr->iconSize.cx;
+            nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+            nLabelWidth += TRAILING_PADDING;
+            if (infoPtr->himlSmall)
+              nLabelWidth += IMAGE_PADDING;
           }
-
-          if (infoPtr->himlSmall != NULL)
-          {
-            lprc->left += infoPtr->iconSize.cx;
-          }
-
-      nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
-          nLabelWidth += TRAILING_PADDING;
-          if (infoPtr->himlSmall)
-            nLabelWidth += IMAGE_PADDING;
-      if (lprc->left + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
-      {
-        lprc->right = lprc->left + nLabelWidth;
-      }
-      else
-      {
-        lprc->right = nLeftPos + infoPtr->nItemWidth;
-      }
+          else
+            nLabelWidth = LISTVIEW_GetColumnWidth(hwnd, 0)-lprc->left;
+          if (lprc->left + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
+            lprc->right = lprc->left + nLabelWidth;
+          else
+            lprc->right = nLeftPos + infoPtr->nItemWidth;
         }
         break;
 
       case LVIR_BOUNDS:
+        if (!LISTVIEW_GetItemBoundBox(hwnd, nItem, &rcInternal)) break;
+        ptItem.x = rcInternal.left;
+        ptItem.y = rcInternal.top;
+        if (uView == LVS_ICON)
+        {
+          if (infoPtr->himlNormal != NULL)
+          {
+            if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
+            {
+              RECT label_rect;
+              INT text_left, text_right, icon_left, text_pos_x;
+              /* for style LVS_ICON bounds
+               *            left = min(icon.left, text.left)
+               *            right = max(icon.right, text.right)
+               *            top = boundbox.top + NOTHITABLE
+               *            bottom = text.bottom + 1
+               */
+              bResult = TRUE;
+              icon_left = text_left = ptItem.x;
+ 
+              /* Correct ptItem to icon upper-left */
+              icon_left += (infoPtr->nItemWidth - infoPtr->iconSize.cx)/2;
+              ptItem.y += ICON_TOP_PADDING;
+ 
+              /* Compute the label left and right */
+               nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+               text_pos_x = infoPtr->iconSpacing.cx - 2*CAPTION_BORDER - nLabelWidth;
+               if (text_pos_x > 1)
+               {
+                 text_left += text_pos_x / 2;
+                 text_right = text_left + nLabelWidth + 2*CAPTION_BORDER;
+               }
+               else
+               {
+                 text_left += 1;
+                 text_right = text_left + infoPtr->iconSpacing.cx - 1;
+               }
+ 
+              /* Compute rectangle w/o the text height */
+               lprc->left = min(icon_left, text_left) + ptOrigin.x;
+               lprc->right = max(icon_left + infoPtr->iconSize.cx,
+                                text_right) + ptOrigin.x;
+               lprc->top = ptItem.y + ptOrigin.y - ICON_TOP_PADDING_HITABLE;
+               lprc->bottom = lprc->top + ICON_TOP_PADDING_HITABLE
+                             + infoPtr->iconSize.cy + 1
+                              + ICON_BOTTOM_PADDING;
+ 
+               CopyRect (&label_rect, lprc);
+               label_rect.top = lprc->bottom;
+               ListView_UpdateLargeItemLabelRect (hwnd, infoPtr, nItem, &label_rect);
+               UnionRect (lprc, lprc, &label_rect);
+            }
+          } 
+        }
+        else if (uView == LVS_SMALLICON)
+        {
+          if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
+          {
+            bResult = TRUE;
+            lprc->left = ptItem.x + ptOrigin.x; 
+            lprc->right = lprc->left;
+            lprc->top = ptItem.y + ptOrigin.y;
+            lprc->bottom = lprc->top + infoPtr->nItemHeight;
+            if (infoPtr->himlState != NULL)
+              lprc->right += infoPtr->iconSize.cx;
+            if (infoPtr->himlSmall != NULL)
+              lprc->right += infoPtr->iconSize.cx;
+
+            nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+            nLabelWidth += TRAILING_PADDING;
+            if (infoPtr->himlSmall)
+              nLabelWidth += IMAGE_PADDING;
+            if (lprc->right + nLabelWidth < lprc->left + infoPtr->nItemWidth)
+              lprc->right += nLabelWidth;
+            else
+              lprc->right = lprc->left + infoPtr->nItemWidth;
+          }
+        }
+        else
+        {
+          bResult = TRUE;
+          lprc->left = ptItem.x; 
+          if (!(infoPtr->dwExStyle&LVS_EX_FULLROWSELECT) && uView&LVS_REPORT)
+            lprc->left += nIndent;
+          lprc->right = lprc->left;
+          lprc->top = ptItem.y;
+          lprc->bottom = lprc->top + infoPtr->nItemHeight;
+
+          if ((infoPtr->dwExStyle & LVS_EX_FULLROWSELECT) || (uView == LVS_REPORT))
+          {
+            RECT br;
+            int nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
+            Header_GetItemRect(infoPtr->hwndHeader, nColumnCount-1, &br);
+
+            lprc->right = max(lprc->left, br.right - REPORT_MARGINX);
+          }
+          else
+          {
+             if (infoPtr->himlState != NULL)
+              lprc->right += infoPtr->iconSize.cx;
+
+            if (infoPtr->himlSmall != NULL)
+              lprc->right += infoPtr->iconSize.cx;
+
+            nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+            nLabelWidth += TRAILING_PADDING;
+            if (lprc->right + nLabelWidth < lprc->left + infoPtr->nItemWidth)
+              lprc->right += nLabelWidth;
+            else
+              lprc->right = lprc->left + infoPtr->nItemWidth;
+          }
+        }
+        break;
+        
+      case LVIR_SELECTBOUNDS:
+        if (!ListView_GetItemPosition(hwnd, nItem, &ptItem)) break;
         if (uView == LVS_ICON)
         {
@@ -5977 +6385 @@
               lprc->bottom = lprc->top + infoPtr->iconSpacing.cy;
             }
-          }
+          } 
         }
         else if (uView == LVS_SMALLICON)
@@ -5984 +6392 @@
           {
             bResult = TRUE;
-            lprc->left = ptItem.x + ptOrigin.x;
-            lprc->right = lprc->left;
+            nLeftPos= lprc->left = ptItem.x + ptOrigin.x;  
             lprc->top = ptItem.y + ptOrigin.y;
             lprc->bottom = lprc->top + infoPtr->nItemHeight;
+            
             if (infoPtr->himlState != NULL)
-              lprc->right += infoPtr->iconSize.cx;
+              lprc->left += infoPtr->iconSize.cx;
+            
+            lprc->right = lprc->left;
+            
             if (infoPtr->himlSmall != NULL)
               lprc->right += infoPtr->iconSize.cx;
-
-        nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+            
+            nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
             nLabelWidth += TRAILING_PADDING;
-            if (infoPtr->himlSmall)
-              nLabelWidth += IMAGE_PADDING;
-        if (lprc->right + nLabelWidth < lprc->left + infoPtr->nItemWidth)
-        {
-          lprc->right += nLabelWidth;
-        }
-        else
-        {
-          lprc->right = lprc->left + infoPtr->nItemWidth;
-        }
-          }
-        }
-        else
-        {
-          bResult = TRUE;
-          lprc->left = ptItem.x;
-          if (!(infoPtr->dwExStyle&LVS_EX_FULLROWSELECT) && uView&LVS_REPORT)
-            lprc->left += nIndent;
-          lprc->right = lprc->left;
-          lprc->top = ptItem.y;
-          lprc->bottom = lprc->top + infoPtr->nItemHeight;
-
-          if (infoPtr->dwExStyle & LVS_EX_FULLROWSELECT)
-      {
-        RECT br;
-        int nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
-        Header_GetItemRect(infoPtr->hwndHeader, nColumnCount-1, &br);
-
-        lprc->right = max(lprc->left, br.right - REPORT_MARGINX);
-      }
-          else
-          {
-         if (infoPtr->himlState != NULL)
-            {
-              lprc->right += infoPtr->iconSize.cx;
-            }
-
-            if (infoPtr->himlSmall != NULL)
-            {
-              lprc->right += infoPtr->iconSize.cx;
-            }
-
-        nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
-            nLabelWidth += TRAILING_PADDING;
-        if (lprc->right + nLabelWidth < lprc->left + infoPtr->nItemWidth)
-        {
-          lprc->right += nLabelWidth;
-        }
-        else
-        {
-          lprc->right = lprc->left + infoPtr->nItemWidth;
-        }
-          }
-        }
-        break;
-
-      case LVIR_SELECTBOUNDS:
-        if (uView == LVS_ICON)
-        {
-          if (infoPtr->himlNormal != NULL)
-          {
-            if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
-            {
-              bResult = TRUE;
-              lprc->left = ptItem.x + ptOrigin.x;
-              lprc->top = ptItem.y + ptOrigin.y;
-              lprc->right = lprc->left + infoPtr->iconSpacing.cx;
-              lprc->bottom = lprc->top + infoPtr->iconSpacing.cy;
-            }
-          }
-        }
-        else if (uView == LVS_SMALLICON)
-        {
-          if (LISTVIEW_GetOrigin(hwnd, &ptOrigin) != FALSE)
-          {
-            bResult = TRUE;
-            nLeftPos= lprc->left = ptItem.x + ptOrigin.x;
-            lprc->top = ptItem.y + ptOrigin.y;
-            lprc->bottom = lprc->top + infoPtr->nItemHeight;
-
-            if (infoPtr->himlState != NULL)
-            {
-              lprc->left += infoPtr->iconSize.cx;
-            }
-
-            lprc->right = lprc->left;
-
-            if (infoPtr->himlSmall != NULL)
-            {
-              lprc->right += infoPtr->iconSize.cx;
-            }
-
-        nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
-            nLabelWidth += TRAILING_PADDING;
-        if (lprc->right + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
-        {
-          lprc->right += nLabelWidth;
-        }
-        else
-        {
-          lprc->right = nLeftPos + infoPtr->nItemWidth;
-        }
+            if (lprc->right + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
+              lprc->right += nLabelWidth;
+            else
+              lprc->right = nLeftPos + infoPtr->nItemWidth;
           }
         }
@@ -6103 +6416 @@
           bResult = TRUE;
           if (!(infoPtr->dwExStyle&LVS_EX_FULLROWSELECT) && (uView&LVS_REPORT))
-        nLeftPos = lprc->left = ptItem.x + nIndent;
+            nLeftPos = lprc->left = ptItem.x + nIndent; 
           else
-        nLeftPos = lprc->left = ptItem.x;
+            nLeftPos = lprc->left = ptItem.x; 
           lprc->top = ptItem.y;
           lprc->bottom = lprc->top + infoPtr->nItemHeight;
 
           if (infoPtr->himlState != NULL)
-          {
             lprc->left += infoPtr->iconSize.cx;
-          }
-
+          
           lprc->right = lprc->left;
-
+        
           if (infoPtr->dwExStyle & LVS_EX_FULLROWSELECT)
           {
-        RECT br;
-        int nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
-        Header_GetItemRect(infoPtr->hwndHeader, nColumnCount-1, &br);
+            RECT br;
+            int nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
+            Header_GetItemRect(infoPtr->hwndHeader, nColumnCount-1, &br);
 
             lprc->right = max(lprc->left, br.right - REPORT_MARGINX);
@@ -6127 +6438 @@
           {
             if (infoPtr->himlSmall != NULL)
-            {
               lprc->right += infoPtr->iconSize.cx;
-            }
-
-        nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
+
+            nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, nItem);
             nLabelWidth += TRAILING_PADDING;
             if (infoPtr->himlSmall)
               nLabelWidth += IMAGE_PADDING;
-        if (lprc->right + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
-        {
-          lprc->right += nLabelWidth;
-        }
-        else
-        {
-          lprc->right = nLeftPos + infoPtr->nItemWidth;
-        }
+            if (lprc->right + nLabelWidth < nLeftPos + infoPtr->nItemWidth)
+              lprc->right += nLabelWidth;
+            else
+              lprc->right = nLeftPos + infoPtr->nItemWidth;
           }
         }
         break;
       }
-    }
   }
 #ifdef __WIN32OS2__
@@ -6154 +6458 @@
           }
 #endif
+  TRACE("result %s (%d,%d)-(%d,%d)\n", bResult ? "TRUE" : "FALSE",
+        lprc->left, lprc->top, lprc->right, lprc->bottom);
+
   return bResult;
 }
@@ -6160 +6467 @@
  * DESCRIPTION:
  * Retrieves the width of a label.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  *   SUCCESS : string width (in pixels)
@@ -6170 +6477 @@
 static INT LISTVIEW_GetLabelWidth(HWND hwnd, INT nItem)
 {
-  CHAR szDispText[DISP_TEXT_SIZE];
+  WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
   INT nLabelWidth = 0;
-  LVITEMA lvItem;
+  LVITEMW lvItem;
 
   TRACE("(hwnd=%x, nItem=%d)\n", hwnd, nItem);
 
-  ZeroMemory(&lvItem, sizeof(LVITEMA));
+  ZeroMemory(&lvItem, sizeof(lvItem));
   lvItem.mask = LVIF_TEXT;
   lvItem.iItem = nItem;
   lvItem.cchTextMax = DISP_TEXT_SIZE;
   lvItem.pszText = szDispText;
-  if (LISTVIEW_GetItemA(hwnd, &lvItem, TRUE) != FALSE)
-  {
-    nLabelWidth = ListView_GetStringWidthA(hwnd, lvItem.pszText);
-  }
-
+  if (LISTVIEW_GetItemW(hwnd, &lvItem, TRUE))
+    nLabelWidth = ListView_GetStringWidthW(hwnd, lvItem.pszText); 
+    
   return nLabelWidth;
 }
@@ -6192 +6497 @@
  * DESCRIPTION:
  * Retrieves the spacing between listview control items.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] BOOL : flag for small or large icon
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] BOOL : flag for small or large icon 
  *
  * RETURN:
@@ -6202 +6507 @@
 static LRESULT LISTVIEW_GetItemSpacing(HWND hwnd, BOOL bSmall)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   LONG lResult;
 
@@ -6211 +6516 @@
   else
   {
-    LONG style = GetWindowLongA(hwnd, GWL_STYLE);
+    LONG style = GetWindowLongW(hwnd, GWL_STYLE);
     if ((style & LVS_TYPEMASK) == LVS_ICON)
-    {
       lResult = MAKELONG(DEFAULT_COLUMN_WIDTH, GetSystemMetrics(SM_CXSMICON)+HEIGHT_PADDING);
-    }
     else
-    {
       lResult = MAKELONG(infoPtr->nItemWidth, infoPtr->nItemHeight);
-    }
   }
   return lResult;
@@ -6227 +6528 @@
  * DESCRIPTION:
  * Retrieves the state of a listview control item.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
  * [I] UINT : state mask
- *
+ * 
  * RETURN:
  * State specified by the mask.
@@ -6238 +6539 @@
 static LRESULT LISTVIEW_GetItemState(HWND hwnd, INT nItem, UINT uMask)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LVITEMA lvItem;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LVITEMW lvItem;
   UINT uState = 0;
 
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)))
   {
-    ZeroMemory(&lvItem, sizeof(LVITEMA));
+    ZeroMemory(&lvItem, sizeof(lvItem));
     lvItem.iItem = nItem;
     lvItem.stateMask = uMask;
     lvItem.mask = LVIF_STATE;
-    if (LISTVIEW_GetItemA(hwnd, &lvItem, TRUE) != FALSE)
-    {
+    if (LISTVIEW_GetItemW(hwnd, &lvItem, TRUE))
       uState = lvItem.state;
-    }
   }
 
@@ -6259 +6558 @@
 /***
  * DESCRIPTION:
- * Retrieves the text of a listview control item or subitem.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
- * [IO] LPLVITEMA : item information
- *
+ * Retrieves the text of a listview control item or subitem. 
+ * 
+ * PARAMETER(S):
+ * [I] hwnd : window handle
+ * [I] nItem : item index
+ * [IO] lpLVItem : item information
+ * [I] isW :  TRUE if lpLVItem is Unicode
+ * 
  * RETURN:
  *   SUCCESS : string length
  *   FAILURE : 0
  */
-static LRESULT LISTVIEW_GetItemTextA(HWND hwnd, INT nItem, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static LRESULT LISTVIEW_GetItemTextT(HWND hwnd, INT nItem, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nLength = 0;
-
+  
   if (lpLVItem != NULL)
   {
@@ -6281 +6581 @@
       lpLVItem->mask = LVIF_TEXT;
       lpLVItem->iItem = nItem;
-      if (LISTVIEW_GetItemA(hwnd, lpLVItem, FALSE) != FALSE)
-      {
-        nLength = lstrlenA(lpLVItem->pszText);
-      }
+      if (LISTVIEW_GetItemT(hwnd, lpLVItem, FALSE, isW))
+        nLength = textlenT(lpLVItem->pszText, isW);
     }
   }
@@ -6294 +6592 @@
  * DESCRIPTION:
  * Searches for an item based on properties + relationships.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : item index
  * [I] INT : relationship flag
- *
+ * 
  * RETURN:
  *   SUCCESS : item index
@@ -6306 +6604 @@
 static LRESULT LISTVIEW_GetNextItem(HWND hwnd, INT nItem, UINT uFlags)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   UINT uMask = 0;
-  LVFINDINFO lvFindInfo;
+  LVFINDINFOW lvFindInfo;
   INT nCountPerColumn;
   INT i;
-
+  
   if ((nItem >= -1) && (nItem < GETITEMCOUNT(infoPtr)))
-  {
-    ZeroMemory(&lvFindInfo, sizeof(LVFINDINFO));
+  { 
+    ZeroMemory(&lvFindInfo, sizeof(lvFindInfo));
 
     if (uFlags & LVNI_CUT)
       uMask |= LVIS_CUT;
-
+    
     if (uFlags & LVNI_DROPHILITED)
       uMask |= LVIS_DROPHILITED;
-
+          
     if (uFlags & LVNI_FOCUSED)
       uMask |= LVIS_FOCUSED;
@@ -6345 +6643 @@
         lvFindInfo.vkDirection = VK_UP;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -6368 +6666 @@
         lvFindInfo.vkDirection = VK_DOWN;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -6392 +6690 @@
         lvFindInfo.vkDirection = VK_LEFT;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -6416 +6714 @@
         lvFindInfo.vkDirection = VK_RIGHT;
         ListView_GetItemPosition(hwnd, nItem, &lvFindInfo.pt);
-        while ((nItem = ListView_FindItem(hwnd, nItem, &lvFindInfo)) != -1)
+        while ((nItem = ListView_FindItemW(hwnd, nItem, &lvFindInfo)) != -1)
         {
           if ((ListView_GetItemState(hwnd, nItem, uMask) & uMask) == uMask)
@@ -6444 +6742 @@
  * DESCRIPTION:
  * Retrieves the origin coordinates when in icon or small icon display mode.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [O] LPPOINT : coordinate information
- *
+ * 
  * RETURN:
  *   SUCCESS : TRUE
@@ -6455 +6753 @@
 static LRESULT LISTVIEW_GetOrigin(HWND hwnd, LPPOINT lpptOrigin)
 {
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
   BOOL bResult = FALSE;
-
+  
   TRACE("(hwnd=%x, lpptOrigin=%p)\n", hwnd, lpptOrigin);
 
@@ -6471 +6769 @@
     {
       scrollInfo.fMask = SIF_POS;
-      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
-      {
-        lpptOrigin->x = -scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE;
-      }
+      if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE) 
+        lpptOrigin->x = -scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE; 
     }
 
@@ -6481 +6777 @@
       scrollInfo.fMask = SIF_POS;
       if (GetScrollInfo(hwnd, SB_VERT, &scrollInfo) != FALSE)
-      {
         lpptOrigin->y = -scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE;
-      }
-    }
-
+    }
+      
     bResult = TRUE;
   }
-
+  
   return bResult;
 }
@@ -6495 +6789 @@
  * DESCRIPTION:
  * Retrieves the number of items that are marked as selected.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  * Number of items selected.
@@ -6505 +6799 @@
 {
 /* REDO THIS */
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nSelectedCount = 0;
   INT i;
@@ -6512 +6806 @@
   {
     if (ListView_GetItemState(hwnd, i, LVIS_SELECTED) & LVIS_SELECTED)
-    {
       nSelectedCount++;
-    }
-  }
-
+  }
+  
   return nSelectedCount;
 }
@@ -6523 +6815 @@
  * DESCRIPTION:
  * Retrieves item index that marks the start of a multiple selection.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  * Index number or -1 if there is no selection mark.
@@ -6532 +6824 @@
 static LRESULT LISTVIEW_GetSelectionMark(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   return infoPtr->nSelectionMark;
 }
 
+
 /***
  * DESCRIPTION:
  * Retrieves the width of a string.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] hwnd : window handle
+ * [I] lpszText : text string to process
+ * [I] isW : TRUE if lpszText is Unicode, FALSE otherwise
+ * 
  * RETURN:
  *   SUCCESS : string width (in pixels)
  *   FAILURE : zero
  */
+static LRESULT LISTVIEW_GetStringWidthT(HWND hwnd, LPCWSTR lpszText, BOOL isW)
+{
+  if (is_textT(lpszText, isW))
+  {
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+    HFONT hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont;
+    HDC hdc = GetDC(hwnd);
+    HFONT hOldFont = SelectObject(hdc, hFont);
+    DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+    SIZE stringSize;
+    ZeroMemory(&stringSize, sizeof(SIZE));
+    if (isW)
+      GetTextExtentPointW(hdc, lpszText, lstrlenW(lpszText), &stringSize);
+    else
+      GetTextExtentPointA(hdc, (LPCSTR)lpszText, lstrlenA((LPCSTR)lpszText), &stringSize);
+    SelectObject(hdc, hOldFont);
+    ReleaseDC(hwnd, hdc);
 #ifdef __WIN32OS2__
-static LRESULT LISTVIEW_GetStringWidth(HWND hwnd,HDC hdc,LPWSTR lpszText,BOOL unicode)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  HFONT hFont, hOldFont;
-  SIZE stringSize;
-  BOOL ownDC = FALSE;
-
-  ZeroMemory(&stringSize,sizeof(SIZE));
-  if (lpszText != NULL && lpszText != LPSTR_TEXTCALLBACKA)
-  {
-    if (!hdc)
-    {
-      hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont;
-      hdc = GetDC(hwnd);
-      hOldFont = SelectObject(hdc, hFont);
-      ownDC = TRUE;
-    }
-    if (unicode)
-      GetTextExtentPointW(hdc,lpszText,lstrlenW(lpszText),&stringSize);
-    else
-      GetTextExtentPointA(hdc,(LPSTR)lpszText,lstrlenA((LPSTR)lpszText),&stringSize);
-    if (ownDC)
-    {
-      SelectObject(hdc, hOldFont);
-      ReleaseDC(hwnd, hdc);
-    }
     if(dwStyle & LVS_OWNERDRAWFIXED) {
         /* Get item width */
@@ -6587 +6872 @@
         mis.itemHeight = 0;
         mis.itemWidth  = 0;
-        SendMessageA(GetParent(hwnd), WM_MEASUREITEM, id, (LPARAM)&mis );
+        if (isW)  
+         SendMessageW(GetParent(hwnd), WM_MEASUREITEM, id, (LPARAM)&mis );
+        else
+         SendMessageA(GetParent(hwnd), WM_MEASUREITEM, id, (LPARAM)&mis );
         stringSize.cx  = (mis.itemWidth) ? mis.itemWidth : infoPtr->nItemWidth;
     }
-  }
-
-  return stringSize.cx;
-}
-#else
-static LRESULT LISTVIEW_GetStringWidthA(HWND hwnd, LPCSTR lpszText)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  HFONT hFont, hOldFont;
-  SIZE stringSize;
-  HDC hdc;
-
-  ZeroMemory(&stringSize, sizeof(SIZE));
-  if (lpszText != NULL && lpszText != LPSTR_TEXTCALLBACKA)
-  {
-    hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont;
-    hdc = GetDC(hwnd);
-    hOldFont = SelectObject(hdc, hFont);
-    GetTextExtentPointA(hdc, lpszText, lstrlenA(lpszText), &stringSize);
-    SelectObject(hdc, hOldFont);
-    ReleaseDC(hwnd, hdc);
-  }
-
-  return stringSize.cx;
-}
 #endif
+    return stringSize.cx;
+  }
+  return 0;
+}
 
 /***
  * DESCRIPTION:
  * Retrieves the text backgound color.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  * COLORREF associated with the the background.
@@ -6629 +6896 @@
 static LRESULT LISTVIEW_GetTextBkColor(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
 
   return infoPtr->clrTextBk;
@@ -6637 +6904 @@
  * DESCRIPTION:
  * Retrieves the text color.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  * COLORREF associated with the text.
@@ -6646 +6913 @@
 static LRESULT LISTVIEW_GetTextColor(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
 
   return infoPtr->clrText;
@@ -6653 +6920 @@
 /***
  * DESCRIPTION:
- * Determines which section of the item was selected (if any).
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [IO] LPLVHITTESTINFO : hit test information
+ * Determines item if a hit or closest if not
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [IO] LPLV_INTHIT : hit test information
  * [I] subitem : fill out iSubItem.
  *
  * RETURN:
- *   SUCCESS : item index
+ *   SUCCESS : item index of hit
  *   FAILURE : -1
  */
-static INT LISTVIEW_HitTestItem(
-  HWND hwnd, LPLVHITTESTINFO lpHitTestInfo, BOOL subitem
-) {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static INT LISTVIEW_SuperHitTestItem(HWND hwnd, LPLV_INTHIT lpInt, BOOL subitem)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+  UINT uView = lStyle & LVS_TYPEMASK;
+  INT i,topindex,bottomindex;
   RECT rcItem;
-  INT i,topindex,bottomindex;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = lStyle & LVS_TYPEMASK;
-
-
-  TRACE("(hwnd=%x, x=%ld, y=%ld)\n", hwnd, lpHitTestInfo->pt.x,
-        lpHitTestInfo->pt.y);
+  DWORD xterm, yterm, dist;
+
+  TRACE("(hwnd=%x, x=%ld, y=%ld)\n", hwnd, lpInt->ht.pt.x, lpInt->ht.pt.y);
 
   topindex = ListView_GetTopIndex(hwnd);
   if (uView == LVS_REPORT)
   {
-    bottomindex = topindex + LISTVIEW_GetCountPerColumn(hwnd) + 1;
+    bottomindex = topindex + LISTVIEW_GetCountPerColumn(hwnd) + 1;  
     bottomindex = min(bottomindex,GETITEMCOUNT(infoPtr));
   }
@@ -6688 +6953 @@
   }
 
+  lpInt->distance = 0x7fffffff;
+  lpInt->iDistItem = -1;
+
   for (i = topindex; i < bottomindex; i++)
   {
     rcItem.left = LVIR_BOUNDS;
-    if (LISTVIEW_GetItemRect(hwnd, i, &rcItem) != FALSE)
-    {
-      if (PtInRect(&rcItem, lpHitTestInfo->pt) != FALSE)
+    if (LISTVIEW_GetItemRect(hwnd, i, &rcItem))
+    {
+      if (PtInRect(&rcItem, lpInt->ht.pt))
       {
         rcItem.left = LVIR_ICON;
-        if (LISTVIEW_GetItemRect(hwnd, i, &rcItem) != FALSE)
+        if (LISTVIEW_GetItemRect(hwnd, i, &rcItem))
         {
-          if (PtInRect(&rcItem, lpHitTestInfo->pt) != FALSE)
+          if (PtInRect(&rcItem, lpInt->ht.pt))
           {
-            lpHitTestInfo->flags = LVHT_ONITEMICON;
-            lpHitTestInfo->iItem = i;
-            if (subitem) lpHitTestInfo->iSubItem = 0;
+            lpInt->ht.flags = LVHT_ONITEMICON;
+            lpInt->ht.iItem = i;
+            if (subitem) lpInt->ht.iSubItem = 0;
             return i;
           }
         }
-
+      
         rcItem.left = LVIR_LABEL;
-        if (LISTVIEW_GetItemRect(hwnd, i, &rcItem) != FALSE)
+        if (LISTVIEW_GetItemRect(hwnd, i, &rcItem))
         {
-          if (PtInRect(&rcItem, lpHitTestInfo->pt) != FALSE)
+          if (PtInRect(&rcItem, lpInt->ht.pt))
           {
-            lpHitTestInfo->flags = LVHT_ONITEMLABEL;
-            lpHitTestInfo->iItem = i;
-            if (subitem) lpHitTestInfo->iSubItem = 0;
+            lpInt->ht.flags = LVHT_ONITEMLABEL;
+            lpInt->ht.iItem = i;
+            if (subitem) lpInt->ht.iSubItem = 0;
             return i;
           }
         }
-
-        lpHitTestInfo->flags = LVHT_ONITEMSTATEICON;
-        lpHitTestInfo->iItem = i;
-        if (subitem) lpHitTestInfo->iSubItem = 0;
+        
+        lpInt->ht.flags = LVHT_ONITEMSTATEICON;
+        lpInt->ht.iItem = i;
+        if (subitem) lpInt->ht.iSubItem = 0;
         return i;
       }
-    }
-  }
-
-  lpHitTestInfo->flags = LVHT_NOWHERE;
+      else
+      {
+        /*
+         * Now compute distance from point to center of boundary
+         * box. Since we are only interested in the relative
+         * distance, we can skip the nasty square root operation
+         */
+        xterm = rcItem.left + (rcItem.right - rcItem.left)/2 - lpInt->ht.pt.x;
+        yterm = rcItem.top + (rcItem.bottom - rcItem.top)/2 - lpInt->ht.pt.y;
+        dist = xterm * xterm + yterm * yterm;
+        if (dist < lpInt->distance) 
+        {
+          lpInt->distance = dist;
+          lpInt->iDistItem = i;
+        }
+      }
+    }
+  }
+     
+  lpInt->ht.flags = LVHT_NOWHERE;
+  TRACE("no hit, closest item %d, distance %ld\n", lpInt->iDistItem, lpInt->distance);
 
   return -1;
 }
 
+ /***
+  * DESCRIPTION:
+  * Determines which section of the item was selected (if any).
+  *
+  * PARAMETER(S):
+  * [I] HWND : window handle
+  * [IO] LPLVHITTESTINFO : hit test information
+  * [I] subitem : fill out iSubItem.
+  *
+  * RETURN:
+  *   SUCCESS : item index
+  *   FAILURE : -1
+  */
+static INT LISTVIEW_HitTestItem(HWND hwnd, LPLVHITTESTINFO lpHitTestInfo, BOOL subitem)
+{
+  INT ret;
+  LV_INTHIT lv_inthit;
+
+  TRACE("(hwnd=%x, x=%ld, y=%ld)\n", hwnd, lpHitTestInfo->pt.x,
+        lpHitTestInfo->pt.y);
+
+  memcpy(&lv_inthit, lpHitTestInfo, sizeof(LVHITTESTINFO));
+  ret = LISTVIEW_SuperHitTestItem(hwnd, &lv_inthit, subitem);
+  memcpy(lpHitTestInfo, &lv_inthit, sizeof(LVHITTESTINFO));
+  return ret;
+}
+
 /***
  * DESCRIPTION:
  * Determines which listview item is located at the specified position.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -6746 +7058 @@
 static LRESULT LISTVIEW_HitTest(HWND hwnd, LPLVHITTESTINFO lpHitTestInfo)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nItem = -1;
 
@@ -6752 +7064 @@
 
   if (infoPtr->rcList.left > lpHitTestInfo->pt.x)
-  {
     lpHitTestInfo->flags = LVHT_TOLEFT;
-  }
-  else if (infoPtr->rcList.right < lpHitTestInfo->pt.x)
-  {
+  else if (infoPtr->rcList.right < lpHitTestInfo->pt.x) 
     lpHitTestInfo->flags = LVHT_TORIGHT;
-  }
   if (infoPtr->rcList.top > lpHitTestInfo->pt.y)
-  {
     lpHitTestInfo->flags |= LVHT_ABOVE;
-  }
-  else if (infoPtr->rcList.bottom < lpHitTestInfo->pt.y)
-  {
+  else if (infoPtr->rcList.bottom < lpHitTestInfo->pt.y) 
     lpHitTestInfo->flags |= LVHT_BELOW;
-  }
 
   if (lpHitTestInfo->flags == 0)
   {
-    /* NOTE (mm 20001022): We must not allow iSubItem to be touched, for
+    /* NOTE (mm 20001022): We must not allow iSubItem to be touched, for 
      * an app might pass only a structure with space up to iItem!
      * (MS Office 97 does that for instance in the file open dialog)
@@ -6776 +7080 @@
     nItem = LISTVIEW_HitTestItem(hwnd, lpHitTestInfo, FALSE);
   }
-
+  
   return nItem;
 }
@@ -6783 +7087 @@
  * DESCRIPTION:
  * Inserts a new column.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : column index
- * [I] LPLVCOLUMNA : column information
+ * [I] LPLVCOLUMNW : column information
  *
  * RETURN:
@@ -6793 +7097 @@
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_InsertColumnA(HWND hwnd, INT nColumn,
-                                      LPLVCOLUMNA lpColumn)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  HDITEMA hdi;
+static LRESULT LISTVIEW_InsertColumnT(HWND hwnd, INT nColumn, 
+                                      LPLVCOLUMNW lpColumn, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nNewColumn = -1;
-
-  TRACE("(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn,
-        lpColumn);
-
-  if (lpColumn != NULL)
+  HDITEMW hdi;
+
+  TRACE("(hwnd=%x, nColumn=%d, lpColumn=%p)\n",hwnd, nColumn, lpColumn);
+
+  if (lpColumn != NULL) 
   {
     /* initialize memory */
-    ZeroMemory(&hdi, sizeof(HDITEMA));
-
-    if (lpColumn->mask & LVCF_FMT)
+    ZeroMemory(&hdi, sizeof(hdi));
+
+    if (lpColumn->mask & LVCF_FMT) 
     {
       /* format member is valid */
@@ -6833 +7136 @@
         }
       }
-
+ 
       if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
       {
@@ -6844 +7147 @@
         /* ??? */
       }
-
+      
       if (lpColumn->fmt & LVCFMT_IMAGE)
       {
@@ -6852 +7155 @@
     }
 
-    if (lpColumn->mask & LVCF_WIDTH)
+    if (lpColumn->mask & LVCF_WIDTH) 
     {
       hdi.mask |= HDI_WIDTH;
-      hdi.cxy = lpColumn->cx;
-    }
-
-    if (lpColumn->mask & LVCF_TEXT)
+      if(lpColumn->cx == LVSCW_AUTOSIZE_USEHEADER)
+      {
+        /* make it fill the remainder of the controls width */
+        HDITEMW hdit;
+        RECT rcHeader;
+        INT item_index;
+        
+        ZeroMemory(&hdit, sizeof(hdit));
+  
+        /* get the width of every item except the current one */
+        hdit.mask = HDI_WIDTH;
+        hdi.cxy = 0;
+        
+        for(item_index = 0; item_index < (nColumn - 1); item_index++) {
+          Header_GetItemW(infoPtr->hwndHeader, item_index, (LPARAM)(&hdit));
+          hdi.cxy+=hdit.cxy;
+        }
+
+        /* retrieve the layout of the header */
+        GetClientRect(hwnd, &rcHeader);
+/*        GetWindowRect(infoPtr->hwndHeader, &rcHeader);*/
+        TRACE("start cxy=%d left=%d right=%d\n", hdi.cxy, rcHeader.left, rcHeader.right);
+
+        hdi.cxy = (rcHeader.right - rcHeader.left) - hdi.cxy;
+      }
+      else
+        hdi.cxy = lpColumn->cx;
+    }
+  
+    if (lpColumn->mask & LVCF_TEXT) 
     {
       hdi.mask |= HDI_TEXT | HDI_FORMAT;
       hdi.pszText = lpColumn->pszText;
-      hdi.cchTextMax = ((lpColumn->pszText!=NULL) && (lpColumn->pszText!=LPSTR_TEXTCALLBACKA) ? strlen(lpColumn->pszText) : 0);
+      hdi.cchTextMax = textlenT(lpColumn->pszText, isW);
       hdi.fmt |= HDF_STRING;
     }
-
-    if (lpColumn->mask & LVCF_IMAGE)
+  
+    if (lpColumn->mask & LVCF_IMAGE) 
     {
       hdi.mask |= HDI_IMAGE;
@@ -6872 +7201 @@
     }
 
-    if (lpColumn->mask & LVCF_ORDER)
+    if (lpColumn->mask & LVCF_ORDER) 
     {
       hdi.mask |= HDI_ORDER;
@@ -6879 +7208 @@
 
     /* insert item in header control */
-    nNewColumn = SendMessageA(infoPtr->hwndHeader, HDM_INSERTITEMA,
+    nNewColumn = SendMessageW(infoPtr->hwndHeader, HDM_INSERTITEMT(isW),
                              (WPARAM)nColumn, (LPARAM)&hdi);
-
+    
     /* Need to reset the item width when inserting a new column */
     infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
@@ -6890 +7219 @@
 
   return nNewColumn;
-}
-
-static LRESULT LISTVIEW_InsertColumnW(HWND hwnd, INT nColumn,
-                                      LPLVCOLUMNW lpColumn)
-{
-  LVCOLUMNA lvca;
-  LRESULT       lres;
-
-  memcpy(&lvca,lpColumn,sizeof(lvca));
-  if (lpColumn->mask & LVCF_TEXT) {
-    if (lpColumn->pszText == LPSTR_TEXTCALLBACKW)
-      lvca.pszText = LPSTR_TEXTCALLBACKA;
-    else
-      lvca.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpColumn->pszText);
-  }
-  lres = LISTVIEW_InsertColumnA(hwnd,nColumn,&lvca);
-  if (lpColumn->mask & LVCF_TEXT) {
-    if (lpColumn->pszText != LPSTR_TEXTCALLBACKW)
-      HeapFree(GetProcessHeap(),0,lvca.pszText);
-  }
-  return lres;
 }
 
@@ -6922 +7230 @@
     (remarks on LVITEM: LVM_INSERTITEM will insert the new item in the proper sort postion...
         if:
-          LVS_SORTXXX must be specified,
-          LVS_OWNERDRAW is not set,
+          LVS_SORTXXX must be specified, 
+          LVS_OWNERDRAW is not set, 
           <item>.pszText is not LPSTR_TEXTCALLBACK.
 
-    (LVS_SORT* flags): "For the LVS_SORTASCENDING... styles, item indices
-    are sorted based on item text..."
+    (LVS_SORT* flags): "For the LVS_SORTASCENDING... styles, item indices 
+    are sorted based on item text..." 
 */
 static INT WINAPI LISTVIEW_InsertCompare(  LPVOID first, LPVOID second,  LPARAM lParam)
 {
-  HDPA  hdpa_first = (HDPA) first;
-  HDPA  hdpa_second = (HDPA) second;
-  LISTVIEW_ITEM* lv_first = (LISTVIEW_ITEM*) DPA_GetPtr( hdpa_first, 0 );
-  LISTVIEW_ITEM* lv_second = (LISTVIEW_ITEM*) DPA_GetPtr( hdpa_second, 0 );
-  LONG lStyle = GetWindowLongA((HWND) lParam, GWL_STYLE);
-  INT  cmpv = lstrcmpA( lv_first->pszText, lv_second->pszText );
+  LONG lStyle = GetWindowLongW((HWND) lParam, GWL_STYLE);
+  LISTVIEW_ITEM* lv_first = (LISTVIEW_ITEM*) DPA_GetPtr( (HDPA)first, 0 );
+  LISTVIEW_ITEM* lv_second = (LISTVIEW_ITEM*) DPA_GetPtr( (HDPA)second, 0 );
+  INT  cmpv = lstrcmpW( lv_first->pszText, lv_second->pszText );
   /* if we're sorting descending, negate the return value */
   return (lStyle & LVS_SORTDESCENDING) ? -cmpv : cmpv;
@@ -6944 +7250 @@
  * nESCRIPTION:
  * Inserts a new item in the listview control.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEMA : item information
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] LPLVITEMW : item information
+ * [I] isW : TRUE if lpLVItem is Unicode, FALSE if it's ANSI
  *
  * RETURN:
@@ -6953 +7260 @@
  *   FAILURE : -1
  */
-static LRESULT LISTVIEW_InsertItemA(HWND hwnd, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+static LRESULT LISTVIEW_InsertItemT(HWND hwnd, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
-  LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  NMLISTVIEW nmlv;
   INT nItem = -1;
   HDPA hdpaSubItems;
@@ -6965 +7270 @@
   LISTVIEW_ITEM *lpItem = NULL;
 
-  TRACE("(hwnd=%x,lpLVItem=%p)\n", hwnd, lpLVItem);
+  TRACE("(hwnd=%x, lpLVItem=%s, isW=%d)\n", 
+        hwnd, debuglvitem_t(lpLVItem, isW), isW);
 
   if (lStyle & LVS_OWNERDATA)
@@ -6979 +7285 @@
     if (lpLVItem->iSubItem == 0)
     {
-      lpItem = (LISTVIEW_ITEM *)COMCTL32_Alloc(sizeof(LISTVIEW_ITEM));
-      if (lpItem != NULL)
+      if ( (lpItem = (LISTVIEW_ITEM *)COMCTL32_Alloc(sizeof(LISTVIEW_ITEM))) )
       {
         ZeroMemory(lpItem, sizeof(LISTVIEW_ITEM));
-        if (LISTVIEW_InitItem(hwnd, lpItem, lpLVItem) != FALSE)
+        if (LISTVIEW_InitItemT(hwnd, lpItem, lpLVItem, isW))
         {
           /* insert item in listview control data structure */
-          hdpaSubItems = DPA_Create(8);
-          if (hdpaSubItems != NULL)
+          if ( (hdpaSubItems = DPA_Create(8)) )
           {
-            nItem = DPA_InsertPtr(hdpaSubItems, 0, lpItem);
-            if (nItem != -1)
+            if ( (nItem = DPA_InsertPtr(hdpaSubItems, 0, lpItem)) != -1)
             {
               if ( ((lStyle & LVS_SORTASCENDING) || (lStyle & LVS_SORTDESCENDING))
-              && !(lStyle & LVS_OWNERDRAWFIXED)
-              && (LPSTR_TEXTCALLBACKA != lpLVItem->pszText) )
-          {
-        /* Insert the item in the proper sort order based on the pszText
-          member. See comments for LISTVIEW_InsertCompare() for greater detail */
-          nItem = DPA_InsertPtr( infoPtr->hdpaItems,
-              GETITEMCOUNT( infoPtr ) + 1, hdpaSubItems );
-          DPA_Sort( infoPtr->hdpaItems, LISTVIEW_InsertCompare, hwnd );
-          nItem = DPA_GetPtrIndex( infoPtr->hdpaItems, hdpaSubItems );
-          }
-          else
-          {
-                nItem = DPA_InsertPtr(infoPtr->hdpaItems, lpLVItem->iItem,
+                      && !(lStyle & LVS_OWNERDRAWFIXED)
+                      && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText) )
+              {
+                /* Insert the item in the proper sort order based on the pszText
+                  member. See comments for LISTVIEW_InsertCompare() for greater detail */
+                  nItem = DPA_InsertPtr( infoPtr->hdpaItems, 
+                          GETITEMCOUNT( infoPtr ) + 1, hdpaSubItems );
+                  DPA_Sort( infoPtr->hdpaItems, LISTVIEW_InsertCompare, hwnd );
+                  nItem = DPA_GetPtrIndex( infoPtr->hdpaItems, hdpaSubItems );
+              }
+              else
+              {
+                nItem = DPA_InsertPtr(infoPtr->hdpaItems, lpLVItem->iItem, 
                                     hdpaSubItems);
-          }
+              }
               if (nItem != -1)
               {
+                NMLISTVIEW nmlv;
+
                 LISTVIEW_ShiftIndices(hwnd,nItem,1);
 
@@ -7015 +7320 @@
                 if (lpLVItem->mask & LVIF_STATE)
                 {
-              lpItem->state &= ~(LVIS_FOCUSED|LVIS_SELECTED);
+                  lpItem->state &= ~(LVIS_FOCUSED|LVIS_SELECTED);
                   if (lpLVItem->stateMask & LVIS_SELECTED)
-                  {
                     LISTVIEW_SetSelection(hwnd, nItem);
-          }
-          else if (lpLVItem->stateMask & LVIS_FOCUSED)
-                  {
+                  else if (lpLVItem->stateMask & LVIS_FOCUSED)
                     LISTVIEW_SetItemFocus(hwnd, nItem);
-                  }
                 }
-
+                
                 /* send LVN_INSERTITEM notification */
                 ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-                nmlv.hdr.hwndFrom = hwnd;
-                nmlv.hdr.idFrom = lCtrlId;
-                nmlv.hdr.code = LVN_INSERTITEM;
                 nmlv.iItem = nItem;
-                nmlv.lParam = lpItem->lParam;;
-                ListView_LVNotify(GetParent(hwnd), lCtrlId, &nmlv);
-
+                nmlv.lParam = lpItem->lParam;
+                listview_notify(hwnd, LVN_INSERTITEM, &nmlv);
+                
                 if ((uView == LVS_SMALLICON) || (uView == LVS_LIST))
-        {
-          nItemWidth = LISTVIEW_CalculateWidth(hwnd, lpLVItem->iItem);
-          if (nItemWidth > infoPtr->nItemWidth)
-          {
-            infoPtr->nItemWidth = nItemWidth;
-          }
-        }
+                {
+                  nItemWidth = LISTVIEW_CalculateWidth(hwnd, lpLVItem->iItem); 
+                  if (nItemWidth > infoPtr->nItemWidth)
+                    infoPtr->nItemWidth = nItemWidth;
+                }
 
                 /* align items (set position of each item) */
@@ -7048 +7344 @@
                 {
                   if (lStyle & LVS_ALIGNLEFT)
-                  {
                     LISTVIEW_AlignLeft(hwnd);
-                  }
                   else
-                  {
                     LISTVIEW_AlignTop(hwnd);
-                  }
                 }
-
+                
                 LISTVIEW_UpdateScroll(hwnd);
                 /* refresh client area */
@@ -7070 +7362 @@
   /* free memory if unsuccessful */
   if ((nItem == -1) && (lpItem != NULL))
-  {
     COMCTL32_Free(lpItem);
-  }
-
+  
   return nItem;
 }
 
-static LRESULT LISTVIEW_InsertItemW(HWND hwnd, LPLVITEMW lpLVItem) {
-  LVITEMA lvia;
-  LRESULT lres;
-
-  memcpy(&lvia,lpLVItem,sizeof(LVITEMA));
-  if (lvia.mask & LVIF_TEXT) {
-    if (lpLVItem->pszText == LPSTR_TEXTCALLBACKW)
-      lvia.pszText = LPSTR_TEXTCALLBACKA;
-    else
-      lvia.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpLVItem->pszText);
-  }
-  lres = LISTVIEW_InsertItemA(hwnd, &lvia);
-  if (lvia.mask & LVIF_TEXT) {
-    if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW)
-      HeapFree(GetProcessHeap(),0,lvia.pszText);
-  }
-  return lres;
-}
-
-/* LISTVIEW_InsertItemW */
-
 /***
  * DESCRIPTION:
  * Redraws a range of items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7113 +7382 @@
 static LRESULT LISTVIEW_RedrawItems(HWND hwnd, INT nFirst, INT nLast)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); 
   BOOL bResult = FALSE;
   RECT rcItem;
+  INT i;
 
   if (nFirst <= nLast)
@@ -7123 +7393 @@
       if ((nLast >= 0) && (nLast < GETITEMCOUNT(infoPtr)))
       {
-          INT i;
-          for (i = nFirst; i <= nLast; i++)
-          {
-              rcItem.left = LVIR_BOUNDS;
-              LISTVIEW_GetItemRect(hwnd, i, &rcItem);
-              InvalidateRect(hwnd, &rcItem, TRUE);
-          }
+        for (i = nFirst; i <= nLast; i++)
+        {
+          rcItem.left = LVIR_BOUNDS;
+          LISTVIEW_GetItemRect(hwnd, i, &rcItem);
+          InvalidateRect(hwnd, &rcItem, TRUE);
+        }
       }
     }
@@ -7142 +7411 @@
  * DESCRIPTION:
  * Sets the background color.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7153 +7422 @@
 static LRESULT LISTVIEW_SetBkColor(HWND hwnd, COLORREF clrBk)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
-  infoPtr->clrBk = clrBk;
-  InvalidateRect(hwnd, NULL, TRUE);
-
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  if(infoPtr->clrBk!=clrBk){
+    infoPtr->clrBk = clrBk;
+    InvalidateRect(hwnd, NULL, TRUE);
+  }
+  
   return TRUE;
 }
@@ -7167 +7438 @@
  * Sets the callback mask. This mask will be used when the parent
  * window stores state information (some or all).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7178 +7449 @@
 static BOOL LISTVIEW_SetCallbackMask(HWND hwnd, UINT uMask)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   infoPtr->uCallbackMask = uMask;
@@ -7188 +7459 @@
  * DESCRIPTION:
  * Sets the attributes of a header item.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : column index
- * [I] LPLVCOLUMNA : column attributes
+ * [I] LPLVCOLUMNW : column attributes
+ * [I] isW: if TRUE, the lpColumn is a LPLVCOLUMNW, 
+ *          otherwise it is in fact a LPLVCOLUMNA
  *
  * RETURN:
@@ -7198 +7471 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetColumnA(HWND hwnd, INT nColumn,
-                                   LPLVCOLUMNA lpColumn)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static LRESULT LISTVIEW_SetColumnT(HWND hwnd, INT nColumn, 
+                                   LPLVCOLUMNW lpColumn, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   BOOL bResult = FALSE;
-  HDITEMA hdi, hdiget;
-
-  if ((lpColumn != NULL) && (nColumn >= 0) &&
+  HDITEMW hdi, hdiget;
+
+  if ((lpColumn != NULL) && (nColumn >= 0) && 
       (nColumn < Header_GetItemCount(infoPtr->hwndHeader)))
   {
     /* initialize memory */
-    ZeroMemory(&hdi, sizeof(HDITEMA));
-
-    if (lpColumn->mask & LVCF_FMT)
+    ZeroMemory(&hdi, sizeof(hdi));
+
+    if (lpColumn->mask & LVCF_FMT) 
     {
       /* format member is valid */
@@ -7218 +7491 @@
       /* get current format first */
       hdiget.mask = HDI_FORMAT;
-      if (Header_GetItemA(infoPtr->hwndHeader, nColumn, &hdiget))
-          /* preserve HDF_STRING if present */
-          hdi.fmt = hdiget.fmt & HDF_STRING;
+      if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdiget))
+              /* preserve HDF_STRING if present */
+              hdi.fmt = hdiget.fmt & HDF_STRING;
 
       /* set text alignment (leftmost column must be left-aligned) */
@@ -7230 +7503 @@
       {
         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;
-        }
       }
-
+      
       if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT)
-      {
         hdi.fmt |= HDF_BITMAP_ON_RIGHT;
-      }
 
       if (lpColumn->fmt & LVCFMT_COL_HAS_IMAGES)
-      {
         hdi.fmt |= HDF_IMAGE;
-      }
-
+      
       if (lpColumn->fmt & LVCFMT_IMAGE)
       {
@@ -7260 +7523 @@
     }
 
-    if (lpColumn->mask & LVCF_WIDTH)
+    if (lpColumn->mask & LVCF_WIDTH) 
     {
       hdi.mask |= HDI_WIDTH;
       hdi.cxy = lpColumn->cx;
     }
-
-    if (lpColumn->mask & LVCF_TEXT)
+    
+    if (lpColumn->mask & LVCF_TEXT) 
     {
       hdi.mask |= HDI_TEXT | HDI_FORMAT;
       hdi.pszText = lpColumn->pszText;
-      hdi.cchTextMax = ((lpColumn->pszText!=NULL) && (lpColumn->pszText!=LPSTR_TEXTCALLBACKA) ? strlen(lpColumn->pszText) : 0);
+      hdi.cchTextMax = textlenT(lpColumn->pszText, isW);
       hdi.fmt |= HDF_STRING;
     }
-
-    if (lpColumn->mask & LVCF_IMAGE)
+  
+    if (lpColumn->mask & LVCF_IMAGE) 
     {
       hdi.mask |= HDI_IMAGE;
@@ -7280 +7543 @@
     }
 
-    if (lpColumn->mask & LVCF_ORDER)
+    if (lpColumn->mask & LVCF_ORDER) 
     {
       hdi.mask |= HDI_ORDER;
@@ -7287 +7550 @@
 
     /* set header item attributes */
-    bResult = Header_SetItemA(infoPtr->hwndHeader, nColumn, &hdi);
-  }
-
+    if (isW)
+      bResult = Header_SetItemW(infoPtr->hwndHeader, nColumn, &hdi);
+    else
+      bResult = Header_SetItemA(infoPtr->hwndHeader, nColumn, &hdi);
+  }
+  
   return bResult;
 }
-
-/* LISTVIEW_SetColumnW */
 
 /***
@@ -7310 +7574 @@
 static LRESULT LISTVIEW_SetColumnOrderArray(HWND hwnd, INT iCount, LPINT lpiArray)
 {
-/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); */
-
-    FIXME("iCount %d lpiArray %p\n", iCount, lpiArray);
-
-    if (!lpiArray)
+  /* LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); */
+
+  FIXME("iCount %d lpiArray %p\n", iCount, lpiArray);
+
+  if (!lpiArray)
     return FALSE;
 
-    return TRUE;
+  return TRUE;
 }
 
@@ -7337 +7601 @@
 {
     LISTVIEW_INFO *infoPtr;
-    HDITEMA hdi;
+    HDITEMW hdi;
     LRESULT lret;
-    LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-    UINT uView = lStyle & LVS_TYPEMASK;
+    LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+    UINT uView = lStyle & LVS_TYPEMASK; 
     HDC hdc;
     HFONT header_font;
     HFONT old_font;
     SIZE size;
-    CHAR text_buffer[DISP_TEXT_SIZE];
+    WCHAR text_buffer[DISP_TEXT_SIZE];
     INT header_item_count;
     INT item_index;
+    INT nLabelWidth;
     RECT rcHeader;
-
+    LVITEMW lvItem;
+    WCHAR szDispText[DISP_TEXT_SIZE];
 
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
+    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0)))
       return (FALSE);
 
@@ -7360 +7626 @@
     /* set column width only if in report or list mode */
     if ((uView != LVS_REPORT) && (uView != LVS_LIST))
-      return (FALSE);
-
+      return (FALSE);            
+
+    TRACE("(hwnd=%x, iCol=%d, cx=%d\n", hwnd, iCol, cx);
+    
     /* take care of invalid cx values */
     if((uView == LVS_REPORT) && (cx < -2))
@@ -7367 +7635 @@
     else if (uView == LVS_LIST && (cx < 1))
       return FALSE;
-
+ 
     /* resize all columns if in LVS_LIST mode */
     if(uView == LVS_LIST) {
@@ -7378 +7646 @@
     if(cx == LVSCW_AUTOSIZE)
     {
-      /* set the width of the header to the width of the widest item */
-      for(item_index = 0; item_index < GETITEMCOUNT(infoPtr); item_index++)
+      /* set the width of the column to the width of the widest item */
+      if (iCol == 0 || uView == LVS_LIST)
       {
-        if(cx < LISTVIEW_GetLabelWidth(hwnd, item_index))
-          cx = LISTVIEW_GetLabelWidth(hwnd, item_index);
+        cx = 0;
+        for(item_index = 0; item_index < GETITEMCOUNT(infoPtr); item_index++)
+        {
+          nLabelWidth = LISTVIEW_GetLabelWidth(hwnd, item_index);
+          cx = (nLabelWidth>cx)?nLabelWidth:cx;
+        }
+        if (infoPtr->himlSmall)
+          cx += infoPtr->iconSize.cx + IMAGE_PADDING;
       }
+      else
+      {
+        ZeroMemory(&lvItem, sizeof(lvItem));
+        lvItem.iSubItem = iCol;
+        lvItem.mask = LVIF_TEXT;
+        lvItem.cchTextMax = DISP_TEXT_SIZE;
+        lvItem.pszText = szDispText;
+        *lvItem.pszText = '\0';
+        cx = 0;
+        for(item_index = 0; item_index < GETITEMCOUNT(infoPtr); item_index++)
+        {
+          lvItem.iItem = item_index;
+          LISTVIEW_GetItemT(hwnd, &lvItem, FALSE, TRUE);
+          nLabelWidth = LISTVIEW_GetStringWidthT(hwnd, lvItem.pszText, TRUE);
+          cx = (nLabelWidth>cx)?nLabelWidth:cx;
+        }
+      }
+      cx += TRAILING_PADDING;
     } /* autosize based on listview header width */
     else if(cx == LVSCW_AUTOSIZE_USEHEADER)
     {
       header_item_count = Header_GetItemCount(infoPtr->hwndHeader);
-
+ 
       /* if iCol is the last column make it fill the remainder of the controls width */
       if(iCol == (header_item_count - 1)) {
@@ -7394 +7686 @@
         hdi.mask = HDI_WIDTH;
         cx = 0;
-
+        
         for(item_index = 0; item_index < (header_item_count - 1); item_index++) {
-          Header_GetItemA(infoPtr->hwndHeader, item_index, (LPARAM)(&hdi));
+          Header_GetItemW(infoPtr->hwndHeader, item_index, (LPARAM)(&hdi));
           cx+=hdi.cxy;
         }
-
+ 
         /* retrieve the layout of the header */
         GetWindowRect(infoPtr->hwndHeader, &rcHeader);
 
         cx = (rcHeader.right - rcHeader.left) - cx;
-      }
+      }                                  
       else
       {
+        /* Despite what the MS docs say, if this is not the last
+           column, then MS resizes the column to the width of the
+           largest text string in the column, including headers
+           and items. This is different from LVSCW_AUTOSIZE in that
+           LVSCW_AUTOSIZE ignores the header string length.
+           */
+           
         /* retrieve header font */
-        header_font = SendMessageA(infoPtr->hwndHeader, WM_GETFONT, 0L, 0L);
-
+        header_font = SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0L, 0L);
+ 
         /* retrieve header text */
         hdi.mask = HDI_TEXT;
-        hdi.cchTextMax = sizeof(text_buffer);
-        hdi.pszText = text_buffer;
-
-        Header_GetItemA(infoPtr->hwndHeader, iCol, (LPARAM)(&hdi));
-
+        hdi.cchTextMax = sizeof(text_buffer)/sizeof(text_buffer[0]);
+        hdi.pszText = text_buffer;             
+    
+        Header_GetItemW(infoPtr->hwndHeader, iCol, (LPARAM)(&hdi));
+ 
         /* determine the width of the text in the header */
         hdc = GetDC(hwnd);
         old_font = SelectObject(hdc, header_font); /* select the font into hdc */
 
-        GetTextExtentPoint32A(hdc, text_buffer, strlen(text_buffer), &size);
-
-        SelectObject(hdc, old_font); /* restore the old font */
+        GetTextExtentPoint32W(hdc, text_buffer, lstrlenW(text_buffer), &size);
+ 
+        SelectObject(hdc, old_font); /* restore the old font */    
         ReleaseDC(hwnd, hdc);
-
-        /* set the width of this column to the width of the text */
+ 
+        ZeroMemory(&lvItem, sizeof(lvItem));
+        lvItem.iSubItem = iCol;
+        lvItem.mask = LVIF_TEXT;
+        lvItem.cchTextMax = DISP_TEXT_SIZE;
+        lvItem.pszText = szDispText;
+        *lvItem.pszText = '\0';
         cx = size.cx;
+        for(item_index = 0; item_index < GETITEMCOUNT(infoPtr); item_index++)
+        {
+          lvItem.iItem = item_index;
+          LISTVIEW_GetItemT(hwnd, &lvItem, FALSE, TRUE);
+          nLabelWidth = LISTVIEW_GetStringWidthT(hwnd, lvItem.pszText, TRUE);
+          nLabelWidth += TRAILING_PADDING;
+          /* While it is possible for subitems to have icons, even MS messes
+             up the positioning, so I suspect no applications actually use
+             them. */
+          if (item_index == 0 && infoPtr->himlSmall)
+            nLabelWidth += infoPtr->iconSize.cx + IMAGE_PADDING;
+          cx = (nLabelWidth>cx)?nLabelWidth:cx;
+        }
       }
   }
 
   /* call header to update the column change */
-  hdi.mask = HDI_WIDTH;
+  hdi.mask = HDI_WIDTH;                          
 
   hdi.cxy = cx;
-  lret = Header_SetItemA(infoPtr->hwndHeader, (WPARAM)iCol, (LPARAM)&hdi);
-
+  lret = Header_SetItemW(infoPtr->hwndHeader, (WPARAM)iCol, (LPARAM)&hdi);
+ 
   InvalidateRect(hwnd, NULL, TRUE); /* force redraw of the listview */
-
+ 
   return lret;
 }
@@ -7457 +7774 @@
 static LRESULT LISTVIEW_SetExtendedListViewStyle(HWND hwnd, DWORD dwMask, DWORD dwStyle)
 {
-    LISTVIEW_INFO *infoPtr;
-    DWORD dwOldStyle;
-
-    /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
-    return (0);
-
-    /* store previous style */
-    dwOldStyle = infoPtr->dwExStyle;
-
-    /* set new style */
-    if (dwMask)
-      infoPtr->dwExStyle = (dwOldStyle & ~dwMask) | (dwStyle & dwMask);
-    else
-      infoPtr->dwExStyle = dwStyle;
-
-    return (dwOldStyle);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  DWORD dwOldStyle = infoPtr->dwExStyle;
+
+  /* set new style */
+  if (dwMask)
+    infoPtr->dwExStyle = (dwOldStyle & ~dwMask) | (dwStyle & dwMask);
+  else
+    infoPtr->dwExStyle = dwStyle;
+
+  return dwOldStyle;
 }
 
@@ -7492 +7802 @@
 static LRESULT LISTVIEW_SetHotItem(HWND hwnd, INT iIndex)
 {
-    LISTVIEW_INFO *infoPtr;
-    INT iOldIndex;
-
-    /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
-    return (-1);
-
-    /* store previous index */
-    iOldIndex = infoPtr->nHotItem;
-
-    /* set new style */
-    infoPtr->nHotItem = iIndex;
-
-    return (iOldIndex);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  INT iOldIndex = infoPtr->nHotItem;
+
+  /* set new style */
+  infoPtr->nHotItem = iIndex;
+
+  return iOldIndex;
 }
 
@@ -7521 +7824 @@
 static LRESULT LISTVIEW_SetHoverTime(HWND hwnd, DWORD dwHoverTime)
 {
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  DWORD oldHoverTime = infoPtr->dwHoverTime;
+
+  infoPtr->dwHoverTime = dwHoverTime;
+
+  return oldHoverTime;
+}
+
+/***
+ * DESCRIPTION:
+ * Sets spacing for icons of LVS_ICON style.
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] DWORD : MAKELONG(cx, cy)
+ *
+ * RETURN:
+ *   MAKELONG(oldcx, oldcy)
+ */
+#ifdef __WIN32OS2__
+static LRESULT LISTVIEW_SetIconSpacing(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  DWORD oldHoverTime = infoPtr->dwHoverTime;
-
-  infoPtr->dwHoverTime = dwHoverTime;
-
-  return oldHoverTime;
-}
-
-/* LISTVIEW_SetIconSpacing */
+  UINT dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
+  DWORD oldIS = MAKELONG(infoPtr->iconSpacing.cx,infoPtr->iconSpacing.cy);
+  INT cx = LOWORD(lParam),cy = HIWORD(lParam);
+
+  if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING);
+  if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING);
+  if ((cx != infoPtr->iconSpacing.cx) || (cy != infoPtr->iconSpacing.cy))
+  {
+    infoPtr->iconSpacing.cx = cx;
+    infoPtr->iconSpacing.cy = cy;
+    if (((uView == LVS_ICON) || (uView == LVS_SMALLICON)) && (dwStyle & LVS_AUTOARRANGE))
+    {
+      LISTVIEW_Arrange(hwnd,LVA_DEFAULT);
+    }
+  }
+  return oldIS;
+}
+#else
+static LRESULT LISTVIEW_SetIconSpacing(HWND hwnd, DWORD spacing)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  INT cy = HIWORD(spacing);
+  INT cx = LOWORD(spacing);
+  DWORD oldspacing;
+  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  UINT uView = lStyle & LVS_TYPEMASK;
+
+  oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy);
+  if (cx == -1) /* set to default */
+    cx = GetSystemMetrics(SM_CXICONSPACING);
+  if (cy == -1) /* set to default */
+    cy = GetSystemMetrics(SM_CYICONSPACING);
+
+  if (cx)
+    infoPtr->iconSpacing.cx = cx;
+  else 
+  {  /* if 0 then compute width */
+    if (uView == LVS_ICON)
+       FIXME("width computation not yet done\n");
+       /*
+        * Should scan each item and determine max width of
+        * icon or label, then make that the width
+        */
+     else /* FIXME: unknown computation for non LVS_ICON - this is a guess */
+       infoPtr->iconSpacing.cx = LISTVIEW_GetItemWidth(hwnd);
+  }
+  if (cy)
+      infoPtr->iconSpacing.cy = cy;
+  else 
+  {  /* if 0 then compute height */
+    if (uView == LVS_ICON) 
+       infoPtr->iconSpacing.cy = infoPtr->iconSize.cy + infoPtr->ntmHeight
+                                  + ICON_BOTTOM_PADDING + ICON_TOP_PADDING + LABEL_VERT_OFFSET;
+        /* FIXME.  I don't think so; I think it is based on twice the ntmHeight */
+    else /* FIXME: unknown computation for non LVS_ICON - this is a guess */
+       infoPtr->iconSpacing.cy = LISTVIEW_GetItemHeight(hwnd);
+  }
+
+  TRACE("old=(%d,%d), new=(%ld,%ld)\n", LOWORD(oldspacing), HIWORD(oldspacing),
+        infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy);
+
+  /* these depend on the iconSpacing */
+  infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
+  infoPtr->nItemHeight = LISTVIEW_GetItemHeight(hwnd);
+
+  return oldspacing;
+}
+#endif
 
 /***
  * DESCRIPTION:
  * Sets image lists.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : image list type
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : image list type  
  * [I] HIMAGELIST : image list handle
  *
@@ -7544 +7930 @@
  *   FAILURE : NULL
  */
-static LRESULT LISTVIEW_SetImageList(HWND hwnd, INT nType, HIMAGELIST himl)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static HIMAGELIST LISTVIEW_SetImageList(HWND hwnd, INT nType, HIMAGELIST himl)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   HIMAGELIST himlOld = 0;
   INT oldHeight;
 
-  switch (nType)
+  switch (nType) 
   {
   case LVSIL_NORMAL:
@@ -7574 +7960 @@
     LISTVIEW_UpdateScroll(hwnd);
 
-  return (LRESULT)himlOld;
-}
-
-
-/***
- * DESCRIPTION:
- * Sets the attributes of an item.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] LPLVITEM : item information
+  return himlOld;
+}
+
+/***
+ * DESCRIPTION:
+ * Preallocates memory (does *not* set the actual count of items !)
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT   : item count (projected number of items to allocate)
+ * [I] DWORD : update flags
  *
  * RETURN:
@@ -7590 +7976 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetItemA(HWND hwnd, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  BOOL bResult = FALSE;
-
-  if (lpLVItem != NULL)
-  {
-    if ((lpLVItem->iItem >= 0) && (lpLVItem->iItem < GETITEMCOUNT(infoPtr)))
-    {
-      if (lpLVItem->iSubItem == 0)
-      {
-        bResult = LISTVIEW_SetItem(hwnd, lpLVItem);
-      }
-      else
-      {
-        bResult = LISTVIEW_SetSubItem(hwnd, lpLVItem);
-      }
-    }
-  }
-
-
-  return bResult;
-}
-
-/* LISTVIEW_SetItemW  */
-
-/***
- * DESCRIPTION:
- * Preallocates memory (does *not* set the actual count of items !)
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT   : item count (projected number of items to allocate)
- * [I] DWORD : update flags
- *
- * RETURN:
- *   SUCCESS : TRUE
- *   FAILURE : FALSE
- */
 static BOOL LISTVIEW_SetItemCount(HWND hwnd, INT nItems, DWORD dwFlags)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
-
-  if (GetWindowLongA(hwnd, GWL_STYLE) & LVS_OWNERDATA)
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwnd=%x, nItems=%d, dwFlags=%lx)\n", hwnd, nItems, dwFlags);
+
+  if (GetWindowLongW(hwnd, GWL_STYLE) & LVS_OWNERDATA)
   {
       int precount,topvisible;
+
       TRACE("LVS_OWNERDATA is set!\n");
+      if (dwFlags & (LVSICF_NOINVALIDATEALL | LVSICF_NOSCROLL))
+        FIXME("flags %s %s not implemented\n",
+              (dwFlags & LVSICF_NOINVALIDATEALL) ? "LVSICF_NOINVALIDATEALL"
+              : "",
+              (dwFlags & LVSICF_NOSCROLL) ? "LVSICF_NOSCROLL" : "");
 
       /*
-       * Internally remove all the selections.
+       * Internally remove all the selections. 
        */
       do
@@ -7650 +8005 @@
       }
       while (infoPtr->hdpaSelectionRanges->nItemCount>0);
-
+ 
       precount = infoPtr->hdpaItems->nItemCount;
       topvisible = ListView_GetTopIndex(hwnd) +
@@ -7657 +8012 @@
       infoPtr->hdpaItems->nItemCount = nItems;
 
+      infoPtr->nItemWidth = max(LISTVIEW_GetItemWidth(hwnd),
+                                DEFAULT_COLUMN_WIDTH);
+
       LISTVIEW_UpdateSize(hwnd);
       LISTVIEW_UpdateScroll(hwnd);
-      if (min(precount,infoPtr->hdpaItems->nItemCount)<topvisible)
+
+      if (min(precount,infoPtr->hdpaItems->nItemCount)<topvisible) 
         InvalidateRect(hwnd, NULL, TRUE);
   }
   else
   {
-      FIXME("setitemcount not done for non-ownerdata\n");
+    /* According to MSDN for non-LVS_OWNERDATA this is just
+     * a performance issue. The control allocates its internal
+     * data structures for the number of items specified. It
+     * cuts down on the number of memory allocations. Therefore
+     * we will just issue a WARN here
+     */
+     WARN("for non-ownerdata performance option not implemented.\n");
   }
 
@@ -7673 +8038 @@
  * DESCRIPTION:
  * Sets the position of an item.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7687 +8052 @@
                                      LONG nPosX, LONG nPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
-  UINT lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
+  UINT lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
   LISTVIEW_ITEM *lpItem;
@@ -7694 +8059 @@
   BOOL bResult = FALSE;
 
-  TRACE("(hwnd=%x,nItem=%d,X=%ld,Y=%ld)\n", hwnd, nItem, nPosX, nPosY);
-
+  TRACE("(hwnd=%x, nItem=%d, X=%ld, Y=%ld)\n", hwnd, nItem, nPosX, nPosY);
+  
   if (lStyle & LVS_OWNERDATA)
     return FALSE;
@@ -7703 +8068 @@
     if ((uView == LVS_ICON) || (uView == LVS_SMALLICON))
     {
-      hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem);
-      if (hdpaSubItems != NULL)
+      if ( (hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, nItem)) )
       {
-        lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
-        if (lpItem != NULL)
+        if ( (lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0)) )
         {
+          POINT orig;
           bResult = TRUE;
+          orig = lpItem->ptPosition;
+          if ((nPosX == -1) && (nPosY == -1)) 
+          {
+            /* This point value seems to be an undocumented feature. The
+             * best guess is that it means either at the origin, or at
+             * the true beginning of the list. I will assume the origin.
+             */
+            POINT pt1;
+            if (!LISTVIEW_GetOrigin(hwnd, &pt1)) 
+            {
+              pt1.x = 0;
+              pt1.y = 0;
+            }
+            nPosX = pt1.x;
+            nPosY = pt1.y;
+            if (uView == LVS_ICON) 
+            {
+              nPosX += (infoPtr->iconSpacing.cx - infoPtr->iconSize.cx) / 2;
+              nPosY += ICON_TOP_PADDING;
+            }
+            TRACE("requested special (-1,-1), set to origin (%ld,%ld)\n",
+                  nPosX, nPosY);
+          }
+
           lpItem->ptPosition.x = nPosX;
           lpItem->ptPosition.y = nPosY;
+          if (uView == LVS_ICON)
+          {
+            lpItem->ptPosition.y -= ICON_TOP_PADDING;
+              lpItem->ptPosition.x -= (infoPtr->iconSpacing.cx - infoPtr->iconSize.cx) / 2;
+              if ((lpItem->ptPosition.y < 0) || (lpItem->ptPosition.x < 0)) 
+              {
+                  FIXME("failed orig (%ld,%ld), intent (%ld,%ld), is (%ld, %ld), setting neg to 0\n",
+                        orig.x, orig.y, nPosX, nPosY, lpItem->ptPosition.x, lpItem->ptPosition.y);
+ 
+                  /*
+                  if (lpItem->ptPosition.x < 0) lpItem->ptPosition.x = 0;
+                  if (lpItem->ptPosition.y < 0) lpItem->ptPosition.y = 0;
+                  */
+              }
+              else 
+              {
+                  TRACE("orig (%ld,%ld), intent (%ld,%ld), is (%ld,%ld)\n",
+                        orig.x, orig.y, nPosX, nPosY, lpItem->ptPosition.x, lpItem->ptPosition.y);
+              }
+          }
         }
       }
@@ -7723 +8131 @@
  * DESCRIPTION:
  * Sets the state of one or many items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7733 +8141 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SetItemState(HWND hwnd, INT nItem, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  BOOL bResult = FALSE;
-  LVITEMA lvItem;
-  INT i;
+static LRESULT LISTVIEW_SetItemState(HWND hwnd, INT nItem, LPLVITEMW lpLVItem)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  BOOL bResult = TRUE;
+  LVITEMW lvItem;
+
+  TRACE("(hwnd=%x, nItem=%d, lpLVItem=%s)\n", 
+        hwnd, nItem, debuglvitem_t(lpLVItem, TRUE));
+
+  ZeroMemory(&lvItem, sizeof(lvItem));
+  lvItem.mask = LVIF_STATE;
+  lvItem.state = lpLVItem->state;
+  lvItem.stateMask = lpLVItem->stateMask ;
+  lvItem.iItem = nItem;
 
   if (nItem == -1)
   {
-    bResult = TRUE;
-    ZeroMemory(&lvItem, sizeof(LVITEMA));
-    lvItem.mask = LVIF_STATE;
-    lvItem.state = lpLVItem->state;
-    lvItem.stateMask = lpLVItem->stateMask ;
-
     /* apply to all items */
-    for (i = 0; i< GETITEMCOUNT(infoPtr); i++)
-    {
-      lvItem.iItem = i;
-      if (ListView_SetItemA(hwnd, &lvItem) == FALSE)
-      {
-        bResult = FALSE;
-      }
-    }
+    for (lvItem.iItem = 0; lvItem.iItem < GETITEMCOUNT(infoPtr); lvItem.iItem++)
+      if (!ListView_SetItemW(hwnd, &lvItem)) bResult = FALSE;
   }
   else
-  {
-    ZeroMemory(&lvItem, sizeof(LVITEMA));
-    lvItem.mask = LVIF_STATE;
-    lvItem.state = lpLVItem->state;
-    lvItem.stateMask = lpLVItem->stateMask;
-    lvItem.iItem = nItem;
-    bResult = ListView_SetItemA(hwnd, &lvItem);
-  }
+    bResult = ListView_SetItemW(hwnd, &lvItem);
 
   return bResult;
@@ -7774 +8171 @@
  * DESCRIPTION:
  * Sets the text of an item or subitem.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : item index
- * [I] LPLVITEMA : item or subitem info
+ * 
+ * PARAMETER(S):
+ * [I] hwnd : window handle
+ * [I] nItem : item index
+ * [I] lpLVItem : item or subitem info
+ * [I] isW : TRUE if input is Unicode
  *
  * RETURN:
@@ -7784 +8182 @@
  *   FAILURE : FALSE
  */
-static BOOL LISTVIEW_SetItemTextA(HWND hwnd, INT nItem, LPLVITEMA lpLVItem)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+static BOOL LISTVIEW_SetItemTextT(HWND hwnd, INT nItem, LPLVITEMW lpLVItem, BOOL isW)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   BOOL bResult = FALSE;
-  LVITEMA lvItem;
-
+  LVITEMW lvItem;
+
+  TRACE("(hwnd=%x, nItem=%d, lpLVItem=%s, isW=%d)\n", 
+        hwnd, nItem, debuglvitem_t(lpLVItem, isW), isW);
+  
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)))
   {
-    ZeroMemory(&lvItem, sizeof(LVITEMA));
+    ZeroMemory(&lvItem, sizeof(LVITEMW));
     lvItem.mask = LVIF_TEXT;
     lvItem.pszText = lpLVItem->pszText;
     lvItem.iItem = nItem;
     lvItem.iSubItem = lpLVItem->iSubItem;
-    bResult = ListView_SetItemA(hwnd, &lvItem);
-  }
-
+    if(isW) bResult = ListView_SetItemW(hwnd, &lvItem);
+    else    bResult = ListView_SetItemA(hwnd, &lvItem);
+  }
+  
   return bResult;
 }
 
-/* LISTVIEW_SetItemTextW */
-
 /***
  * DESCRIPTION:
@@ -7818 +8218 @@
 static LRESULT LISTVIEW_SetSelectionMark(HWND hwnd, INT nIndex)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   INT nOldIndex = infoPtr->nSelectionMark;
 
+  TRACE("(hwnd=%x, nIndex=%d)\n", hwnd, nIndex);
+
   infoPtr->nSelectionMark = nIndex;
 
@@ -7829 +8231 @@
  * DESCRIPTION:
  * Sets the text background color.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7840 +8242 @@
 static LRESULT LISTVIEW_SetTextBkColor(HWND hwnd, COLORREF clrTextBk)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwnd=%x, clrTextBk=%lx)\n", hwnd, clrTextBk);
+  
   infoPtr->clrTextBk = clrTextBk;
   InvalidateRect(hwnd, NULL, TRUE);
@@ -7851 +8255 @@
  * DESCRIPTION:
  * Sets the text foreground color.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] COLORREF : text color
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] COLORREF : text color 
  *
  * RETURN:
@@ -7862 +8266 @@
 static LRESULT LISTVIEW_SetTextColor (HWND hwnd, COLORREF clrText)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwnd=%x, clrText=%lx)\n", hwnd, clrText);
 
   infoPtr->clrText = clrText;
@@ -7877 +8283 @@
  * DESCRIPTION:
  * Callback internally used by LISTVIEW_SortItems()
- *
+ * 
  * PARAMETER(S):
  * [I] LPVOID : first LISTVIEW_ITEM to compare
@@ -7888 +8294 @@
  *   if first and second are equivalent : zero
  */
-static INT WINAPI LISTVIEW_CallBackCompare(
-  LPVOID first,
-  LPVOID second,
-  LPARAM lParam)
-{
+static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW((HWND)lParam, 0);
+  LISTVIEW_ITEM* lv_first = (LISTVIEW_ITEM*) DPA_GetPtr( (HDPA)first, 0 );
+  LISTVIEW_ITEM* lv_second = (LISTVIEW_ITEM*) DPA_GetPtr( (HDPA)second, 0 );
+
   /* Forward the call to the client defined callback */
-  INT rv;
-  HWND hwnd = (HWND)lParam;
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  HDPA  hdpa_first = (HDPA) first;
-  HDPA  hdpa_second = (HDPA) second;
-  LISTVIEW_ITEM* lv_first = (LISTVIEW_ITEM*) DPA_GetPtr( hdpa_first, 0 );
-  LISTVIEW_ITEM* lv_second = (LISTVIEW_ITEM*) DPA_GetPtr( hdpa_second, 0 );
-
-  rv = (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort );
-
-  return rv;
+  return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort );
 }
 
@@ -7910 +8307 @@
  * DESCRIPTION:
  * Sorts the listview items.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7920 +8317 @@
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_SortItems(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-    int nCount, i;
-    UINT lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+static LRESULT LISTVIEW_SortItems(HWND hwnd, PFNLVCOMPARE pfnCompare, LPARAM lParamSort)
+{
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+    UINT lStyle = GetWindowLongW(hwnd, GWL_STYLE);
     HDPA hdpaSubItems=NULL;
     LISTVIEW_ITEM *pLVItem=NULL;
     LPVOID selectionMarkItem;
-
-    if (lStyle & LVS_OWNERDATA)
-      return FALSE;
-
-    if (!infoPtr || !infoPtr->hdpaItems)
-    return FALSE;
-
+    int nCount, i;
+
+    TRACE("(hwnd=%x, pfnCompare=%p, lParamSort=%lx)\n", hwnd, pfnCompare, lParamSort);
+    
+    if (lStyle & LVS_OWNERDATA) return FALSE;
+
+    if (!infoPtr || !infoPtr->hdpaItems) return FALSE;
+   
     nCount = GETITEMCOUNT(infoPtr);
     /* if there are 0 or 1 items, there is no need to sort */
@@ -7940 +8337 @@
         return TRUE;
 
-    infoPtr->pfnCompare = (PFNLVCOMPARE)lParam;
-    infoPtr->lParamSort = (LPARAM)wParam;
+    infoPtr->pfnCompare = pfnCompare;
+    infoPtr->lParamSort = lParamSort;
     DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, hwnd);
 
-    /* Adjust selections and indices so that they are the way they should
-     * be after the sort (otherwise, the list items move around, but
-     * whatever is at the item's previous original position will be
+    /* Adjust selections and indices so that they are the way they should 
+     * be after the sort (otherwise, the list items move around, but 
+     * whatever is at the item's previous original position will be 
      * selected instead)
      */
@@ -7980 +8377 @@
  * DESCRIPTION:
  * Updates an items or rearranges the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -7991 +8388 @@
 static LRESULT LISTVIEW_Update(HWND hwnd, INT nItem)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   BOOL bResult = FALSE;
   RECT rc;
 
+  TRACE("(hwnd=%x, nItem=%d)\n", hwnd, nItem);
+  
   if ((nItem >= 0) && (nItem < GETITEMCOUNT(infoPtr)))
   {
@@ -8020 +8419 @@
  * DESCRIPTION:
  * Creates the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -8027 +8426 @@
  * Zero
  */
-static LRESULT LISTVIEW_Create(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LPCREATESTRUCTA lpcs = (LPCREATESTRUCTA)lParam;
+static LRESULT LISTVIEW_Create(HWND hwnd, LPCREATESTRUCTW lpcs)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   UINT uView = lpcs->style & LVS_TYPEMASK;
-  LOGFONTA logFont;
+  LOGFONTW logFont;
+
+  TRACE("(hwnd=%x, lpcs=%p)\n", hwnd, lpcs);
 
   /* initialize info pointer */
@@ -8038 +8438 @@
 
   /* determine the type of structures to use */
-  infoPtr->notifyFormat = SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT,
+  infoPtr->notifyFormat = SendMessageW(GetParent(hwnd), WM_NOTIFYFORMAT, 
                                        (WPARAM)hwnd, (LPARAM)NF_QUERY);
-  if (infoPtr->notifyFormat != NFR_ANSI)
-  {
-    FIXME("ANSI notify format is NOT used\n");
-  }
-
+  
   /* initialize color information  */
   infoPtr->clrBk = GetSysColor(COLOR_WINDOW);
@@ -8051 +8447 @@
 
   /* set default values */
+  infoPtr->hwndSelf = hwnd;
   infoPtr->uCallbackMask = 0;
 #ifdef __WIN32OS2__
@@ -8067 +8464 @@
 
   /* get default font (icon title) */
-  SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
-  infoPtr->hDefaultFont = CreateFontIndirectA(&logFont);
+  SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
+  infoPtr->hDefaultFont = CreateFontIndirectW(&logFont);
   infoPtr->hFont = infoPtr->hDefaultFont;
-
+  LISTVIEW_SaveTextMetrics(hwnd);
+  
   /* create header */
-  infoPtr->hwndHeader = CreateWindowA(WC_HEADERA, (LPCSTR)NULL,
-                                      WS_CHILD | HDS_HORZ | HDS_BUTTONS,
-                                      0, 0, 0, 0, hwnd, (HMENU)0,
-                                      lpcs->hInstance, NULL);
+  infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, (LPCWSTR)NULL, 
+    WS_CHILD | HDS_HORZ | (DWORD)((LVS_NOSORTHEADER & lpcs->style)?0:HDS_BUTTONS), 
+    0, 0, 0, 0, hwnd, (HMENU)0, 
+    lpcs->hInstance, NULL);
+
+  /* set header unicode format */
+  SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT,(WPARAM)TRUE,(LPARAM)NULL);
 
   /* set header font */
-  SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont,
+  SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, 
                (LPARAM)TRUE);
-
+  
   if (uView == LVS_ICON)
   {
@@ -8095 +8496 @@
     {
       /* set HDS_HIDDEN flag to hide the header bar */
-      SetWindowLongA(infoPtr->hwndHeader, GWL_STYLE,
-                    GetWindowLongA(infoPtr->hwndHeader, GWL_STYLE) | HDS_HIDDEN);
-    }
-
+      SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, 
+                    GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE) | HDS_HIDDEN);
+    }
+      
 
     infoPtr->iconSize.cx = GetSystemMetrics(SM_CXSMICON);
@@ -8123 +8524 @@
 
   /* initialize the hover time to -1(indicating the default system hover time) */
-  infoPtr->dwHoverTime = -1;
+  infoPtr->dwHoverTime = -1;  
 
 #ifdef __WIN32OS2__
@@ -8139 +8540 @@
  * DESCRIPTION:
  * Erases the background of the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] WPARAM : device context handle
  * [I] LPARAM : not used
- *
+ * 
  * RETURN:
  *   SUCCESS : TRUE
  *   FAILURE : FALSE
  */
-static LRESULT LISTVIEW_EraseBackground(HWND hwnd, WPARAM wParam,
+static LRESULT LISTVIEW_EraseBackground(HWND hwnd, WPARAM wParam, 
                                         LPARAM lParam)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   BOOL bResult;
 
-  if (infoPtr->clrBk == CLR_NONE)
-  {
-    bResult = SendMessageA(GetParent(hwnd), WM_ERASEBKGND, wParam, lParam);
-  }
-  else
+  TRACE("(hwnd=%x, wParam=%x, lParam=%lx)\n", hwnd, wParam, lParam);
+  
+  if (infoPtr->clrBk == CLR_NONE) 
+  {
+    bResult = SendMessageW(GetParent(hwnd), WM_ERASEBKGND, wParam, lParam);
+  }
+  else 
   {
     RECT rc;
@@ -8175 +8578 @@
 static void LISTVIEW_FillBackground(HWND hwnd, HDC hdc, LPRECT rc)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
-  if (infoPtr->clrBk != CLR_NONE)
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwnd=%x, hdc=%x, rc=%p)\n", hwnd, hdc, rc);
+
+  if (infoPtr->clrBk != CLR_NONE) 
   {
     HBRUSH hBrush = CreateSolidBrush(infoPtr->clrBk);
@@ -8188 +8593 @@
  * DESCRIPTION:
  * Retrieves the listview control font.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -8197 +8602 @@
 static LRESULT LISTVIEW_GetFont(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwnd=%x)\n", hwnd);
 
   return infoPtr->hFont;
@@ -8205 +8612 @@
  * DESCRIPTION:
  * Performs vertical scrolling.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : scroll code
- * [I] SHORT : current scroll position if scroll code is SB_THUMBPOSITION
+ * [I] SHORT : current scroll position if scroll code is SB_THUMBPOSITION 
  *             or SB_THUMBTRACK.
  * [I] HWND : scrollbar control window handle
@@ -8219 +8626 @@
                                 HWND hScrollWnd)
 {
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   SCROLLINFO scrollInfo;
 
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  SendMessageA(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
+  TRACE("(hwnd=%x, nScrollCode=%d, nCurrentPos=%d, hScrollWnd=%x)\n", 
+        hwnd, nScrollCode, nCurrentPos, hScrollWnd);
+
+  SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
 
   ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
@@ -8235 +8645 @@
     case SB_LINEUP:
       if (scrollInfo.nPos > scrollInfo.nMin)
-      {
         scrollInfo.nPos--;
-      }
     break;
-
+    
     case SB_LINEDOWN:
       if (scrollInfo.nPos < scrollInfo.nMax)
-      {
         scrollInfo.nPos++;
-      }
       break;
-
+      
     case SB_PAGEUP:
       if (scrollInfo.nPos > scrollInfo.nMin)
       {
         if (scrollInfo.nPos >= scrollInfo.nPage)
-        {
           scrollInfo.nPos -= scrollInfo.nPage;
-        }
         else
-        {
           scrollInfo.nPos = scrollInfo.nMin;
-        }
       }
       break;
-
+      
     case SB_PAGEDOWN:
       if (scrollInfo.nPos < scrollInfo.nMax)
       {
         if (scrollInfo.nPos <= scrollInfo.nMax - scrollInfo.nPage)
-        {
           scrollInfo.nPos += scrollInfo.nPage;
-        }
         else
-        {
           scrollInfo.nPos = scrollInfo.nMax;
-        }
       }
       break;
@@ -8291 +8689 @@
       scrollInfo.fMask = SIF_POS;
       SetScrollInfo(hwnd, SB_VERT, &scrollInfo, TRUE);
-      InvalidateRect(hwnd, NULL, TRUE);
-    }
-  }
-
+      if (IsWindowVisible(infoPtr->hwndHeader))
+      {
+        RECT rListview, rcHeader, rDest;
+        GetClientRect(hwnd, &rListview);
+        GetWindowRect(infoPtr->hwndHeader, &rcHeader);
+        MapWindowPoints((HWND) NULL, hwnd, (LPPOINT) &rcHeader, 2);
+        SubtractRect(&rDest, &rListview, &rcHeader);
+        InvalidateRect(hwnd, &rDest, TRUE);
+      }
+      else
+        InvalidateRect(hwnd, NULL, TRUE);
+    }
+  }
+    
   return 0;
 }
@@ -8301 +8709 @@
  * DESCRIPTION:
  * Performs horizontal scrolling.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : scroll code
- * [I] SHORT : current scroll position if scroll code is SB_THUMBPOSITION
+ * [I] SHORT : current scroll position if scroll code is SB_THUMBPOSITION 
  *             or SB_THUMBTRACK.
  * [I] HWND : scrollbar control window handle
@@ -8315 +8723 @@
                                 HWND hScrollWnd)
 {
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   SCROLLINFO scrollInfo;
 
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  SendMessageA(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
-
+  TRACE("(hwnd=%x, nScrollCode=%d, nCurrentPos=%d, hScrollWnd=%x)\n", 
+        hwnd, nScrollCode, nCurrentPos, hScrollWnd);
+  
+  SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
 
   ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
   scrollInfo.cbSize = sizeof(SCROLLINFO);
   scrollInfo.fMask = SIF_PAGE | SIF_POS | SIF_RANGE;
-
+ 
   if (GetScrollInfo(hwnd, SB_HORZ, &scrollInfo) != FALSE)
   {
@@ -8333 +8743 @@
     case SB_LINELEFT:
       if (scrollInfo.nPos > scrollInfo.nMin)
-      {
         scrollInfo.nPos--;
-      }
       break;
-
+    
     case SB_LINERIGHT:
       if (scrollInfo.nPos < scrollInfo.nMax)
-      {
         scrollInfo.nPos++;
-      }
       break;
-
+      
     case SB_PAGELEFT:
       if (scrollInfo.nPos > scrollInfo.nMin)
       {
         if (scrollInfo.nPos >= scrollInfo.nPage)
-        {
           scrollInfo.nPos -= scrollInfo.nPage;
-        }
         else
-        {
           scrollInfo.nPos = scrollInfo.nMin;
-        }
       }
       break;
-
+      
     case SB_PAGERIGHT:
       if (scrollInfo.nPos < scrollInfo.nMax)
       {
         if (scrollInfo.nPos <= scrollInfo.nMax - scrollInfo.nPage)
-        {
           scrollInfo.nPos += scrollInfo.nPage;
-        }
         else
-        {
           scrollInfo.nPos = scrollInfo.nMax;
-        }
       }
       break;
@@ -8387 +8785 @@
     if (nOldScrollPos != scrollInfo.nPos)
     {
-      UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+      UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
       scrollInfo.fMask = SIF_POS;
       SetScrollInfo(hwnd, SB_HORZ, &scrollInfo, TRUE);
@@ -8399 +8797 @@
     }
   }
-
+    
   return 0;
 }
@@ -8405 +8803 @@
 static LRESULT LISTVIEW_MouseWheel(HWND hwnd, INT wheelDelta)
 {
+    UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
     INT gcWheelDelta = 0;
     UINT pulScrollLines = 3;
     SCROLLINFO scrollInfo;
 
-    UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+    TRACE("(hwnd=%x, wheelDelta=%d)\n", hwnd, wheelDelta);
 
     SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0);
@@ -8451 +8850 @@
 /***
  * DESCRIPTION:
- * ???
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] INT : virtual key
+ * ??? 
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT : virtual key 
  * [I] LONG : key data
  *
@@ -8463 +8862 @@
 static LRESULT LISTVIEW_KeyDown(HWND hwnd, INT nVirtualKey, LONG lKeyData)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView =  GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  INT nItem = -1;
   INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  NMLVKEYDOWN nmKeyDown; 
   HWND hwndParent = GetParent(hwnd);
-  NMLVKEYDOWN nmKeyDown;
-  NMHDR nmh;
-  INT nItem = -1;
-  BOOL bRedraw = FALSE;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView =  lStyle & LVS_TYPEMASK;
+
+  TRACE("(hwnd=%x, nVirtualKey=%d, lKeyData=%ld)\n", hwnd, nVirtualKey, lKeyData);
 
   /* send LVN_KEYDOWN notification */
-  ZeroMemory(&nmKeyDown, sizeof(NMLVKEYDOWN));
-  nmKeyDown.hdr.hwndFrom = hwnd;
-  nmKeyDown.hdr.idFrom = nCtrlId;
-  nmKeyDown.hdr.code = LVN_KEYDOWN;
-  nmKeyDown.wVKey = nVirtualKey;
+  nmKeyDown.wVKey = nVirtualKey; 
   nmKeyDown.flags = 0;
 #ifdef __WIN32OS2__
@@ -8486 +8880 @@
   }
 #else
-  SendMessageA(hwndParent, WM_NOTIFY, (WPARAM)nCtrlId, (LPARAM)&nmKeyDown);
+  notify(hwnd, LVN_KEYDOWN, &nmKeyDown.hdr);
 #endif
-
-  /* initialize */
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-
+  
   switch (nVirtualKey)
   {
@@ -8498 +8888 @@
     if ((GETITEMCOUNT(infoPtr) > 0) && (infoPtr->nFocusedItem != -1))
     {
-      /* send NM_RETURN notification */
-      nmh.code = NM_RETURN;
-      ListView_Notify(hwndParent, nCtrlId, &nmh);
-
-      /* send LVN_ITEMACTIVATE notification */
-      nmh.code = LVN_ITEMACTIVATE;
-      ListView_Notify(hwndParent, nCtrlId, &nmh);
+      hdr_notify(hwnd, NM_RETURN);        /* NM_RETURN notification */
+      hdr_notify(hwnd, LVN_ITEMACTIVATE); /* LVN_ITEMACTIVATE notification */
     }
     break;
@@ -8510 +8895 @@
   case VK_HOME:
     if (GETITEMCOUNT(infoPtr) > 0)
-    {
       nItem = 0;
-    }
     break;
 
   case VK_END:
     if (GETITEMCOUNT(infoPtr) > 0)
-    {
       nItem = GETITEMCOUNT(infoPtr) - 1;
-    }
     break;
 
@@ -8529 +8910 @@
     nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_ABOVE);
     break;
-
+    
   case VK_RIGHT:
     nItem = ListView_GetNextItem(hwnd, infoPtr->nFocusedItem, LVNI_TORIGHT);
@@ -8540 +8921 @@
   case VK_PRIOR:
     if (uView == LVS_REPORT)
-    {
       nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(hwnd);
-    }
     else
-    {
-      nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(hwnd)
+      nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(hwnd) 
                                     * LISTVIEW_GetCountPerRow(hwnd);
-    }
     if(nItem < 0) nItem = 0;
     break;
@@ -8553 +8930 @@
   case VK_NEXT:
     if (uView == LVS_REPORT)
-    {
       nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(hwnd);
-    }
     else
-    {
       nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(hwnd)
                                     * LISTVIEW_GetCountPerRow(hwnd);
-    }
     if(nItem >= GETITEMCOUNT(infoPtr)) nItem = GETITEMCOUNT(infoPtr) - 1;
     break;
@@ -8567 +8940 @@
   if ((nItem != -1) && (nItem != infoPtr->nFocusedItem))
   {
-    bRedraw = LISTVIEW_KeySelection(hwnd, nItem);
-    if (bRedraw != FALSE)
-    {
-      /* refresh client area */
-      UpdateWindow(hwnd);
-    }
+    if (LISTVIEW_KeySelection(hwnd, nItem))
+      UpdateWindow(hwnd); /* update client area */
   }
 
@@ -8581 +8950 @@
  * DESCRIPTION:
  * Kills the focus.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -8590 +8959 @@
 static LRESULT LISTVIEW_KillFocus(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  NMHDR nmh;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongW(hwnd, 0);
+  UINT uView =  GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
   INT i,nTop,nBottom;
-  RECT rcItem;
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView =  lStyle & LVS_TYPEMASK;
-
+ 
   TRACE("(hwnd=%x)\n", hwnd);
 
   /* send NM_KILLFOCUS notification */
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-  nmh.code = NM_KILLFOCUS;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
+  hdr_notify(hwnd, NM_KILLFOCUS);
 
   /* set window focus flag */
@@ -8611 +8973 @@
   /* NEED drawing optimization ; redraw the selected items */
   if (uView & LVS_REPORT)
-  {
+  { 
     nTop = LISTVIEW_GetTopIndex(hwnd);
-    nBottom = nTop +
+    nBottom = nTop + 
               LISTVIEW_GetCountPerColumn(hwnd) + 1;
   }
@@ -8625 +8987 @@
     if (LISTVIEW_IsSelected(hwnd,i))
     {
+      RECT rcItem;
       rcItem.left = LVIR_BOUNDS;
       LISTVIEW_GetItemRect(hwnd, i, &rcItem);
@@ -8637 +9000 @@
  * DESCRIPTION:
  * Processes double click messages (left mouse button).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -8647 +9010 @@
  * Zero
  */
-static LRESULT LISTVIEW_LButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX,
+static LRESULT LISTVIEW_LButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX, 
                                       WORD wPosY)
 {
-  LONG nCtrlId = GetWindowLongA(hwnd, GWL_ID);
   LVHITTESTINFO htInfo;
-  NMHDR nmh;
   NMLISTVIEW nmlv;
-  INT ret;
-
-  TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+
+  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
   htInfo.pt.x = wPosX;
@@ -8663 +9023 @@
   /* send NM_DBLCLK notification */
   ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-  nmlv.hdr.hwndFrom = hwnd;
-  nmlv.hdr.idFrom = nCtrlId;
-  nmlv.hdr.code = NM_DBLCLK;
-  ret = LISTVIEW_HitTestItem(hwnd, &htInfo, TRUE);
-  if (ret != -1)
+  if (LISTVIEW_HitTestItem(hwnd, &htInfo, TRUE) != -1)
   {
     nmlv.iItem = htInfo.iItem;
@@ -8676 +9032 @@
     nmlv.iItem = -1;
     nmlv.iSubItem = 0;
-  }
+  }  
   nmlv.ptAction.x = wPosX;
   nmlv.ptAction.y = wPosY;
-  ListView_LVNotify(GetParent(hwnd), nCtrlId, &nmlv);
+  listview_notify(hwnd, NM_DBLCLK, &nmlv);
 
 
   /* To send the LVN_ITEMACTIVATE, it must be on an Item */
-  if(ret != -1)
-  {
-    /* send LVN_ITEMACTIVATE notification */
-    nmh.hwndFrom = hwnd;
-    nmh.idFrom = nCtrlId;
-    nmh.code = LVN_ITEMACTIVATE;
-    ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
-  }
+  if(nmlv.iItem != -1)
+    hdr_notify(hwnd, LVN_ITEMACTIVATE);
 
   return 0;
@@ -8698 +9048 @@
  * DESCRIPTION:
  * Processes mouse down messages (left mouse button).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -8708 +9058 @@
  * Zero
  */
-static LRESULT LISTVIEW_LButtonDown(HWND hwnd, WORD wKey, WORD wPosX,
+static LRESULT LISTVIEW_LButtonDown(HWND hwnd, WORD wKey, WORD wPosX, 
                                     WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
+  INT nCtrlId = GetWindowLongW(hwnd, GWL_ID);
   static BOOL bGroupSelect = TRUE;
   POINT ptPosition;
-  NMHDR nmh;
   INT nItem;
 
-  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX,
-        wPosY);
+  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
   /* send NM_RELEASEDCAPTURE notification */
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-  nmh.code = NM_RELEASEDCAPTURE;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
-
+  hdr_notify(hwnd, NM_RELEASEDCAPTURE);
+ 
   if (infoPtr->bFocus == FALSE)
-  {
     SetFocus(hwnd);
-  }
 
   /* set left button down flag */
   infoPtr->bLButtonDown = TRUE;
-
+  
   ptPosition.x = wPosX;
   ptPosition.y = wPosY;
@@ -8744 +9087 @@
     {
       if ((ListView_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED)
-          && infoPtr->nEditLabelItem == -1)
-      {
+          && infoPtr->nEditLabelItem == -1) 
           infoPtr->nEditLabelItem = nItem;
-      }
       else
-      {
         LISTVIEW_SetSelection(hwnd, nItem);
-      }
     }
     else
@@ -8757 +9096 @@
       if ((wKey & MK_CONTROL) && (wKey & MK_SHIFT))
       {
-        if (bGroupSelect != FALSE)
-        {
+        if (bGroupSelect)
           LISTVIEW_AddGroupSelection(hwnd, nItem);
-        }
         else
-        {
           LISTVIEW_AddSelection(hwnd, nItem);
-        }
       }
       else if (wKey & MK_CONTROL)
@@ -8776 +9111 @@
       else
       {
-    BOOL was_selected =
-        (ListView_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED);
-
-    /* set selection (clears other pre-existing selections) */
+        BOOL was_selected =
+            (ListView_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED);
+
+        /* set selection (clears other pre-existing selections) */
         LISTVIEW_SetSelection(hwnd, nItem);
 
         if (was_selected && infoPtr->nEditLabelItem == -1)
-        {
           infoPtr->nEditLabelItem = nItem;
-        }
       }
     }
@@ -8809 +9142 @@
  * DESCRIPTION:
  * Processes mouse up messages (left mouse button).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -8819 +9152 @@
  * Zero
  */
-static LRESULT LISTVIEW_LButtonUp(HWND hwnd, WORD wKey, WORD wPosX,
+static LRESULT LISTVIEW_LButtonUp(HWND hwnd, WORD wKey, WORD wPosX, 
                                   WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
-  TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
-
-  if (infoPtr->bLButtonDown != FALSE)
-  {
-    INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwnd=%x, key=%hu, X=%hu, Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
+
+  if (infoPtr->bLButtonDown != FALSE) 
+  {
+    LVHITTESTINFO lvHitTestInfo;
     NMLISTVIEW nmlv;
-    LVHITTESTINFO lvHitTestInfo;
-    INT ret;
 
     lvHitTestInfo.pt.x = wPosX;
@@ -8838 +9169 @@
   /* send NM_CLICK notification */
     ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-    nmlv.hdr.hwndFrom = hwnd;
-    nmlv.hdr.idFrom = nCtrlId;
-    nmlv.hdr.code = NM_CLICK;
-    ret = LISTVIEW_HitTestItem(hwnd, &lvHitTestInfo, TRUE);
-    if (ret != -1)
+    if (LISTVIEW_HitTestItem(hwnd, &lvHitTestInfo, TRUE) != -1)
     {
         nmlv.iItem = lvHitTestInfo.iItem;
@@ -8854 +9181 @@
     nmlv.ptAction.x = wPosX;
     nmlv.ptAction.y = wPosY;
-    ListView_LVNotify(GetParent(hwnd), nCtrlId, &nmlv);
-
+    listview_notify(hwnd, NM_CLICK, &nmlv);
 
     /* set left button flag */
@@ -8862 +9188 @@
     if(infoPtr->nEditLabelItem != -1)
     {
-      if(lvHitTestInfo.iItem == infoPtr->nEditLabelItem)
-      {
-        LISTVIEW_EditLabelA(hwnd, lvHitTestInfo.iItem);
-      }
+      if(lvHitTestInfo.iItem == infoPtr->nEditLabelItem && lvHitTestInfo.flags & LVHT_ONITEMLABEL)
+        LISTVIEW_EditLabelT(hwnd, lvHitTestInfo.iItem, TRUE);
       infoPtr->nEditLabelItem = -1;
     }
@@ -8876 +9200 @@
  * DESCRIPTION:
  * Creates the listview control (called before WM_CREATE).
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- * [I] WPARAM : unhandled
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] WPARAM : unhandled 
  * [I] LPARAM : widow creation info
- *
+ * 
  * RETURN:
  * Zero
@@ -8889 +9213 @@
   LISTVIEW_INFO *infoPtr;
 
-  TRACE("(hwnd=%x,wParam=%x,lParam=%lx)\n", hwnd, wParam, lParam);
+  TRACE("(hwnd=%x, wParam=%x, lParam=%lx)\n", hwnd, wParam, lParam);
 
   /* allocate memory for info structure */
@@ -8897 +9221 @@
   infoPtr = (LISTVIEW_INFO *)COMCTL32_Alloc(sizeof(LISTVIEW_INFO));
 #endif
-  SetWindowLongA(hwnd, 0, (LONG)infoPtr);
-  if (infoPtr == NULL)
+  if (infoPtr == NULL) 
   {
     ERR("could not allocate info memory!\n");
@@ -8904 +9227 @@
   }
 
-  if ((LISTVIEW_INFO *)GetWindowLongA(hwnd, 0) != infoPtr)
+  SetWindowLongW(hwnd, 0, (LONG)infoPtr);
+  if ((LISTVIEW_INFO *)GetWindowLongW(hwnd, 0) != infoPtr) 
   {
     ERR("pointer assignment error!\n");
@@ -8910 +9234 @@
   }
 
-  return DefWindowProcA(hwnd, WM_NCCREATE, wParam, lParam);
+  return DefWindowProcW(hwnd, WM_NCCREATE, wParam, lParam);
 }
 
@@ -8916 +9240 @@
  * DESCRIPTION:
  * Destroys the listview control (called after WM_DESTROY).
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * 
  * RETURN:
  * Zero
@@ -8925 +9249 @@
 static LRESULT LISTVIEW_NCDestroy(HWND hwnd)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   TRACE("(hwnd=%x)\n", hwnd);
@@ -8951 +9275 @@
   COMCTL32_Free(infoPtr);
 
-  SetWindowLongA(hwnd, 0, 0);
+  SetWindowLongW(hwnd, 0, 0);
   return 0;
 }
@@ -8958 +9282 @@
  * DESCRIPTION:
  * Handles notifications from children.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
  * [I] INT : control identifier
  * [I] LPNMHDR : notification information
- *
+ * 
  * RETURN:
  * Zero
@@ -8969 +9293 @@
 static LRESULT LISTVIEW_Notify(HWND hwnd, INT nCtrlId, LPNMHDR lpnmh)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
-  if (lpnmh->hwndFrom == infoPtr->hwndHeader)
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  
+  TRACE("(hwnd=%x, nCtrlId=%d, lpnmh=%p)\n", hwnd, nCtrlId, lpnmh);
+  
+  if (lpnmh->hwndFrom == infoPtr->hwndHeader) 
   {
     /* handle notification from header control */
-    if (lpnmh->code == HDN_ENDTRACKA)
+    if (lpnmh->code == HDN_ENDTRACKW)
     {
       infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
@@ -8998 +9324 @@
     }
 #endif
-    else if(lpnmh->code ==  HDN_ITEMCLICKA)
+    else if(lpnmh->code ==  HDN_ITEMCLICKW || lpnmh->code ==  HDN_ITEMCLICKA)
     {
         /* Handle sorting by Header Column */
         NMLISTVIEW nmlv;
-        LPNMHEADERA pnmHeader = (LPNMHEADERA) lpnmh;
-        LONG lCtrlId = GetWindowLongA(hwnd, GWL_ID);
 
         ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-        nmlv.hdr.hwndFrom = hwnd;
-        nmlv.hdr.idFrom = lCtrlId;
-        nmlv.hdr.code = LVN_COLUMNCLICK;
         nmlv.iItem = -1;
-        nmlv.iSubItem = pnmHeader->iItem;
-
-        ListView_LVNotify(GetParent(hwnd),lCtrlId, &nmlv);
-
+        nmlv.iSubItem = ((LPNMHEADERW)lpnmh)->iItem;
+        listview_notify(hwnd, LVN_COLUMNCLICK, &nmlv);
     }
     else if(lpnmh->code == NM_RELEASEDCAPTURE)
@@ -9036 +9355 @@
  * DESCRIPTION:
  * Determines the type of structure to use.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle of the sender
- * [I] HWND : listview window handle
+ * [I] HWND : listview window handle 
  * [I] INT : command specifying the nature of the WM_NOTIFYFORMAT
  *
@@ -9047 +9366 @@
 static LRESULT LISTVIEW_NotifyFormat(HWND hwndFrom, HWND hwnd, INT nCommand)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+
+  TRACE("(hwndFrom=%x, hwnd=%x, nCommand=%d)\n", hwndFrom, hwnd, nCommand);
+  
   if (nCommand == NF_REQUERY)
-  {
-    /* determine the type of structure to use */
-    infoPtr->notifyFormat = SendMessageA(hwndFrom, WM_NOTIFYFORMAT,
+    infoPtr->notifyFormat = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, 
                                          (WPARAM)hwnd, (LPARAM)NF_QUERY);
-    if (infoPtr->notifyFormat == NFR_UNICODE)
-    {
-      FIXME("NO support for unicode structures\n");
-    }
-  }
-
   return 0;
 }
@@ -9066 +9379 @@
  * DESCRIPTION:
  * Paints/Repaints the listview control.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9078 +9391 @@
   PAINTSTRUCT ps;
 
-   TRACE("(hwnd=%x,hdc=%x)\n", hwnd, hdc);
+  TRACE("(hwnd=%x, hdc=%x)\n", hwnd, hdc);
 
   if (hdc == 0)
@@ -9097 +9410 @@
  * DESCRIPTION:
  * Processes double click messages (right mouse button).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9107 +9420 @@
  * Zero
  */
-static LRESULT LISTVIEW_RButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX,
+static LRESULT LISTVIEW_RButtonDblClk(HWND hwnd, WORD wKey, WORD wPosX, 
                                       WORD wPosY)
 {
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  NMHDR nmh;
-
   TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
-  /* send NM_RELEASEDCAPTURE notification */
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-  nmh.code = NM_RELEASEDCAPTURE;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
+  /* send NM_RELEASEDCAPTURE notification */ 
+  hdr_notify(hwnd, NM_RELEASEDCAPTURE);
 
   /* send NM_RDBLCLK notification */
-  nmh.code = NM_RDBLCLK;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
+  hdr_notify(hwnd, NM_RDBLCLK);
 
   return 0;
@@ -9131 +9437 @@
  * DESCRIPTION:
  * Processes mouse down messages (right mouse button).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9141 +9447 @@
  * Zero
  */
-static LRESULT LISTVIEW_RButtonDown(HWND hwnd, WORD wKey, WORD wPosX,
+static LRESULT LISTVIEW_RButtonDown(HWND hwnd, WORD wKey, WORD wPosX, 
                                     WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   POINT ptPosition;
-  NMHDR nmh;
   INT nItem;
+  NMLISTVIEW nmlv;
+  LVHITTESTINFO lvHitTestInfo;
 
   TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
   /* send NM_RELEASEDCAPTURE notification */
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-  nmh.code = NM_RELEASEDCAPTURE;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
-
+  hdr_notify(hwnd, NM_RELEASEDCAPTURE);
+ 
   /* make sure the listview control window has the focus */
   if (infoPtr->bFocus == FALSE)
-  {
     SetFocus(hwnd);
-  }
 
   /* set right button down flag */
@@ -9176 +9477 @@
     if (!((wKey & MK_SHIFT) || (wKey & MK_CONTROL)) &&
         !LISTVIEW_IsSelected(hwnd,nItem))
-    {
       LISTVIEW_SetSelection(hwnd, nItem);
-    }
   }
   else
@@ -9185 +9484 @@
   }
 
+  lvHitTestInfo.pt.x = wPosX;
+  lvHitTestInfo.pt.y = wPosY;
+
+  /* Send NM_RClICK notification */
+  ZeroMemory(&nmlv, sizeof(nmlv));
+  if (LISTVIEW_HitTestItem(hwnd, &lvHitTestInfo, TRUE) != -1)
+  {
+    nmlv.iItem = lvHitTestInfo.iItem;
+    nmlv.iSubItem = lvHitTestInfo.iSubItem;
+  }
+  else
+  {
+    nmlv.iItem = -1;
+    nmlv.iSubItem = 0;
+  }
+  nmlv.ptAction.x = wPosX;
+  nmlv.ptAction.y = wPosY;
+  listview_notify(hwnd, NM_RCLICK, &nmlv);
+  
   return 0;
 }
@@ -9191 +9509 @@
  * DESCRIPTION:
  * Processes mouse up messages (right mouse button).
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9201 +9519 @@
  * Zero
  */
-static LRESULT LISTVIEW_RButtonUp(HWND hwnd, WORD wKey, WORD wPosX,
+static LRESULT LISTVIEW_RButtonUp(HWND hwnd, WORD wKey, WORD wPosX, 
                                   WORD wPosY)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   TRACE("(hwnd=%x,key=%hu,X=%hu,Y=%hu)\n", hwnd, wKey, wPosX, wPosY);
 
-  if (infoPtr->bRButtonDown != FALSE)
-  {
-    NMLISTVIEW nmlv;
-    LVHITTESTINFO lvHitTestInfo;
+  if (infoPtr->bRButtonDown) 
+  {
     POINT pt;
-    INT ret;
-
-    lvHitTestInfo.pt.x = wPosX;
-    lvHitTestInfo.pt.y = wPosY;
-
-    /* Send NM_RClICK notification */
-    ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-    nmlv.hdr.hwndFrom = hwnd;
-    nmlv.hdr.idFrom = nCtrlId;
-    nmlv.hdr.code = NM_RCLICK;
-    ret = LISTVIEW_HitTestItem(hwnd, &lvHitTestInfo, TRUE);
-    if (ret != -1)
-    {
-        nmlv.iItem = lvHitTestInfo.iItem;
-        nmlv.iSubItem = lvHitTestInfo.iSubItem;
-    }
-    else
-    {
-        nmlv.iItem = -1;
-        nmlv.iSubItem = 0;
-    }
-    nmlv.ptAction.x = wPosX;
-    nmlv.ptAction.y = wPosY;
-    ListView_LVNotify(GetParent(hwnd), nCtrlId, &nmlv);
 
     pt.x = wPosX;
@@ -9244 +9535 @@
     /* set button flag */
     infoPtr->bRButtonDown = FALSE;
-
+    
     /* Change to screen coordinate for WM_CONTEXTMENU */
     ClientToScreen(hwnd, &pt);
-
+    
     /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */
-    SendMessageA( hwnd, WM_CONTEXTMENU, (WPARAM) hwnd, MAKELPARAM(pt.x, pt.y));
-  }
-
+    SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM) hwnd, MAKELPARAM(pt.x, pt.y));
+  }
+  
   return 0;
 }
@@ -9257 +9548 @@
 /***
  * DESCRIPTION:
- * Sets the focus.
- *
+ * Sets the focus.  
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9268 +9559 @@
 static LRESULT LISTVIEW_SetFocus(HWND hwnd, HWND hwndLoseFocus)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  INT nCtrlId = GetWindowLongA(hwnd, GWL_ID);
-  NMHDR nmh;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
 
   TRACE("(hwnd=%x, hwndLoseFocus=%x)\n", hwnd, hwndLoseFocus);
 
   /* send NM_SETFOCUS notification */
-  nmh.hwndFrom = hwnd;
-  nmh.idFrom = nCtrlId;
-  nmh.code = NM_SETFOCUS;
-  ListView_Notify(GetParent(hwnd), nCtrlId, &nmh);
+  hdr_notify(hwnd, NM_SETFOCUS);
 
   /* set window focus flag */
@@ -9290 +9576 @@
 /***
  * DESCRIPTION:
- * Sets the font.
- *
+ * Sets the font.  
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9302 +9588 @@
 static LRESULT LISTVIEW_SetFont(HWND hwnd, HFONT hFont, WORD fRedraw)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT uView = GetWindowLongA(hwnd, GWL_STYLE) & LVS_TYPEMASK;
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  UINT uView = GetWindowLongW(hwnd, GWL_STYLE) & LVS_TYPEMASK;
 
   TRACE("(hwnd=%x,hfont=%x,redraw=%hu)\n", hwnd, hFont, fRedraw);
 
-  if (hFont == 0)
-  {
-    infoPtr->hFont = infoPtr->hDefaultFont;
-  }
-  else
-  {
-    infoPtr->hFont = hFont;
-  }
+  infoPtr->hFont = hFont ? hFont : infoPtr->hDefaultFont;
+  LISTVIEW_SaveTextMetrics(hwnd);
 
   if (uView == LVS_REPORT)
   {
     /* set header font */
-    SendMessageA(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont,
+    SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, 
                    MAKELPARAM(fRedraw, 0));
   }
@@ -9330 +9610 @@
   /* invalidate listview control client area */
   InvalidateRect(hwnd, NULL, TRUE);
-
+  
   if (fRedraw != FALSE)
-  {
     UpdateWindow(hwnd);
-  }
 
   return 0;
@@ -9341 +9619 @@
 /***
  * DESCRIPTION:
- * Message handling for WM_SETREDRAW.
+ * Message handling for WM_SETREDRAW.  
  * For the Listview, it invalidates the entire window (the doc specifies otherwise)
- *
+ * 
  * PARAMETER(S):
  * [I] HWND   : window handle
@@ -9385 +9663 @@
  * Resizes the listview control. This function processes WM_SIZE
  * messages.  At this time, the width and height are not used.
- *
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9396 +9674 @@
 static LRESULT LISTVIEW_Size(HWND hwnd, int Width, int Height)
 {
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE); 
   UINT uView = lStyle & LVS_TYPEMASK;
 #ifdef __WIN32OS2__
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
 #endif
-  TRACE("(hwnd=%x, width=%d, height=%d)\n",hwnd, Width, Height);
-
-  LISTVIEW_UpdateSize(hwnd);
-
-  if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
-  {
-    if (lStyle & LVS_ALIGNLEFT)
-    {
-      LISTVIEW_AlignLeft(hwnd);
-    }
-    else
-    {
-      LISTVIEW_AlignTop(hwnd);
-    }
-  }
-
-  LISTVIEW_UpdateScroll(hwnd);
+  TRACE("(hwnd=%x, width=%d, height=%d)\n", hwnd, Width, Height);
+
+  if (LISTVIEW_UpdateSize(hwnd))
+  {
+    if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
+    {
+        if (lStyle & LVS_ALIGNLEFT)
+            LISTVIEW_AlignLeft(hwnd);
+        else
+            LISTVIEW_AlignTop(hwnd);
+    }
+
+    LISTVIEW_UpdateScroll(hwnd);
 
 #ifdef __WIN32OS2__
@@ -9424 +9698 @@
   infoPtr->nItemHeight = LISTVIEW_GetItemHeight(hwnd);
 #endif
-
-  /* invalidate client area + erase background */
-  InvalidateRect(hwnd, NULL, TRUE);
+  
+    /* invalidate client area + erase background */
+    InvalidateRect(hwnd, NULL, TRUE);
+  }
 
   return 0;
@@ -9434 +9709 @@
  * DESCRIPTION:
  * Sets the size information.
- *
- * PARAMETER(S):
- * [I] HWND : window handle
- *
- * RETURN:
- * Zero
- */
-static VOID LISTVIEW_UpdateSize(HWND hwnd)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
+ * 
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ *
+ * RETURN:
+ * Zero if no size change
+ * 1 of size changed
+ */
+static BOOL LISTVIEW_UpdateSize(HWND hwnd)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+  LONG lStyle = GetWindowLongW(hwnd, GWL_STYLE);
   UINT uView = lStyle & LVS_TYPEMASK;
   RECT rcList;
-
+  RECT rcOld;
+  
+  TRACE("(hwnd=%x)\n", hwnd);
+  
   GetClientRect(hwnd, &rcList);
+  CopyRect(&rcOld,&(infoPtr->rcList));
   infoPtr->rcList.left = 0;
   infoPtr->rcList.right = max(rcList.right - rcList.left, 1);
   infoPtr->rcList.top = 0;
   infoPtr->rcList.bottom = max(rcList.bottom - rcList.top, 1);
-
+     
   if (uView == LVS_LIST)
   {
@@ -9460 +9740 @@
       INT nHScrollHeight = GetSystemMetrics(SM_CYHSCROLL);
       if (infoPtr->rcList.bottom > nHScrollHeight)
-      {
         infoPtr->rcList.bottom -= nHScrollHeight;
-      }
     }
   }
@@ -9477 +9755 @@
 
     if (!(LVS_NOCOLUMNHEADER & lStyle))
-    {
       infoPtr->rcList.top = max(wp.cy, 0);
-    }
-  }
-}
-
-/***
- * DESCRIPTION:
- * Processes WM_STYLECHANGED messages.
- *
+  }
+  return (!EqualRect(&rcOld,&(infoPtr->rcList)));
+}
+
+/***
+ * DESCRIPTION:
+ * Processes WM_STYLECHANGED messages. 
+ * 
  * PARAMETER(S):
  * [I] HWND : window handle
@@ -9495 +9772 @@
  * Zero
  */
-static INT LISTVIEW_StyleChanged(HWND hwnd, WPARAM wStyleType,
+static INT LISTVIEW_StyleChanged(HWND hwnd, WPARAM wStyleType, 
                                  LPSTYLESTRUCT lpss)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
   UINT uNewView = lpss->styleNew & LVS_TYPEMASK;
   UINT uOldView = lpss->styleOld & LVS_TYPEMASK;
   RECT rcList = infoPtr->rcList;
 
-  TRACE("(hwnd=%x, styletype=%x, stylestruct=%p)\n",
+  TRACE("(hwnd=%x, styletype=%x, stylestruct=%p)\n", 
         hwnd, wStyleType, lpss);
 
@@ -9509 +9786 @@
   {
     if (uOldView == LVS_REPORT)
-    {
       ShowWindow(infoPtr->hwndHeader, SW_HIDE);
-    }
-
-    if ((lpss->styleOld & WS_HSCROLL) != 0)
-    {
+ 
+    if (((lpss->styleOld & WS_HSCROLL) != 0)&&
+        ((lpss->styleNew & WS_HSCROLL) == 0))
        ShowScrollBar(hwnd, SB_HORZ, FALSE);
-    }
-
-    if ((lpss->styleOld & WS_VSCROLL) != 0)
-    {
+ 
+    if (((lpss->styleOld & WS_VSCROLL) != 0)&&
+        ((lpss->styleNew & WS_VSCROLL) == 0))
        ShowScrollBar(hwnd, SB_VERT, FALSE);
-    }
-
+ 
     if (uNewView == LVS_ICON)
     {
@@ -9530 +9803 @@
       infoPtr->nItemHeight = LISTVIEW_GetItemHeight(hwnd);
       if (lpss->styleNew & LVS_ALIGNLEFT)
-      {
         LISTVIEW_AlignLeft(hwnd);
-      }
       else
-      {
         LISTVIEW_AlignTop(hwnd);
-      }
     }
     else if (uNewView == LVS_REPORT)
@@ -9546 +9815 @@
       hl.pwpos = &wp;
       Header_Layout(infoPtr->hwndHeader, &hl);
-      SetWindowPos(infoPtr->hwndHeader, hwnd, wp.x, wp.y, wp.cx, wp.cy,
+      SetWindowPos(infoPtr->hwndHeader, hwnd, wp.x, wp.y, wp.cx, wp.cy, 
                    wp.flags);
       if (!(LVS_NOCOLUMNHEADER & lpss->styleNew))
         ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL);
-
+      
       infoPtr->iconSize.cx = GetSystemMetrics(SM_CXSMICON);
       infoPtr->iconSize.cy = GetSystemMetrics(SM_CYSMICON);
@@ -9570 +9839 @@
       infoPtr->nItemHeight = LISTVIEW_GetItemHeight(hwnd);
       if (lpss->styleNew & LVS_ALIGNLEFT)
-      {
         LISTVIEW_AlignLeft(hwnd);
-      }
       else
-      {
         LISTVIEW_AlignTop(hwnd);
-      }
-    }
-
+    }
 
     /* update the size of the client area */
@@ -9585 +9849 @@
     /* add scrollbars if needed */
     LISTVIEW_UpdateScroll(hwnd);
-
+    
     /* invalidate client area + erase background */
     InvalidateRect(hwnd, NULL, TRUE);
@@ -9593 +9857 @@
   }
 
-  /* If they change the view and we have an active edit control
+  /* If they change the view and we have an active edit control 
      we will need to kill the control since the redraw will
      misplace the edit control.
@@ -9601 +9865 @@
         ((LVS_ICON|LVS_LIST|LVS_SMALLICON) & uOldView)))
   {
-     SendMessageA(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
+     SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
   }
 
@@ -9808 +10072 @@
   lvItem.header.pszText = NULL;
   lvItem.mustFree = FALSE;
-//  if (LISTVIEW_GetItemA(hwnd,(LPLVITEMW)&lvItem,TRUE,TRUE))
-  if (LISTVIEW_GetItemA(hwnd,(LPLVITEMA)&lvItem,TRUE))
-    nLabelWidth = LISTVIEW_GetStringWidth(hwnd,0,lvItem.header.pszText,lvItem.unicode);
+  if (LISTVIEW_GetItemT(hwnd,(LPLVITEMW)&lvItem,TRUE,TRUE))
+    nLabelWidth = ListView_GetStringWidthW(hwnd,lvItem.header.pszText);
   if (lvItem.mustFree) COMCTL32_Free(lvItem.header.pszText);
 
@@ -10009 +10272 @@
 
   return FALSE;
-}
-
-static LRESULT LISTVIEW_SetIconSpacing(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-  UINT dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = dwStyle & LVS_TYPEMASK;
-  DWORD oldIS = MAKELONG(infoPtr->iconSpacing.cx,infoPtr->iconSpacing.cy);
-  INT cx = LOWORD(lParam),cy = HIWORD(lParam);
-
-  if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING);
-  if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING);
-  if ((cx != infoPtr->iconSpacing.cx) || (cy != infoPtr->iconSpacing.cy))
-  {
-    infoPtr->iconSpacing.cx = cx;
-    infoPtr->iconSpacing.cy = cy;
-    if (((uView == LVS_ICON) || (uView == LVS_SMALLICON)) && (dwStyle & LVS_AUTOARRANGE))
-    {
-      LISTVIEW_Arrange(hwnd,LVA_DEFAULT);
-    }
-  }
-
-  return oldIS;
 }
 
@@ -10451 +10691 @@
   TRACE("hwnd=%x uMsg=%x wParam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
 #endif
-
-  if (!GetWindowLongA(hwnd, 0) && (uMsg != WM_NCCREATE))
-    return DefWindowProcA( hwnd, uMsg, wParam, lParam );
+  if (!GetWindowLongW(hwnd, 0) && (uMsg != WM_NCCREATE))
+    return DefWindowProcW( hwnd, uMsg, wParam, lParam );
   switch (uMsg)
   {
-  case LVM_APPROXIMATEVIEWRECT:
-    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam,
+  case LVM_APPROXIMATEVIEWRECT: 
+    return LISTVIEW_ApproximateViewRect(hwnd, (INT)wParam, 
                                         LOWORD(lParam), HIWORD(lParam));
-  case LVM_ARRANGE:
+  case LVM_ARRANGE: 
     return LISTVIEW_Arrange(hwnd, (INT)wParam);
 
@@ -10467 +10706 @@
 
 #endif
+
 /* case LVM_CREATEDRAGIMAGE: */
 
@@ -10479 +10719 @@
 
   case LVM_EDITLABELW:
+    return LISTVIEW_EditLabelT(hwnd, (INT)wParam, TRUE);
+    
   case LVM_EDITLABELA:
-    return LISTVIEW_EditLabelA(hwnd, (INT)wParam);
+    return LISTVIEW_EditLabelT(hwnd, (INT)wParam, FALSE);
 
   case LVM_ENSUREVISIBLE:
     return LISTVIEW_EnsureVisible(hwnd, (INT)wParam, (BOOL)lParam);
 
+  case LVM_FINDITEMW:
+    return LISTVIEW_FindItemW(hwnd, (INT)wParam, (LPLVFINDINFOW)lParam);
+
   case LVM_FINDITEMA:
-    return LISTVIEW_FindItem(hwnd, (INT)wParam, (LPLVFINDINFO)lParam);
+    return LISTVIEW_FindItemA(hwnd, (INT)wParam, (LPLVFINDINFOA)lParam);
 
   case LVM_GETBKCOLOR:
@@ -10498 +10743 @@
     return LISTVIEW_GetBkImage(hwnd,wParam,lParam,TRUE);
 #endif
-/*  case LVM_GETBKIMAGE: */
+/*      case LVM_GETBKIMAGE: */
 
   case LVM_GETCALLBACKMASK:
@@ -10504 +10749 @@
 
   case LVM_GETCOLUMNA:
-    return LISTVIEW_GetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
-
-/*  case LVM_GETCOLUMNW: */
+    return LISTVIEW_GetColumnT(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE);
+
+  case LVM_GETCOLUMNW:
+    return LISTVIEW_GetColumnT(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam, TRUE);
 
   case LVM_GETCOLUMNORDERARRAY:
@@ -10526 +10772 @@
     return LISTVIEW_GetHeader(hwnd);
 
-/*  case LVM_GETHOTCURSOR: */
 #ifdef __WIN32OS2__
   case LVM_GETHOTCURSOR:
@@ -10541 +10786 @@
     return LISTVIEW_GetImageList(hwnd, (INT)wParam);
 
-/*  case LVM_GETISEARCHSTRING: */
-
 #ifdef __WIN32OS2__
   case LVM_GETISEARCHSTRINGA:
@@ -10552 +10795 @@
 
   case LVM_GETITEMA:
-    return LISTVIEW_GetItemA(hwnd, (LPLVITEMA)lParam, FALSE);
-
-/*  case LVM_GETITEMW: */
+    return LISTVIEW_GetItemT(hwnd, (LPLVITEMW)lParam, FALSE, FALSE);
+
+  case LVM_GETITEMW:
+    return LISTVIEW_GetItemT(hwnd, (LPLVITEMW)lParam, FALSE, TRUE);
 
   case LVM_GETITEMCOUNT:
@@ -10562 +10806 @@
     return LISTVIEW_GetItemPosition(hwnd, (INT)wParam, (LPPOINT)lParam);
 
-  case LVM_GETITEMRECT:
+  case LVM_GETITEMRECT: 
     return LISTVIEW_GetItemRect(hwnd, (INT)wParam, (LPRECT)lParam);
 
-  case LVM_GETITEMSPACING:
+  case LVM_GETITEMSPACING: 
     return LISTVIEW_GetItemSpacing(hwnd, (BOOL)wParam);
 
-  case LVM_GETITEMSTATE:
+  case LVM_GETITEMSTATE: 
     return LISTVIEW_GetItemState(hwnd, (INT)wParam, (UINT)lParam);
-
+    
   case LVM_GETITEMTEXTA:
-    LISTVIEW_GetItemTextA(hwnd, (INT)wParam, (LPLVITEMA)lParam);
-    break;
-
-/*  case LVM_GETITEMTEXTW: */
+    return LISTVIEW_GetItemTextT(hwnd, (INT)wParam, (LPLVITEMW)lParam, FALSE);
+
+  case LVM_GETITEMTEXTW:
+    return LISTVIEW_GetItemTextT(hwnd, (INT)wParam, (LPLVITEMW)lParam, TRUE);
 
   case LVM_GETNEXTITEM:
     return LISTVIEW_GetNextItem(hwnd, (INT)wParam, LOWORD(lParam));
-
-/*  case LVM_GETNUMBEROFWORKAREAS: */
 
 #ifdef __WIN32OS2__
@@ -10593 +10835 @@
     return LISTVIEW_GetSelectedCount(hwnd);
 
-  case LVM_GETSELECTIONMARK:
+  case LVM_GETSELECTIONMARK: 
     return LISTVIEW_GetSelectionMark(hwnd);
 
   case LVM_GETSTRINGWIDTHA:
-    return LISTVIEW_GetStringWidthA (hwnd, (LPCSTR)lParam);
-
-/*  case LVM_GETSTRINGWIDTHW: */
-/*  case LVM_GETSUBITEMRECT: */
+    return LISTVIEW_GetStringWidthT(hwnd, (LPCWSTR)lParam, FALSE);
+
+  case LVM_GETSTRINGWIDTHW:
+    return LISTVIEW_GetStringWidthT(hwnd, (LPCWSTR)lParam, TRUE);
 
 #ifdef __WIN32OS2__
@@ -10606 +10848 @@
       return LISTVIEW_GetSubItemRect(hwnd,(INT)wParam,(LPRECT)lParam);
 #endif
-
+    
   case LVM_GETTEXTBKCOLOR:
     return LISTVIEW_GetTextBkColor(hwnd);
@@ -10613 +10855 @@
     return LISTVIEW_GetTextColor(hwnd);
 
-/*  case LVM_GETTOOLTIPS: */
 #ifdef __WIN32OS2__
   case LVM_GETTOOLTIPS:
@@ -10622 +10863 @@
     return LISTVIEW_GetTopIndex(hwnd);
 
-/*  case LVM_GETUNICODEFORMAT: */
+  /*case LVM_GETUNICODEFORMAT:
+    FIXME("LVM_GETUNICODEFORMAT: unimplemented\n");
+    return FALSE;*/
 
   case LVM_GETVIEWRECT:
     return LISTVIEW_GetViewRect(hwnd, (LPRECT)lParam);
 
-/*  case LVM_GETWORKAREAS: */
 #ifdef __WIN32OS2__
   case LVM_GETWORKAREAS:
@@ -10637 +10879 @@
 
   case LVM_INSERTCOLUMNA:
-    return LISTVIEW_InsertColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
+    return LISTVIEW_InsertColumnT(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE);
 
   case LVM_INSERTCOLUMNW:
-    return LISTVIEW_InsertColumnW(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam);
+    return LISTVIEW_InsertColumnT(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam, TRUE);
 
   case LVM_INSERTITEMA:
-    return LISTVIEW_InsertItemA(hwnd, (LPLVITEMA)lParam);
+    return LISTVIEW_InsertItemT(hwnd, (LPLVITEMW)lParam, FALSE);
 
   case LVM_INSERTITEMW:
-    return LISTVIEW_InsertItemW(hwnd, (LPLVITEMW)lParam);
+    return LISTVIEW_InsertItemT(hwnd, (LPLVITEMW)lParam, TRUE);
 
   case LVM_REDRAWITEMS:
@@ -10655 +10897 @@
     return LISTVIEW_Scroll(hwnd, (INT)wParam, (INT)lParam);
 #endif
+
 /*   case LVM_SCROLL:  */
 /*     return LISTVIEW_Scroll(hwnd, (INT)wParam, (INT)lParam); */
@@ -10661 +10904 @@
     return LISTVIEW_SetBkColor(hwnd, (COLORREF)lParam);
 
-/*  case LVM_SETBKIMAGE: */
+/*      case LVM_SETBKIMAGE: */
+
 #ifdef __WIN32OS2__
   case LVM_SETBKIMAGEA:
@@ -10674 +10918 @@
 
   case LVM_SETCOLUMNA:
-    return LISTVIEW_SetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
+    return LISTVIEW_SetColumnT(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE);
 
   case LVM_SETCOLUMNW:
-    FIXME("Unimplemented msg LVM_SETCOLUMNW\n");
-    return 0;
+    return LISTVIEW_SetColumnT(hwnd, (INT)wParam, (LPLVCOLUMNW)lParam, TRUE);
 
   case LVM_SETCOLUMNORDERARRAY:
@@ -10689 +10932 @@
     return LISTVIEW_SetExtendedListViewStyle(hwnd, (DWORD)wParam, (DWORD)lParam);
 
-/*  case LVM_SETHOTCURSOR: */
 #ifdef __WIN32OS2__
   case LVM_SETHOTCURSOR:
@@ -10695 +10937 @@
 #endif
 
+/*      case LVM_SETHOTCURSOR: */
+
   case LVM_SETHOTITEM:
     return LISTVIEW_SetHotItem(hwnd, (INT)wParam);
@@ -10700 +10944 @@
   case LVM_SETHOVERTIME:
     return LISTVIEW_SetHoverTime(hwnd, (DWORD)wParam);
-
-/*  case LVM_SETICONSPACING: */
 #ifdef __WIN32OS2__
   case LVM_SETICONSPACING:
     return LISTVIEW_SetIconSpacing(hwnd,wParam,lParam);
-#endif
-
+#else
+  case LVM_SETICONSPACING:
+    return LISTVIEW_SetIconSpacing(hwnd, (DWORD)lParam);
+#endif  
   case LVM_SETIMAGELIST:
-    return LISTVIEW_SetImageList(hwnd, (INT)wParam, (HIMAGELIST)lParam);
+    return (LRESULT)LISTVIEW_SetImageList(hwnd, (INT)wParam, (HIMAGELIST)lParam);
 
   case LVM_SETITEMA:
-    return LISTVIEW_SetItemA(hwnd, (LPLVITEMA)lParam);
-
-/*  case LVM_SETITEMW: */
-
-  case LVM_SETITEMCOUNT:
+    return LISTVIEW_SetItemT(hwnd, (LPLVITEMW)lParam, FALSE);
+
+  case LVM_SETITEMW:
+    return LISTVIEW_SetItemT(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),
@@ -10724 +10969 @@
   case LVM_SETITEMPOSITION32:
     return LISTVIEW_SetItemPosition(hwnd, (INT)wParam, ((POINT*)lParam)->x,
-                    ((POINT*)lParam)->y);
+                                    ((POINT*)lParam)->y);
 
   case LVM_SETITEMSTATE:
-    return LISTVIEW_SetItemState(hwnd, (INT)wParam, (LPLVITEMA)lParam);
+    return LISTVIEW_SetItemState(hwnd, (INT)wParam, (LPLVITEMW)lParam);
 
   case LVM_SETITEMTEXTA:
-    return LISTVIEW_SetItemTextA(hwnd, (INT)wParam, (LPLVITEMA)lParam);
-
-/*  case LVM_SETITEMTEXTW: */
+    return LISTVIEW_SetItemTextT(hwnd, (INT)wParam, (LPLVITEMW)lParam, FALSE);
+
+  case LVM_SETITEMTEXTW:
+    return LISTVIEW_SetItemTextT(hwnd, (INT)wParam, (LPLVITEMW)lParam, TRUE);
 
   case LVM_SETSELECTIONMARK:
@@ -10750 +10996 @@
     return LISTVIEW_SetWorkAreas(hwnd,wParam,lParam);
 #endif
-/*  case LVM_SETTOOLTIPS: */
-/*  case LVM_SETUNICODEFORMAT: */
-/*  case LVM_SETWORKAREAS: */
+
+/*      case LVM_SETTOOLTIPS: */
+/*      case LVM_SETUNICODEFORMAT: */
+/*      case LVM_SETWORKAREAS: */
 
   case LVM_SORTITEMS:
-    return LISTVIEW_SortItems(hwnd, wParam, lParam);
-
-/*  case LVM_SUBITEMHITTEST: */
+    return LISTVIEW_SortItems(hwnd, (PFNLVCOMPARE)lParam, (LPARAM)wParam);
+
 #ifdef __WIN32OS2__
   case LVM_SUBITEMHITTEST:
@@ -10763 +11009 @@
 #endif
 
-  case LVM_UPDATE:
+/*      case LVM_SUBITEMHITTEST: */
+
+  case LVM_UPDATE: 
     return LISTVIEW_Update(hwnd, (INT)wParam);
 
@@ -10773 +11021 @@
 
   case WM_CREATE:
-    return LISTVIEW_Create(hwnd, wParam, lParam);
-
+    return LISTVIEW_Create(hwnd, (LPCREATESTRUCTW)lParam);
+    
   case WM_ERASEBKGND:
     return LISTVIEW_EraseBackground(hwnd, wParam, lParam);
@@ -10785 +11033 @@
 
   case WM_HSCROLL:
-    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam),
+    return LISTVIEW_HScroll(hwnd, (INT)LOWORD(wParam), 
                             (INT)HIWORD(wParam), (HWND)lParam);
 
@@ -10795 +11043 @@
 
   case WM_LBUTTONDBLCLK:
-    return LISTVIEW_LButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
+    return LISTVIEW_LButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam), 
                                 HIWORD(lParam));
-
+    
   case WM_LBUTTONDOWN:
-    return LISTVIEW_LButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
+    return LISTVIEW_LButtonDown(hwnd, (WORD)wParam, LOWORD(lParam), 
                                 HIWORD(lParam));
   case WM_LBUTTONUP:
-    return LISTVIEW_LButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
+    return LISTVIEW_LButtonUp(hwnd, (WORD)wParam, LOWORD(lParam), 
                               HIWORD(lParam));
   case WM_MOUSEMOVE:
@@ -10822 +11070 @@
     return LISTVIEW_NotifyFormat(hwnd, (HWND)wParam, (INT)lParam);
 
-  case WM_PAINT:
-    return LISTVIEW_Paint(hwnd, (HDC)wParam);
+  case WM_PAINT: 
+    return LISTVIEW_Paint(hwnd, (HDC)wParam); 
 
   case WM_RBUTTONDBLCLK:
-    return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam),
+    return LISTVIEW_RButtonDblClk(hwnd, (WORD)wParam, LOWORD(lParam), 
                                   HIWORD(lParam));
 
   case WM_RBUTTONDOWN:
-    return LISTVIEW_RButtonDown(hwnd, (WORD)wParam, LOWORD(lParam),
+    return LISTVIEW_RButtonDown(hwnd, (WORD)wParam, LOWORD(lParam), 
                                 HIWORD(lParam));
 
   case WM_RBUTTONUP:
-    return LISTVIEW_RButtonUp(hwnd, (WORD)wParam, LOWORD(lParam),
+    return LISTVIEW_RButtonUp(hwnd, (WORD)wParam, LOWORD(lParam), 
                               HIWORD(lParam));
 
@@ -10843 +11091 @@
     return LISTVIEW_SetFont(hwnd, (HFONT)wParam, (WORD)lParam);
 
-  case WM_SETREDRAW:
+  case WM_SETREDRAW: 
     return LISTVIEW_SetRedraw(hwnd, (BOOL)wParam);
 
@@ -10852 +11100 @@
     return LISTVIEW_StyleChanged(hwnd, wParam, (LPSTYLESTRUCT)lParam);
 
-/*  case WM_TIMER: */
 #ifdef __WIN32OS2__
   case WM_TIMER:
@@ -10858 +11105 @@
 #endif
 
+/*      case WM_TIMER: */
+
   case WM_VSCROLL:
-    return LISTVIEW_VScroll(hwnd, (INT)LOWORD(wParam),
+    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: */
+          return DefWindowProcW( 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,
+      ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, 
           lParam);
     }
-
-    /* call default window procedure */
 #ifdef __WIN32OS2__
     return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
@@ -10890 +11137 @@
  * DESCRIPTION:
  * Registers the window class.
- *
+ * 
  * PARAMETER(S):
  * None
@@ -10899 +11146 @@
 VOID LISTVIEW_Register(void)
 {
-  WNDCLASSA wndClass;
-
-    ZeroMemory(&wndClass, sizeof(WNDCLASSA));
+  WNDCLASSW wndClass;
+
+    ZeroMemory(&wndClass, sizeof(WNDCLASSW));
     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.hCursor = LoadCursorW(0, IDC_ARROWW);
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = WC_LISTVIEWA;
-    RegisterClassA(&wndClass);
+    wndClass.lpszClassName = WC_LISTVIEWW;
+    RegisterClassW(&wndClass);
 }
 
@@ -10915 +11162 @@
  * DESCRIPTION:
  * Unregisters the window class.
- *
+ * 
  * PARAMETER(S):
  * None
@@ -10924 +11171 @@
 VOID LISTVIEW_Unregister(void)
 {
-    UnregisterClassA(WC_LISTVIEWA, (HINSTANCE)NULL);
+    UnregisterClassW(WC_LISTVIEWW, (HINSTANCE)NULL);
 }
 
@@ -10930 +11177 @@
  * DESCRIPTION:
  * Handle any WM_COMMAND messages
- *
+ * 
  * PARAMETER(S):
  *
@@ -10939 +11186 @@
     switch (HIWORD(wParam))
     {
-    case EN_UPDATE:
-    {
-        /*
-         * Adjust the edit window size
-         */
-        char buffer[1024];
-        LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
-        HDC           hdc      = GetDC(infoPtr->hwndEdit);
+        case EN_UPDATE:
+        {
+            /* 
+             * Adjust the edit window size 
+             */
+            WCHAR buffer[1024];
+            LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0);
+            HDC           hdc      = GetDC(infoPtr->hwndEdit);
             HFONT         hFont, hOldFont = 0;
-        RECT      rect;
-        SIZE      sz;
-        int       len;
-
-        len = GetWindowTextA(infoPtr->hwndEdit, buffer, 1023);
-        GetWindowRect(infoPtr->hwndEdit, &rect);
+            RECT          rect;
+            SIZE          sz;
+            int           len;
+
+            len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0]));
+            GetWindowRect(infoPtr->hwndEdit, &rect);
 
             /* Select font to get the right dimension of the string */
-            hFont = SendMessageA(infoPtr->hwndEdit, WM_GETFONT, 0, 0);
+            hFont = SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0);
             if(hFont != 0)
             {
@@ -10962 +11209 @@
             }
 
-        if (GetTextExtentPoint32A(hdc, buffer, strlen(buffer), &sz))
-        {
-                TEXTMETRICA textMetric;
+            if (GetTextExtentPoint32W(hdc, buffer, lstrlenW(buffer), &sz))
+            {
+                TEXTMETRICW textMetric;
 
                 /* Add Extra spacing for the next character */
-                GetTextMetricsA(hdc, &textMetric);
+                GetTextMetricsW(hdc, &textMetric);
                 sz.cx += (textMetric.tmMaxCharWidth * 2);
 
-        SetWindowPos (
-            infoPtr->hwndEdit,
-            HWND_TOP,
-            0,
-            0,
-            sz.cx,
-            rect.bottom - rect.top,
-            SWP_DRAWFRAME|SWP_NOMOVE);
-        }
+                SetWindowPos ( 
+                    infoPtr->hwndEdit,
+                    HWND_TOP, 
+                    0, 
+                    0,
+                    sz.cx,
+                    rect.bottom - rect.top,
+                    SWP_DRAWFRAME|SWP_NOMOVE);
+            }
             if(hFont != 0)
-            {
                 SelectObject(hdc, hOldFont);
-            }
-
-        ReleaseDC(hwnd, hdc);
-
-        break;
-    }
-
-    default:
-      return SendMessageA (GetParent (hwnd), WM_COMMAND, wParam, lParam);
+
+            ReleaseDC(hwnd, hdc);
+
+            break;
+        }
+
+        default:
+          return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, lParam);
     }
 
@@ -11005 +11250 @@
  * RETURN:
  */
-LRESULT CALLBACK EditLblWndProc(HWND hwnd, UINT uMsg,
-    WPARAM wParam, LPARAM lParam)
-{
-    BOOL cancel = FALSE;
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(GetParent(hwnd), 0);
+static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, 
+        WPARAM wParam, LPARAM lParam, BOOL isW)
+{
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(GetParent(hwnd), 0);
     EDITLABEL_ITEM *einfo = infoPtr->pedititem;
     static BOOL bIgnoreKillFocus = FALSE;
+    BOOL cancel = FALSE;
+
+    TRACE("(hwnd=%x, uMsg=%x, wParam=%x, lParam=%lx, isW=%d)\n",
+          hwnd, uMsg, wParam, lParam, isW);
+    
     switch (uMsg)
     {
-    case WM_GETDLGCODE:
-      return DLGC_WANTARROWS | DLGC_WANTALLKEYS;
-
-    case WM_KILLFOCUS:
-            if(bIgnoreKillFocus)
-            {
-                return TRUE;
-            }
-        break;
-
-    case WM_DESTROY:
-    {
-        WNDPROC editProc = einfo->EditWndProc;
-        SetWindowLongA(hwnd, GWL_WNDPROC, (LONG)editProc);
-        COMCTL32_Free(einfo);
-        infoPtr->pedititem = NULL;
-        return CallWindowProcA(editProc, hwnd, uMsg, wParam, lParam);
-    }
-
-    case WM_KEYDOWN:
-        if (VK_ESCAPE == (INT)wParam)
-        {
-        cancel = TRUE;
+        case WM_GETDLGCODE:
+          return DLGC_WANTARROWS | DLGC_WANTALLKEYS;
+                        
+        case WM_KILLFOCUS:
+            if(bIgnoreKillFocus) return TRUE;
+            break;
+
+        case WM_DESTROY:
+        {
+            WNDPROC editProc = einfo->EditWndProc;
+            SetWindowLongW(hwnd, GWL_WNDPROC, (LONG)editProc);
+            COMCTL32_Free(einfo);
+            infoPtr->pedititem = NULL;
+            return CallWindowProcT(editProc, hwnd, uMsg, wParam, lParam, isW);
+        }
+
+        case WM_KEYDOWN:
+            if (VK_ESCAPE == (INT)wParam)
+            {
+                cancel = TRUE;
                 break;
-
-        }
-        else if (VK_RETURN == (INT)wParam)
-        break;
-
-    default:
-        return CallWindowProcA(einfo->EditWndProc, hwnd,
-            uMsg, wParam, lParam);
+            }
+            else if (VK_RETURN == (INT)wParam)
+                break;
+
+        default:
+            return CallWindowProcT(einfo->EditWndProc, hwnd, uMsg, wParam, lParam, isW);
     }
 
     if (einfo->EditLblCb)
     {
-    char *buffer  = NULL;
-
-
-    if (!cancel)
-    {
-        int len = 1 + GetWindowTextLengthA(hwnd);
-
-        if (len > 1)
-        {
-        if (NULL != (buffer = (char *)COMCTL32_Alloc(len*sizeof(char))))
-        {
-            GetWindowTextA(hwnd, buffer, len);
-        }
-        }
-    }
+        LPWSTR buffer = NULL;
+        
+        if (!cancel)
+        {
+            DWORD len = isW ? GetWindowTextLengthW(hwnd) : GetWindowTextLengthA(hwnd);
+
+            if (len)
+            {
+                if ( (buffer = COMCTL32_Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR)))) )
+                {
+                    if (isW) GetWindowTextW(hwnd, buffer, len+1);
+                    else GetWindowTextA(hwnd, (CHAR*)buffer, len+1);
+                }
+            }
+        }
         /* Processing LVN_ENDLABELEDIT message could kill the focus       */
         /* eg. Using a messagebox                                         */
         bIgnoreKillFocus = TRUE;
-    einfo->EditLblCb(GetParent(hwnd), buffer, einfo->param);
-
-    if (buffer)
-        COMCTL32_Free(buffer);
-
-    einfo->EditLblCb = NULL;
+        einfo->EditLblCb(GetParent(hwnd), buffer, einfo->param);
+
+        if (buffer) COMCTL32_Free(buffer);
+
+        einfo->EditLblCb = NULL;
         bIgnoreKillFocus = FALSE;
     }
 
-    SendMessageA(hwnd, WM_CLOSE, 0, 0);
+    SendMessageW(hwnd, WM_CLOSE, 0, 0);
     return TRUE;
 }
 
+/***
+ * DESCRIPTION:
+ * Subclassed edit control windproc function
+ *
+ * PARAMETER(S):
+ *
+ * RETURN:
+ */
+LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    return EditLblWndProcT(hwnd, uMsg, wParam, lParam, TRUE);
+}
+
+/***
+ * DESCRIPTION:
+ * Subclassed edit control windproc function
+ *
+ * PARAMETER(S):
+ *
+ * RETURN:
+ */
+LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    return EditLblWndProcT(hwnd, uMsg, wParam, lParam, FALSE);
+}
 
 /***
@@ -11090 +11358 @@
  * RETURN:
  */
-HWND CreateEditLabel(LPCSTR text, DWORD style, INT x, INT y,
-    INT width, INT height, HWND parent, HINSTANCE hinst,
-    EditlblCallback EditLblCb, DWORD param)
-{
+HWND CreateEditLabelT(LPCWSTR text, DWORD style, INT x, INT y, 
+        INT width, INT height, HWND parent, HINSTANCE hinst, 
+        EditlblCallbackW EditLblCb, DWORD param, BOOL isW)
+{
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(parent, 0);
+    WCHAR editName[5] = { 'E', 'd', 'i', 't', '\0' };
     HWND hedit;
     SIZE sz;
     HDC hdc;
     HDC hOldFont=0;
-    TEXTMETRICA textMetric;
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(parent, 0);
-
+    TEXTMETRICW textMetric;
+
+    TRACE("(text=%s, ..., isW=%d)\n", debugstr_t(text, isW), isW);
+    
     if (NULL == (infoPtr->pedititem = COMCTL32_Alloc(sizeof(EDITLABEL_ITEM))))
-    return 0;
+        return 0;
 
     style |= WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|WS_BORDER;
@@ -11109 +11380 @@
     /* Select the font to get appropriate metric dimensions */
     if(infoPtr->hFont != 0)
-    {
         hOldFont = SelectObject(hdc, infoPtr->hFont);
-    }
 
     /*Get String Lenght in pixels */
-    GetTextExtentPoint32A(hdc, text, strlen(text), &sz);
+    GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz);
 
     /*Add Extra spacing for the next character */
-    GetTextMetricsA(hdc, &textMetric);
+    GetTextMetricsW(hdc, &textMetric);
     sz.cx += (textMetric.tmMaxCharWidth * 2);
 
     if(infoPtr->hFont != 0)
-    {
         SelectObject(hdc, hOldFont);
-    }
 
     ReleaseDC(parent, hdc);
-    if (!(hedit = CreateWindowA("Edit", text, style, x, y, sz.cx, height,
-            parent, 0, hinst, 0)))
-    {
-    COMCTL32_Free(infoPtr->pedititem);
-    return 0;
+    if (isW) 
+        hedit = CreateWindowW(editName, text, style, x, y, sz.cx, height, parent, 0, hinst, 0);
+    else
+        hedit = CreateWindowA("Edit", (LPCSTR)text, style, x, y, sz.cx, height, parent, 0, hinst, 0);
+
+    if (!hedit)
+    {
+        COMCTL32_Free(infoPtr->pedititem);
+        return 0;
     }
 
     infoPtr->pedititem->param = param;
     infoPtr->pedititem->EditLblCb = EditLblCb;
-    infoPtr->pedititem->EditWndProc = (WNDPROC)SetWindowLongA(hedit,
-      GWL_WNDPROC, (LONG) EditLblWndProc);
-
-    SendMessageA(hedit, WM_SETFONT, infoPtr->hFont, FALSE);
+    infoPtr->pedititem->EditWndProc = (WNDPROC) 
+        (isW ? SetWindowLongW(hedit, GWL_WNDPROC, (LONG)EditLblWndProcW) :
+               SetWindowLongA(hedit, GWL_WNDPROC, (LONG)EditLblWndProcA) );
+
+    SendMessageW(hedit, WM_SETFONT, infoPtr->hFont, FALSE);
 
     return hedit;
 }
 
-

trunk/src/comctl32/pager.c

@@ -3 +3 @@
  *
  * Copyright 1998, 1999 Eric Kohl
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -18 +32 @@
 #include "winbase.h"
 #include "commctrl.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(pager);
-
-#ifdef __WIN32OS2__
-#include "ccbase.h"
-#undef inline
-#define inline
-#endif
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(pager);
 
 typedef struct
 {
-#ifdef __WIN32OS2__
-    COMCTL32_HEADER header;
-#endif
     HWND   hwndChild;  /* handle of the contained wnd */
     BOOL   bNoResize;  /* set when created with CCS_NORESIZE */
@@ -594 +599 @@
 }
 
+/******************************************************************
+ * For the PGM_RECALCSIZE message (but not the other uses in      *
+ * this module), the native control does only the following:      *
+ *                                                                *
+ *    if (some condition)                                         *
+ *          PostMessageA(hwnd, EM_FMTLINES, 0, 0);                *
+ *    return DefWindowProcA(hwnd, PGM_RECALCSIZE, 0, 0);          *
+ *                                                                *
+ * When we figure out what the "some condition" is we will        *
+ * implement that for the message processing.                     *
+ ******************************************************************/
+
 static LRESULT
 PAGER_RecalcSize(HWND hwnd)
@@ -630 +647 @@
     TRACE("[%04x] %06lx\n", hwnd, infoPtr->clrBk);
 
-    PAGER_RecalcSize(hwnd);
-    SendMessageA(hwnd, WM_NCPAINT, (WPARAM)0, (LPARAM)0);
+    /* the native control seems to do things this way */
+    SetWindowPos(hwnd, 0,0,0,0,0, 
+                 SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
+                 SWP_NOZORDER | SWP_NOACTIVATE);
+
+    RedrawWindow(hwnd, 0, 0, RDW_ERASE | RDW_INVALIDATE);
 
     return (LRESULT)clrTemp;
@@ -757 +778 @@
 
 static LRESULT
+PAGER_FmtLines(HWND hwnd)
+{
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+
+    /* initiate NCCalcSize to resize client wnd and get size */
+    SetWindowPos(hwnd, 0, 0,0,0,0, 
+                 SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
+                 SWP_NOZORDER | SWP_NOACTIVATE);
+
+    SetWindowPos(infoPtr->hwndChild, 0, 
+                 0,0,infoPtr->nWidth,infoPtr->nHeight, 
+                 0);
+
+    return DefWindowProcA (hwnd, EM_FMTLINES, 0, 0);
+}
+
+static LRESULT
 PAGER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -763 +801 @@
 
     /* allocate memory for info structure */
-#ifdef __WIN32OS2__
-    infoPtr =(PAGER_INFO*)initControl(hwnd,sizeof(PAGER_INFO));
-#else
     infoPtr = (PAGER_INFO *)COMCTL32_Alloc (sizeof(PAGER_INFO));
-#endif
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
@@ -820 +854 @@
     RECT rcChildw, rcmyw, wnrc, lbrc, rbrc;
     POINT cursor;
+    BOOL resizeClient = FALSE;
+    BOOL repaintBtns = FALSE;
+    INT scrollRange;
 
     /*
@@ -830 +867 @@
     DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
 
+    TRACE("orig rect=(%d,%d)-(%d,%d)\n",
+          lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
+
     if (PAGER_IsHorizontal(hwnd))
     {
@@ -838 +878 @@
         GetCursorPos (&cursor);
         GetWindowRect (hwnd, &rcmyw);
+
+        /* Reset buttons and hide any grey ones */
+        scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left);
+
+        TRACE("nPos=%d, scrollrange=%d, nWidth=%d, myw=(%d,%d)-(%d,%d)\n",
+              infoPtr->nPos, scrollRange, infoPtr->nWidth,
+              rcmyw.left, rcmyw.top, rcmyw.right, rcmyw.bottom);
+        PAGER_GrayAndRestoreBtns(infoPtr, scrollRange, &resizeClient, &repaintBtns);
+        PAGER_HideGrayBtns(infoPtr, &resizeClient);
+
         if (PtInRect (&rcmyw, cursor)) {
             GetWindowRect (hwnd, &wnrc);
@@ -852 +902 @@
                 RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
         }
-        if (infoPtr->TLbtnState) /* != PGF_INVISIBLE */
+        if (infoPtr->TLbtnState && (lpRect->left + infoPtr->nButtonSize < lpRect->right))
             lpRect->left += infoPtr->nButtonSize;
-        if (infoPtr->BRbtnState) 
+        if (infoPtr->BRbtnState && (lpRect->right - infoPtr->nButtonSize > lpRect->left))
             lpRect->right -= infoPtr->nButtonSize;
     }
@@ -875 +925 @@
         GetCursorPos (&cursor);
         GetWindowRect (hwnd, &rcmyw);
+
+        /* Reset buttons and hide any grey ones */
+        scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top);
+
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d)\n",
+              infoPtr->nPos, scrollRange, infoPtr->nHeight,
+              rcmyw.left, rcmyw.top,
+              rcmyw.right, rcmyw.bottom);
+        PAGER_GrayAndRestoreBtns(infoPtr, scrollRange, &resizeClient, &repaintBtns);
+        PAGER_HideGrayBtns(infoPtr, &resizeClient);
+
         if (PtInRect (&rcmyw, cursor)) {
 
@@ -900 +961 @@
                 RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
         }
-        if (infoPtr->TLbtnState)
+        if (infoPtr->TLbtnState && (lpRect->top + infoPtr->nButtonSize < lpRect->bottom))
             lpRect->top += infoPtr->nButtonSize;
-        if (infoPtr->BRbtnState)
+        if (infoPtr->BRbtnState && (lpRect->bottom - infoPtr->nButtonSize > lpRect->top))
             lpRect->bottom -= infoPtr->nButtonSize;
         /* ???? */
@@ -909 +970 @@
     }
 
-    TRACE("[%04x] client rect set to %dx%d at (%d,%d)\n", hwnd,
-                lpRect->right-lpRect->left,
-                lpRect->bottom-lpRect->top,
-                lpRect->left, lpRect->top);
+    TRACE("[%04x] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n", 
+          hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
+          lpRect->left, lpRect->top,
+          infoPtr->TLbtnState, infoPtr->BRbtnState);
 
     return 0;
@@ -1248 +1309 @@
     switch (uMsg)
     {
+        case EM_FMTLINES:
+            return PAGER_FmtLines(hwnd);
+
         case PGM_FORWARDMOUSE:
             return PAGER_ForwardMouse (hwnd, wParam);
@@ -1356 +1420 @@
 
         default:
-#ifdef __WIN32OS2__
-            return defComCtl32ProcA(hwnd, uMsg, wParam, lParam);
-#else
             return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-#endif
     }
 

trunk/src/comctl32/rebar.c

@@ -21 +21 @@
 
 /*
- * Rebar control    rev 8b
+ * Rebar control    rev 8e
  *
  * Copyright 1998, 1999 Eric Kohl
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -94 +108 @@
  * rev 8c
  * 19. Fix problem in _Layout when all lengths are 0.
+ * 20. If CLR_NONE specified, we will use default BtnFace color when drawing.
+ * 21. Fix test in REBAR_Layout.
+ * rev 8d
+ * 22. Add support for WM_WINDOWPOSCHANGED to save new origin of window.
+ * 23. Correct RBN_CHILDSIZE rect value for CCS_VERT rebar.
+ * 24. Do UpdateWindow only if doing redraws.
+ * rev 8e
+ * 25. Adjust setting of offChild.cx based on RBBS_CHILDEDGE.
  *
  *
@@ -126 +148 @@
 #include "commctrl.h"
 /* #include "spy.h" */
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(rebar);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(rebar);
 
 typedef struct
@@ -225 +247 @@
     INT      ihitBand;    /* band number of band whose gripper was grabbed */
     INT      ihitoffset;  /* offset of hotspot from gripper.left */
+    POINT    origin;      /* left/upper corner of client */
 
     REBAR_ROW  *rows;       /* pointer to row indexes              */
@@ -1198 +1221 @@
         width += infoPtr->calcSize.cx;
         height += infoPtr->calcSize.cy;
-    }
-
-    TRACE("hwnd %04x, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
+        x = infoPtr->origin.x;
+        y = infoPtr->origin.y;
+    }
+
+    TRACE("hwnd %08x, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
         infoPtr->hwndSelf, infoPtr->dwStyle,
         x, y, width, height);
@@ -1234 +1259 @@
             rbcz.rcChild = lpBand->rcChild;
             rbcz.rcBand = lpBand->rcBand;
-            rbcz.rcBand.left += lpBand->cxHeader;
+            if (infoPtr->dwStyle & CCS_VERT) 
+                rbcz.rcBand.top += lpBand->cxHeader;
+            else
+                rbcz.rcBand.left += lpBand->cxHeader;
             REBAR_Notify ((NMHDR *)&rbcz, infoPtr, RBN_CHILDSIZE);
             if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) {
@@ -1303 +1331 @@
         ERR("EndDeferWindowPos returned NULL\n");
 
-    UpdateWindow (infoPtr->hwndSelf);
+    if (infoPtr->DoRedraw)
+        UpdateWindow (infoPtr->hwndSelf);
 
     if (infoPtr->fStatus & NTF_HGHTCHG) {
@@ -1406 +1435 @@
         if ((lpBand->fMask & RBBIM_CHILD) &&
             !(lpBand->fStyle & RBBS_FIXEDSIZE)) {
-            lpBand->offChild.cx = 4;   /* ??? */
+            lpBand->offChild.cx = ((lpBand->fStyle & RBBS_CHILDEDGE) ? 4 : 0);
         }
         lpBand->offChild.cy = ((lpBand->fStyle & RBBS_CHILDEDGE) ? 2 : 0);
@@ -1732 +1761 @@
             lpBand = &infoPtr->bands[iband];
             if(HIDDENBAND(lpBand)) continue;
-            if (!(lpBand->fMask & RBBS_VARIABLEHEIGHT)) continue;
+            if (lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
             if (((INT)lpBand->cyMaxChild < 1) || 
                 ((INT)lpBand->cyIntegral < 1)) {
@@ -2141 +2170 @@
             new = RGB(0,128,0);
 #endif
-            old = SetBkColor (hdc, new);
-        }
+        }
+        else {
+            /* In the absence of documentation for Rebar vs. CLR_NONE,
+             * we will use the default BtnFace color. Note documentation
+             * exists for Listview and Imagelist.
+             */
+            new = infoPtr->clrBtnFace;
+#if GLATESTING
+            /* testing only - make background green to see it */
+            new = RGB(0,128,0);
+#endif
+        }
+        old = SetBkColor (hdc, new);
 
         rect = lpBand->rcBand;
@@ -3741 +3781 @@
     POINTS ptsmove;
 
-    /* Validate entry as hit on Gripper has occured */
+    /* Validate entry as hit on Gripper has occurred */
     if (GetCapture() != infoPtr->hwndSelf) return 0;
     if (infoPtr->ihitBand == -1) return 0;
@@ -4197 +4237 @@
 
 
+static LRESULT
+REBAR_WindowPosChanged (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
+{
+    WINDOWPOS *lpwp = (WINDOWPOS *)lParam;
+    LRESULT ret;
+    RECT rc;
+
+    /* Save the new origin of this window - used by _ForceResize */
+    infoPtr->origin.x = lpwp->x;
+    infoPtr->origin.y = lpwp->y;
+    ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED, 
+                         wParam, lParam);
+    GetWindowRect(infoPtr->hwndSelf, &rc);
+    TRACE("hwnd %08x new pos (%d,%d)-(%d,%d)\n",
+          infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom);
+    return ret;
+}
+
+
 static LRESULT WINAPI
 REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -4409 +4468 @@
 /*      case WM_VKEYTOITEM:     supported according to ControlSpy */
 /*      case WM_WININICHANGE: */
+
+        case WM_WINDOWPOSCHANGED:
+            return REBAR_WindowPosChanged (infoPtr, wParam, lParam);
 
         default:

trunk/src/comctl32/rsrc.orc

@@ -1 @@
-/* $Id: rsrc.orc,v 1.6 2000-08-09 15:57:55 cbratschi Exp $ */
+/* $Id: rsrc.orc,v 1.7 2002-05-08 11:25:02 sandervl Exp $ */
 /*
  * Top level resource file for Common Controls
@@ -16 +16 @@
  * being duplicated for each language.
  */
-#include "cctl_xx.orc"
+#include "resources\cctl_xx.orc"
 
 /*
@@ -26 +26 @@
  */
 
-#include "cctl_Ca.orc"
-#include "cctl_Cs.orc"
-#include "cctl_Da.orc"
-#include "cctl_De.orc"
-#include "cctl_En.orc"
-#include "cctl_Eo.orc"
-#include "cctl_Es.orc"
-#include "cctl_Fi.orc"
-#include "cctl_Fr.orc"
-#include "cctl_Hu.orc"
-#include "cctl_It.orc"
-#include "cctl_Ko.orc"
-#include "cctl_Nl.orc"
-#include "cctl_No.orc"
-#include "cctl_Pl.orc"
-#include "cctl_Pt.orc"
-#include "cctl_Ru.orc"
-#include "cctl_Sv.orc"
-#include "cctl_Wa.orc"
+#include "resources\cctl_Ca.orc"
+#include "resources\cctl_Cs.orc"
+#include "resources\cctl_Da.orc"
+#include "resources\cctl_De.orc"
+#include "resources\cctl_En.orc"
+#include "resources\cctl_Eo.orc"
+#include "resources\cctl_Es.orc"
+#include "resources\cctl_Fi.orc"
+#include "resources\cctl_Fr.orc"
+#include "resources\cctl_Hu.orc"
+#include "resources\cctl_It.orc"
+#include "resources\cctl_Ko.orc"
+#include "resources\cctl_Nl.orc"
+#include "resources\cctl_No.orc"
+#include "resources\cctl_Pl.orc"
+#include "resources\cctl_Pt.orc"
+#include "resources\cctl_Ru.orc"
+#include "resources\cctl_Sv.orc"
+#include "resources\cctl_Wa.orc"

trunk/src/comctl32/tab.c

@@ -5 +5 @@
  * Copyright 1999 Alex Priem <alexp@sci.kun.nl>
  * Copyright 1999 Francis Beaudet
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * TODO:
@@ -19 +33 @@
 #include "commctrl.h"
 #include "comctl32.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include <math.h>
 
-DEFAULT_DEBUG_CHANNEL(tab);
+WINE_DEFAULT_DEBUG_CHANNEL(tab);
 
 typedef struct

trunk/src/comctl32/toolbar.c

@@ -4 +4 @@
  * Copyright 1998,1999 Eric Kohl
  * Copyright 2000 Eric Kohl for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  Differences between MSDN and actual native control operation:
@@ -56 +70 @@
 #include "imagelist.h"
 #include "comctl32.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(toolbar);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(toolbar);
 
 typedef struct
@@ -73 +87 @@
     RECT rect;
 } TBUTTON_INFO; 
+
+typedef struct
+{
+    UINT nButtons;
+    HINSTANCE hInst;
+    UINT nID;
+} TBITMAP_INFO;
 
 typedef struct
@@ -91 +112 @@
     INT      nNumBitmaps;     /* number of bitmaps */
     INT      nNumStrings;     /* number of strings */
+    INT      nNumBitmapInfos;
     BOOL     bUnicode;        /* ASCII (FALSE) or Unicode (TRUE)? */
     BOOL     bCaptured;       /* mouse captured? */
@@ -96 +118 @@
     INT      nOldHit;
     INT      nHotItem;        /* index of the "hot" item */
+    DWORD    dwBaseCustDraw;  /* CDRF_ response (w/o TBCDRF_) from PREPAINT */
+    DWORD    dwItemCustDraw;  /* CDRF_ response (w/o TBCDRF_) from ITEMPREP */
+    DWORD    dwItemCDFlag;    /* TBCDRF_ flags from last ITEMPREPAINT    */
+    SIZE     szPadding;       /* padding values around button */
     HFONT    hDefaultFont;
     HFONT    hFont;           /* text font */
@@ -115 +141 @@
 
     COLORREF   clrInsertMark;   /* insert mark color */
+    COLORREF   clrBtnHighlight; /* color for Flat Separator */
+    COLORREF   clrBtnShadow;    /* color for Flag Separator */
     RECT     rcBound;         /* bounding rectangle */
     INT      iVersion;
@@ -120 +148 @@
     TBUTTON_INFO *buttons;      /* pointer to button array */
     LPWSTR       *strings;      /* pointer to string array */
+    TBITMAP_INFO *bitmaps;
 } TOOLBAR_INFO, *PTOOLBAR_INFO;
 
@@ -147 +176 @@
 #define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE)
 #define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE)
+
+/* Used to find undocumented extended styles */
+#define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \
+                        TBSTYLE_EX_UNDOC1 | \
+                        TBSTYLE_EX_MIXEDBUTTONS | \
+                        TBSTYLE_EX_HIDECLIPPEDBUTTONS)
+
+static LRESULT
+TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam);
 
 
@@ -302 +340 @@
 
     if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+        if (btnPtr->iBitmap == I_IMAGENONE) return FALSE;
         ERR("index %d is not valid, max %d\n", 
             btnPtr->iBitmap, infoPtr->nNumBitmaps);
@@ -308 +347 @@
 
     if ((index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) {
-        if (index == -1) return FALSE;
+        if ((index == I_IMAGECALLBACK) ||
+            (index == I_IMAGENONE)) return FALSE;
         ERR("TBN_GETDISPINFO returned invalid index %d\n",
             index);
@@ -335 +375 @@
 
     if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+        if (btnPtr->iBitmap == I_IMAGENONE) return FALSE;
         ERR("index %d is not valid, max %d\n", 
             btnPtr->iBitmap, infoPtr->nNumBitmaps);
@@ -341 +382 @@
 
     if ((index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) {
-        if (index == -1) return FALSE;
+        if ((index == I_IMAGECALLBACK) ||
+            (index == I_IMAGENONE)) return FALSE;
         ERR("TBN_GETDISPINFO returned invalid index %d\n",
             index);
@@ -351 +393 @@
 
 static void
-TOOLBAR_DrawFlatSeparator (LPRECT lpRect, HDC hdc)
-{
-    INT x = (lpRect->left + lpRect->right) / 2 - 1;
-    INT yBottom = lpRect->bottom - 3;
-    INT yTop = lpRect->top + 1;
-
-    SelectObject ( hdc, GetSysColorPen (COLOR_3DSHADOW));
-    MoveToEx (hdc, x, yBottom, NULL);
-    LineTo (hdc, x, yTop);
-    x++;
-    SelectObject ( hdc, GetSysColorPen (COLOR_3DHILIGHT));
-    MoveToEx (hdc, x, yBottom, NULL);
-    LineTo (hdc, x, yTop);
+TOOLBAR_DrawFlatSeparator (LPRECT lpRect, HDC hdc, TOOLBAR_INFO *infoPtr)
+{
+    RECT myrect;
+    COLORREF oldcolor, newcolor;
+
+    myrect.left = (lpRect->left + lpRect->right) / 2 - 1;
+    myrect.right = myrect.left + 1;
+    myrect.top = lpRect->top + 2;
+    myrect.bottom = lpRect->bottom - 2;
+
+    newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? 
+                comctl32_color.clrBtnShadow : infoPtr->clrBtnShadow;
+    oldcolor = SetBkColor (hdc, newcolor);
+    ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &myrect, 0, 0, 0);
+
+    myrect.left = myrect.right;
+    myrect.right = myrect.left + 1;
+
+    newcolor = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ? 
+                comctl32_color.clrBtnHighlight : infoPtr->clrBtnHighlight;
+    SetBkColor (hdc, newcolor);
+    ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &myrect, 0, 0, 0);
+
+    SetBkColor (hdc, oldcolor);
 }
 
@@ -379 +432 @@
 */
 static void
-TOOLBAR_DrawDDFlatSeparator (LPRECT lpRect, HDC hdc, TBUTTON_INFO *btnPtr)
+TOOLBAR_DrawDDFlatSeparator (LPRECT lpRect, HDC hdc, TBUTTON_INFO *btnPtr, TOOLBAR_INFO *infoPtr)
 {
     RECT myrect;
@@ -394 +447 @@
           myrect.left, myrect.top, myrect.right, myrect.bottom);
 
-    newcolor = GetSysColor (COLOR_BTNSHADOW);
+    newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? 
+                comctl32_color.clrBtnShadow : infoPtr->clrBtnShadow;
     oldcolor = SetBkColor (hdc, newcolor);
     ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &myrect, 0, 0, 0);
@@ -401 +455 @@
     myrect.bottom = myrect.top + 1;
 
-    newcolor = GetSysColor (COLOR_BTNHIGHLIGHT);
+    newcolor = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ? 
+                comctl32_color.clrBtnHighlight : infoPtr->clrBtnHighlight;
     SetBkColor (hdc, newcolor);
     ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &myrect, 0, 0, 0);
@@ -432 +487 @@
 static void
 TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-                    HDC hdc, INT nState, DWORD dwStyle)
-{
-    RECT   rcText = btnPtr->rect;
-    HFONT  hOldFont;
-    COLORREF clrOld;
+                    HDC hdc, INT nState, DWORD dwStyle,
+                    RECT *rcText, LPWSTR lpText, NMTBCUSTOMDRAW *tbcd)
+{
+    HFONT  hOldFont = 0;
+    COLORREF clrOld = 0;
+
+    /* draw text */
+    if (lpText) {
+        TRACE("string rect=(%d,%d)-(%d,%d)\n",
+              rcText->left, rcText->top, rcText->right, rcText->bottom);
+
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
+        if (!(nState & TBSTATE_ENABLED)) {
+            clrOld = SetTextColor (hdc, tbcd->clrBtnHighlight);
+            OffsetRect (rcText, 1, 1);
+            DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags);
+            SetTextColor (hdc, comctl32_color.clr3dShadow);
+            OffsetRect (rcText, -1, -1);
+        }
+        else if (nState & TBSTATE_INDETERMINATE) {
+            clrOld = SetTextColor (hdc, comctl32_color.clr3dShadow);
+        }
+        else if (btnPtr->bHot && (infoPtr->dwItemCDFlag & TBCDRF_HILITEHOTTRACK )) {
+            clrOld = SetTextColor (hdc, tbcd->clrTextHighlight);
+        }
+        else {
+            clrOld = SetTextColor (hdc, tbcd->clrText);
+        }
+
+        DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags);
+        SetTextColor (hdc, clrOld);
+        SelectObject (hdc, hOldFont);
+    }
+}
+
+
+static void
+TOOLBAR_DrawPattern (HDC hdc, LPRECT lpRect)
+{
+    HBRUSH hbr = SelectObject (hdc, COMCTL32_hPattern55AABrush);
+    INT cx = lpRect->right - lpRect->left;
+    INT cy = lpRect->bottom - lpRect->top;
+    PatBlt (hdc, lpRect->left, lpRect->top, cx, cy, 0x00FA0089);
+    SelectObject (hdc, hbr);
+}
+
+
+static void
+TOOLBAR_DrawMasked (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
+                    HDC hdc, INT x, INT y)
+{
+    /* FIXME: this function is a hack since it uses image list
+              internals directly */
+
+    HIMAGELIST himl = infoPtr->himlDef;
+    HBITMAP hbmMask;
+    HDC hdcImageList;
+    HDC hdcMask;
+
+    if (!himl)
+        return;
+
+    /* create new dc's */
+    hdcImageList = CreateCompatibleDC (0);
+    hdcMask = CreateCompatibleDC (0);
+
+    /* create new bitmap */
+    hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL);
+    SelectObject (hdcMask, hbmMask);
+
+    /* copy the mask bitmap */
+    SelectObject (hdcImageList, himl->hbmMask);
+    SetBkColor (hdcImageList, RGB(255, 255, 255));
+    SetTextColor (hdcImageList, RGB(0, 0, 0));
+    BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
+              hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
+
+    /* draw the new mask */
+    SelectObject (hdc, GetSysColorBrush (COLOR_3DHILIGHT));
+    BitBlt (hdc, x+1, y+1, himl->cx, himl->cy,
+              hdcMask, 0, 0, 0xB8074A);
+
+    SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
+    BitBlt (hdc, x, y, himl->cx, himl->cy,
+              hdcMask, 0, 0, 0xB8074A);
+
+    DeleteObject (hbmMask);
+    DeleteDC (hdcMask);
+    DeleteDC (hdcImageList);
+}
+
+
+static UINT
+TOOLBAR_TranslateState(TBUTTON_INFO *btnPtr)
+{
+    UINT retstate = 0;
+
+    retstate |= (btnPtr->fsState & TBSTATE_CHECKED) ? CDIS_CHECKED  : 0;
+    retstate |= (btnPtr->fsState & TBSTATE_PRESSED) ? CDIS_SELECTED : 0;
+    retstate |= (btnPtr->fsState & TBSTATE_ENABLED) ? 0 : CDIS_DISABLED;
+    retstate |= (btnPtr->fsState & TBSTATE_MARKED ) ? CDIS_MARKED   : 0;
+    retstate |= (btnPtr->bHot                     ) ? CDIS_HOT      : 0;
+    retstate |= (btnPtr->fsState & TBSTATE_INDETERMINATE) ? CDIS_INDETERMINATE : 0;
+    /* FIXME: don't set CDIS_GRAYED, CDIS_FOCUS, CDIS_DEFAULT       */
+    /*        don't test TBSTATE_HIDDEN                             */
+    return retstate;
+}
+
+
+static void
+TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+    BOOL hasDropDownArrow = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) &&
+                            (btnPtr->fsStyle & TBSTYLE_DROPDOWN);
+    RECT rc, rcArrow, rcBitmap, rcText, rcFill;
     LPWSTR lpText = NULL;
-    HIMAGELIST himl = infoPtr->himlDef;
-
-    TRACE ("iString: %x\n", btnPtr->iString);
+    NMTBCUSTOMDRAW tbcd;
+    DWORD ntfret;
+    INT offset;
+
+    if (btnPtr->fsState & TBSTATE_HIDDEN)
+        return;
+
+    rc = btnPtr->rect;
+    CopyRect (&rcFill, &rc);
+    CopyRect (&rcArrow, &rc);
+    CopyRect(&rcBitmap, &rc);
+    CopyRect(&rcText, &rc);
 
     /* get a pointer to the text */
     lpText = TOOLBAR_GetText(infoPtr, btnPtr);
 
+    if (hasDropDownArrow)
+    {
+        if (dwStyle & TBSTYLE_FLAT)
+            rc.right = max(rc.left, rc.right - DDARROW_WIDTH);
+        else
+            rc.right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
+        rcArrow.left = rc.right; 
+    }
+
+    /* Center the bitmap horizontally and vertically */
+    if (dwStyle & TBSTYLE_LIST)
+        rcBitmap.left += 3;
+    else
+        rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
+
+    if(lpText)
+        rcBitmap.top+=2; /* this looks to be the correct value from vmware comparison - cmm */
+    else
+        rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
+
+    TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n", 
+          btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
+          infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+    TRACE ("iString: %x\n", btnPtr->iString);
     TRACE ("Stringtext: %s\n", debugstr_w(lpText));
 
@@ -452 +652 @@
         InflateRect (&rcText, -3, -3);
 
-        if (himl && TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+        if (infoPtr->himlDef && 
+            TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
                 /* The following test looked like this before
                  * I changed it. IE4 "Links" toolbar would not
@@ -477 +678 @@
         }
 
-        if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
+        if (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
             OffsetRect (&rcText, 1, 1);
-
-        TRACE("string rect=(%d,%d)-(%d,%d)\n",
-              rcText.left, rcText.top, rcText.right, rcText.bottom);
-
-        hOldFont = SelectObject (hdc, infoPtr->hFont);
-        if (!(nState & TBSTATE_ENABLED)) {
-            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DHILIGHT));
-            OffsetRect (&rcText, 1, 1);
-            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-            SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
-            OffsetRect (&rcText, -1, -1);
-            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-        }
-        else if (nState & TBSTATE_INDETERMINATE) {
-            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
-            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-        }
-        else {
-            clrOld = SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
-            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-        }
-
-        SetTextColor (hdc, clrOld);
-        SelectObject (hdc, hOldFont);
-    }
-}
-
-
-static void
-TOOLBAR_DrawPattern (HDC hdc, LPRECT lpRect)
-{
-    HBRUSH hbr = SelectObject (hdc, COMCTL32_hPattern55AABrush);
-    INT cx = lpRect->right - lpRect->left;
-    INT cy = lpRect->bottom - lpRect->top;
-    PatBlt (hdc, lpRect->left, lpRect->top, cx, cy, 0x00FA0089);
-    SelectObject (hdc, hbr);
-}
-
-
-static void
-TOOLBAR_DrawMasked (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-                    HDC hdc, INT x, INT y)
-{
-    /* FIXME: this function is a hack since it uses image list
-              internals directly */
-
-    HIMAGELIST himl = infoPtr->himlDef;
-    HBITMAP hbmMask;
-    HDC hdcImageList;
-    HDC hdcMask;
-
-    if (!himl)
-        return;
-
-    /* create new dc's */
-    hdcImageList = CreateCompatibleDC (0);
-    hdcMask = CreateCompatibleDC (0);
-
-    /* create new bitmap */
-    hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL);
-    SelectObject (hdcMask, hbmMask);
-
-    /* copy the mask bitmap */
-    SelectObject (hdcImageList, himl->hbmMask);
-    SetBkColor (hdcImageList, RGB(255, 255, 255));
-    SetTextColor (hdcImageList, RGB(0, 0, 0));
-    BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
-              hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
-
-    /* draw the new mask */
-    SelectObject (hdc, GetSysColorBrush (COLOR_3DHILIGHT));
-    BitBlt (hdc, x+1, y+1, himl->cx, himl->cy,
-              hdcMask, 0, 0, 0xB8074A);
-
-    SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
-    BitBlt (hdc, x, y, himl->cx, himl->cy,
-              hdcMask, 0, 0, 0xB8074A);
-
-    DeleteObject (hbmMask);
-    DeleteDC (hdcMask);
-    DeleteDC (hdcImageList);
-}
-
-
-static void
-TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
-    BOOL hasDropDownArrow = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) &&
-                            (btnPtr->fsStyle & TBSTYLE_DROPDOWN);
-    RECT rc, rcArrow, rcBitmap;
-
-    if (btnPtr->fsState & TBSTATE_HIDDEN)
-        return;
-
-    rc = btnPtr->rect;
-    CopyRect (&rcArrow, &rc);
-    CopyRect(&rcBitmap, &rc);
+    }
+
+    /* Initialize fields in all cases, because we use these later */
+    ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
+    tbcd.clrText = comctl32_color.clrBtnText;
+    tbcd.clrTextHighlight = comctl32_color.clrHighlightText;
+    tbcd.clrBtnFace = comctl32_color.clrBtnFace;
+    tbcd.clrBtnHighlight = comctl32_color.clrBtnHighlight;
+    tbcd.clrMark = comctl32_color.clrHighlight;
+    tbcd.clrHighlightHotTrack = 0;
+    tbcd.nStringBkMode = (infoPtr->bBtnTranspnt) ? TRANSPARENT : OPAQUE;
+    tbcd.nHLStringBkMode = (infoPtr->bBtnTranspnt) ? TRANSPARENT : OPAQUE;
+    /* MSDN says that this is the text rectangle.              */
+    /* But (why always a but) tracing of v5.7 of native shows  */
+    /* that this is really a *relative* rectangle based on the */
+    /* the nmcd.rc. Also the left and top are always 0 ignoring*/
+    /* any bitmap that might be present.                       */
+    tbcd.rcText.left = 0;
+    tbcd.rcText.top = 0;
+    tbcd.rcText.right = rcText.right - rc.left;
+    tbcd.rcText.bottom = rcText.bottom - rc.top;
+
+    /* FIXME: what should these be set to ????? */
+    tbcd.hbrMonoDither = 0;
+    tbcd.hbrLines = 0;
+    tbcd.hpenLines = 0;
+
+    /* Issue Item Prepaint notify */ 
+    infoPtr->dwItemCustDraw = 0;
+    infoPtr->dwItemCDFlag = 0;
+    if (infoPtr->dwBaseCustDraw & CDRF_NOTIFYITEMDRAW)
+    {
+        tbcd.nmcd.dwDrawStage = CDDS_ITEMPREPAINT;
+        tbcd.nmcd.hdc = hdc;
+        tbcd.nmcd.rc = rc;
+        tbcd.nmcd.dwItemSpec = btnPtr->idCommand;
+        tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr);
+        tbcd.nmcd.lItemlParam = btnPtr->dwData;
+        ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+        infoPtr->dwItemCustDraw = ntfret & 0xffff;
+        infoPtr->dwItemCDFlag = ntfret & 0xffff0000;
+        if (infoPtr->dwItemCustDraw & CDRF_SKIPDEFAULT) 
+            return;
+        /* save the only part of the rect that the user can change */
+        rcText.right = tbcd.rcText.right + rc.left;
+        rcText.bottom = tbcd.rcText.bottom + rc.top;
+    }
 
     if (!infoPtr->bBtnTranspnt)
-        FillRect( hdc, &rc, GetSysColorBrush(COLOR_BTNFACE));
-
-    if (hasDropDownArrow)
-    {
-        if (dwStyle & TBSTYLE_FLAT)
-            rc.right = max(rc.left, rc.right - DDARROW_WIDTH);
-        else
-            rc.right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
-        rcArrow.left = rc.right; 
-    }
-
-    /* Center the bitmap horizontally and vertically */
-    if (dwStyle & TBSTYLE_LIST)
-        rcBitmap.left += 3;
-    else
-        rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
-
-    if(TOOLBAR_HasText(infoPtr, btnPtr))
-        rcBitmap.top+=2; /* this looks to be the correct value from vmware comparison - cmm */
-    else
-        rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
-
-    TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n", 
-          btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
-          infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+        FillRect( hdc, &rcFill, GetSysColorBrush(COLOR_BTNFACE));
 
     /* separator */
@@ -615 +740 @@
         if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) {
             if (btnPtr->fsStyle & TBSTYLE_DROPDOWN)
-                TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr);
+                TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr, infoPtr);
             else
-                TOOLBAR_DrawFlatSeparator (&rc, hdc);
-        }
-        return;
+                TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr);
+        }
+        else if (btnPtr->fsStyle != TBSTYLE_SEP) {
+            FIXME("Draw some kind of separator: fsStyle=%x\n",
+                  btnPtr->fsStyle);
+        }
+        goto FINALNOTIFY;
     }
 
     /* disabled */
     if (!(btnPtr->fsState & TBSTATE_ENABLED)) {
-        if (!(dwStyle & TBSTYLE_FLAT))
+        if (!(dwStyle & TBSTYLE_FLAT) && !(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
         {
             DrawEdge (hdc, &rc, EDGE_RAISED,
@@ -644 +773 @@
             TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
 
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-        return;
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
     }
 
     /* pressed TBSTYLE_BUTTON */
     if (btnPtr->fsState & TBSTATE_PRESSED) {
-        if (dwStyle & TBSTYLE_FLAT)
+        offset = (infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) ? 0 : 1;
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
         {
-            DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
-            if (hasDropDownArrow)
-            DrawEdge (hdc, &rcArrow, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
-        }
-        else
-        {
-            DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
-            if (hasDropDownArrow)
-            DrawEdge (hdc, &rcArrow, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+            if (dwStyle & TBSTYLE_FLAT)
+            {
+                DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+                if (hasDropDownArrow)
+                    DrawEdge (hdc, &rcArrow, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+            }
+            else
+            {
+                DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+                if (hasDropDownArrow)
+                    DrawEdge (hdc, &rcArrow, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+            }
         }
 
@@ -667 +800 @@
 
         TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
-                               hdc, rcBitmap.left+1, rcBitmap.top+1, 
+                               hdc, rcBitmap.left+offset, rcBitmap.top+offset, 
                                ILD_NORMAL);
 
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-        return;
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
     }
 
@@ -677 +810 @@
     if ((btnPtr->fsStyle & TBSTYLE_CHECK) &&
         (btnPtr->fsState & TBSTATE_CHECKED)) {
-        if (dwStyle & TBSTYLE_FLAT)
-            DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
-                        BF_RECT | BF_ADJUST);
-        else
-            DrawEdge (hdc, &rc, EDGE_SUNKEN,
-                        BF_RECT | BF_MIDDLE | BF_ADJUST);
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+        {
+            if (dwStyle & TBSTYLE_FLAT)
+                DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
+                          BF_RECT | BF_ADJUST);
+            else
+                DrawEdge (hdc, &rc, EDGE_SUNKEN,
+                          BF_RECT | BF_MIDDLE | BF_ADJUST);
+        }
 
         TOOLBAR_DrawPattern (hdc, &rc);
@@ -690 +826 @@
                                ILD_NORMAL);
 
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-        return;
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
     }
 
     /* indeterminate */ 
     if (btnPtr->fsState & TBSTATE_INDETERMINATE) {
-        DrawEdge (hdc, &rc, EDGE_RAISED,
-                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+            DrawEdge (hdc, &rc, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
 
         TOOLBAR_DrawPattern (hdc, &rc);
         TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-        return;
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+        goto FINALNOTIFY;
     }
 
@@ -710 +847 @@
         if (btnPtr->bHot)
         {
-            DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT);
-            if (hasDropDownArrow)
-            DrawEdge (hdc, &rcArrow, BDR_RAISEDINNER, BF_RECT);
+            if ( infoPtr->dwItemCDFlag & TBCDRF_HILITEHOTTRACK )
+            {
+                COLORREF oldclr;
+
+                oldclr = SetBkColor(hdc, tbcd.clrHighlightHotTrack);
+                ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rc, NULL, 0, 0);
+                if (hasDropDownArrow)
+                    ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rcArrow, NULL, 0, 0);
+                SetBkColor(hdc, oldclr);
+            }
+            else
+            {
+                if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+                {
+                    DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT);
+                    if (hasDropDownArrow)
+                        DrawEdge (hdc, &rcArrow, BDR_RAISEDINNER, BF_RECT);
+                }
+            }
         }
 #if 1
@@ -746 +899 @@
     else
     {
-        DrawEdge (hdc, &rc, EDGE_RAISED,
-                BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+        if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+            DrawEdge (hdc, &rc, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
 
         if (hasDropDownArrow)
         {
-            DrawEdge (hdc, &rcArrow, EDGE_RAISED,
-                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+            if (!(infoPtr->dwItemCDFlag & TBCDRF_NOEDGES))
+                DrawEdge (hdc, &rcArrow, EDGE_RAISED,
+                          BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
             TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
         }
@@ -758 +913 @@
         TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
                                hdc, rcBitmap.left, rcBitmap.top,
-                               ILD_NORMAL);
-    }
-
-    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
+                               ILD_NORMAL);}
+    
+
+    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle, &rcText, lpText, &tbcd);
+
+ FINALNOTIFY:
+    if (infoPtr->dwItemCustDraw & CDRF_NOTIFYPOSTPAINT)
+    {
+        tbcd.nmcd.dwDrawStage = CDDS_ITEMPOSTPAINT;
+        tbcd.nmcd.hdc = hdc;
+        tbcd.nmcd.rc = rc;
+        tbcd.nmcd.dwItemSpec = btnPtr->idCommand;
+        tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr);
+        tbcd.nmcd.lItemlParam = btnPtr->dwData;
+        tbcd.rcText = rcText;
+        tbcd.nStringBkMode = (infoPtr->bBtnTranspnt) ? TRANSPARENT : OPAQUE;
+        tbcd.nHLStringBkMode = (infoPtr->bBtnTranspnt) ? TRANSPARENT : OPAQUE;
+        ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+    }
+
 }
 
@@ -772 +943 @@
     INT i, oldBKmode = 0;
     RECT rcTemp;
+    NMTBCUSTOMDRAW tbcd;
+    DWORD ntfret;
 
     /* if imagelist belongs to the app, it can be changed
@@ -779 +952 @@
 
     TOOLBAR_DumpToolbar (infoPtr, __LINE__);
+
+    /* Send initial notify */
+    ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
+    tbcd.nmcd.dwDrawStage = CDDS_PREPAINT;
+    tbcd.nmcd.hdc = hdc;
+    tbcd.nmcd.rc = ps->rcPaint;
+    ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+    infoPtr->dwBaseCustDraw = ntfret & 0xffff;
 
     if (infoPtr->bBtnTranspnt)
@@ -793 +974 @@
     if (infoPtr->bBtnTranspnt && (oldBKmode != TRANSPARENT))
         SetBkMode (hdc, oldBKmode);
+
+    if (infoPtr->dwBaseCustDraw & CDRF_NOTIFYPOSTPAINT)
+    {
+        ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
+        tbcd.nmcd.dwDrawStage = CDDS_POSTPAINT;
+        tbcd.nmcd.hdc = hdc;
+        tbcd.nmcd.rc = ps->rcPaint;
+        ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+    }
 }
 
@@ -820 +1010 @@
         LPWSTR lpText = TOOLBAR_GetText(infoPtr, btnPtr);
 
-        /* first get size of all the text */
-        GetTextExtentPoint32W (hdc, lpText, strlenW (lpText), lpSize);
-
-        /* feed above size into the rectangle for DrawText */
-        myrect.left = myrect.top = 0;
-        myrect.right = lpSize->cx;
-        myrect.bottom = lpSize->cy;
-
-        /* Use DrawText to get true size as drawn (less pesky "&") */
-        DrawTextW (hdc, lpText, -1, &myrect, DT_VCENTER | DT_SINGLELINE |
-                   DT_CALCRECT | ((btnPtr->fsStyle & TBSTYLE_NOPREFIX) ?
+        if(lpText != NULL) {
+            /* first get size of all the text */
+            GetTextExtentPoint32W (hdc, lpText, strlenW (lpText), lpSize);
+
+            /* feed above size into the rectangle for DrawText */
+            myrect.left = myrect.top = 0;
+            myrect.right = lpSize->cx;
+            myrect.bottom = lpSize->cy;
+
+            /* Use DrawText to get true size as drawn (less pesky "&") */
+            DrawTextW (hdc, lpText, -1, &myrect, DT_VCENTER | DT_SINGLELINE |
+                   DT_CALCRECT | ((btnPtr->fsStyle & TBSTYLE_NOPREFIX) ?
                                   DT_NOPREFIX : 0));
 
-        /* feed back to caller  */
-        lpSize->cx = myrect.right;
-        lpSize->cy = myrect.bottom;
+            /* feed back to caller  */
+            lpSize->cx = myrect.right;
+            lpSize->cy = myrect.bottom;
+        }
     }
 
@@ -891 +1083 @@
 * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE 
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
+*
+* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow 
+* vertical toolbar lists. 
 */ 
 
@@ -905 +1100 @@
     /*  no layout is necessary. Applications may use this style */
     /*  to perform their own layout on the toolbar.             */
-    if( !(dwStyle & TBSTYLE_WRAPABLE) )
-        return;
+    if( !(dwStyle & TBSTYLE_WRAPABLE) && 
+        !(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) )  return;
 
     btnPtr = infoPtr->buttons;
@@ -972 +1167 @@
             /*  go to the next until it reaches a non separator.      */
             /*  Wrap the last separator if it is before a button.     */
-            while( ( (btnPtr[i].fsStyle & TBSTYLE_SEP) || 
-                        (btnPtr[i].fsState & TBSTATE_HIDDEN) ) && 
+            while( ( ((btnPtr[i].fsStyle & TBSTYLE_SEP) &&
+                      !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN)) || 
+                     (btnPtr[i].fsState & TBSTATE_HIDDEN) ) &&
                         i < infoPtr->nNumButtons )
             {
@@ -1081 +1277 @@
     TOOLBAR_CalcStrings (hwnd, &sizeString);
 
+    for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
+    {
+        if (TOOLBAR_IsValidBitmapIndex(infoPtr,infoPtr->buttons[i].iBitmap))
+            usesBitmaps = TRUE;
+    }
     if (dwStyle & TBSTYLE_LIST)
     {
-        for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
-        {
-            if (infoPtr->buttons[i].iBitmap >= 0)
-                usesBitmaps = TRUE;
-        }
         infoPtr->nButtonHeight = max((usesBitmaps) ? infoPtr->nBitmapHeight :
-                                     0, sizeString.cy) + 6;
+                                     0, sizeString.cy) + infoPtr->szPadding.cy;
         infoPtr->nButtonWidth = ((usesBitmaps) ? infoPtr->nBitmapWidth :
                                  0) + sizeString.cx + 6;
@@ -1098 +1294 @@
     }
     else {
-        for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
-        {
-            if (TOOLBAR_IsValidBitmapIndex(infoPtr,infoPtr->buttons[i].iBitmap))
-                usesBitmaps = TRUE;
-        }
-
         if (sizeString.cy > 0)
         {
@@ -1252 +1442 @@
         btnPtr->nRow = nRows + nSepRows;
 
-        TRACE("button %d style=%x, bWrap=%d, nRows=%d, nSepRows=%d, btnrow=%d\n",
-              i, btnPtr->fsStyle, bWrap, nRows, nSepRows, btnPtr->nRow);
+        TRACE("button %d style=%x, bWrap=%d, nRows=%d, nSepRows=%d, btnrow=%d, (%d,%d)-(%d,%d)\n",
+              i, btnPtr->fsStyle, bWrap, nRows, nSepRows, btnPtr->nRow,
+              x, y, x+cx, y+cy);
 
         if( bWrap )
@@ -1275 +1466 @@
             }
             x = infoPtr->nIndent;
+
+            /* Increment row number unless this is the last button    */
+            /* and it has Wrap set.                                   */
+            if (i != infoPtr->nNumButtons-1)
                 nRows++;
         }
@@ -1283 +1478 @@
     /* infoPtr->nRows is the number of rows on the toolbar */
     infoPtr->nRows = nRows + nSepRows + 1;
+
+#if 0
+    /********************************************************************
+     * The following while interesting, does not match the values       *
+     * created above for the button rectangles, nor the rcBound rect.   *
+     * We will comment it out and remove it later.                      *
+     *                                                                  *
+     * The problem showed up as heights in the pager control that was   *
+     * wrong.                                                           *
+     ********************************************************************/
 
     /* nSepRows * (infoPtr->nBitmapHeight + 1) is the space following   */
@@ -1290 +1495 @@
                         nSepRows * (infoPtr->nBitmapHeight + 1) + 
                         BOTTOM_BORDER; 
+#endif
+
+    infoPtr->nHeight = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
+
     TRACE("toolbar height %d, button width %d\n", infoPtr->nHeight, infoPtr->nButtonWidth);
 }
@@ -1333 +1542 @@
     if (CommandIsIndex) {
         TRACE("command is really index command=%d\n", idCommand);
+        if (idCommand >= infoPtr->nNumButtons) return -1;
         return idCommand;
     }
@@ -1791 +2001 @@
 
                 /* set colors and select objects */
-                oldBk = SetBkColor (lpdis->hDC, GetSysColor((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                oldBk = SetBkColor (lpdis->hDC, (lpdis->itemState & ODS_FOCUS)?comctl32_color.clrHighlight:comctl32_color.clrWindow);
                 if (btnInfo->bVirtual)
-                   oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_GRAYTEXT));
+                   oldText = SetTextColor (lpdis->hDC, comctl32_color.clrGrayText);
                 else
-                   oldText = SetTextColor (lpdis->hDC, GetSysColor((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHTTEXT:COLOR_WINDOWTEXT));
+                   oldText = SetTextColor (lpdis->hDC, (lpdis->itemState & ODS_FOCUS)?comctl32_color.clrHighlightText:comctl32_color.clrWindowText);
                 hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
                 hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
@@ -2000 +2210 @@
     }
 
+    TRACE("Number of bitmap infos: %d\n", infoPtr->nNumBitmapInfos);
+
+    if (infoPtr->nNumBitmapInfos == 0)
+    {
+        infoPtr->bitmaps = COMCTL32_Alloc(sizeof(TBITMAP_INFO));
+    }
+    else
+    {
+        TBITMAP_INFO *oldBitmaps = infoPtr->bitmaps;
+        infoPtr->bitmaps = COMCTL32_Alloc((infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO));
+        memcpy(&infoPtr->bitmaps[0], &oldBitmaps[0], infoPtr->nNumBitmapInfos);
+    }
+
+    infoPtr->bitmaps[infoPtr->nNumBitmapInfos].nButtons = nButtons;
+    infoPtr->bitmaps[infoPtr->nNumBitmapInfos].hInst = lpAddBmp->hInst;
+    infoPtr->bitmaps[infoPtr->nNumBitmapInfos].nID = lpAddBmp->nID;
+
+    infoPtr->nNumBitmapInfos++;
+    TRACE("Number of bitmap infos: %d\n", infoPtr->nNumBitmapInfos);
+
     if (nIndex != -1)
     {
@@ -2824 +3054 @@
 
 
-/* << TOOLBAR_GetColorScheme >> */
-
-
 static LRESULT
 TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -2932 +3159 @@
 
 /* << TOOLBAR_GetObject >> */
-/* << TOOLBAR_GetPadding >> */
+
+
+static LRESULT
+TOOLBAR_GetPadding (HWND hwnd)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    DWORD oldPad;
+
+    oldPad = MAKELONG(infoPtr->szPadding.cx, infoPtr->szPadding.cy);
+    return (LRESULT) oldPad;
+}
 
 
@@ -3215 +3452 @@
     TOOLBAR_DumpButton(infoPtr, (TBUTTON_INFO *)lpTbb, nIndex, FALSE);
 
-    if (nIndex < 0)
-        return FALSE;
-
-    TRACE("inserting button index=%d\n", nIndex);
-    if (nIndex > infoPtr->nNumButtons) {
+    if (nIndex == -1) {
+       /* EPP: this seems to be an undocumented call (from my IE4)
+        * I assume in that case that:
+        * - lpTbb->iString is a string pointer (not a string index in strings[] table
+        * - index of insertion is at the end of existing buttons
+        * I only see this happen with nIndex == -1, but it could have a special
+        * meaning (like -nIndex (or ~nIndex) to get the real position of insertion).
+        */
         nIndex = infoPtr->nNumButtons;
-        TRACE("adjust index=%d\n", nIndex);
-    }
-
-    oldButtons = infoPtr->buttons;
-    infoPtr->nNumButtons++;
-    infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
-    /* pre insert copy */
-    if (nIndex > 0) {
-        memcpy (&infoPtr->buttons[0], &oldButtons[0],
-                nIndex * sizeof(TBUTTON_INFO));
-    }
-
+
+    } else if (nIndex < 0)
+       return FALSE;
 
     /* If the string passed is not an index, assume address of string 
@@ -3248 +3479 @@
         lpTbb->iString = TOOLBAR_AddStringW(hwnd, 0, (LPARAM)ptr);
         COMCTL32_Free(ptr);
+    }
+
+    TRACE("inserting button index=%d\n", nIndex);
+    if (nIndex > infoPtr->nNumButtons) {
+        nIndex = infoPtr->nNumButtons;
+        TRACE("adjust index=%d\n", nIndex);
+    }
+
+    oldButtons = infoPtr->buttons;
+    infoPtr->nNumButtons++;
+    infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
+    /* pre insert copy */
+    if (nIndex > 0) {
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nIndex * sizeof(TBUTTON_INFO));
     }
 
@@ -3285 +3531 @@
     COMCTL32_Free (oldButtons);
 
+    TOOLBAR_CalcToolbar (hwnd);
+
     InvalidateRect (hwnd, NULL, TRUE);
 
@@ -3407 +3655 @@
 
 
-/* << TOOLBAR_ReplaceBitmap >> */
-
+static LRESULT
+TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    LPTBREPLACEBITMAP lpReplace = (LPTBREPLACEBITMAP) lParam;
+    HBITMAP hBitmap;
+    int i = 0, nOldButtons = 0, pos = 0;
+
+    TRACE("hInstOld %x nIDOld %x hInstNew %x nIDNew %x nButtons %x\n",
+          lpReplace->hInstOld, lpReplace->nIDOld, lpReplace->hInstNew, lpReplace->nIDNew,
+          lpReplace->nButtons);
+
+    if (lpReplace->hInstOld == -1)
+    {
+        FIXME("changing standard bitmaps not implemented\n");
+        return FALSE;
+    }
+    else if (lpReplace->hInstOld != 0)
+    {
+        FIXME("resources not in the current module not implemented\n");
+        return FALSE;
+    }
+    else
+    {
+        hBitmap = (HBITMAP) lpReplace->nIDNew;
+    }
+
+    TRACE("To be replaced hInstOld %x nIDOld %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+    for (i = 0; i < infoPtr->nNumBitmapInfos; i++) {
+        TBITMAP_INFO *tbi = &infoPtr->bitmaps[i];
+        TRACE("tbimapinfo %d hInstOld %x nIDOld %x\n", i, tbi->hInst, tbi->nID);
+        if (tbi->hInst == lpReplace->hInstOld && tbi->nID == lpReplace->nIDOld)
+        {
+            TRACE("Found: nButtons %d hInst %x nID %x\n", tbi->nButtons, tbi->hInst, tbi->nID);
+            nOldButtons = tbi->nButtons;
+            tbi->nButtons = lpReplace->nButtons;
+            tbi->hInst = lpReplace->hInstNew;
+            tbi->nID = lpReplace->nIDNew;
+            TRACE("tbimapinfo changed %d hInstOld %x nIDOld %x\n", i, tbi->hInst, tbi->nID);
+            break;
+        }
+        pos += tbi->nButtons;
+    }
+
+    if (nOldButtons == 0)
+    {
+        WARN("No hinst/bitmap found! hInst %x nID %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+        return FALSE;
+    }
+
+    infoPtr->nNumBitmaps = infoPtr->nNumBitmaps - nOldButtons + lpReplace->nButtons;
+
+    /* ImageList_Replace(infoPtr->himlDef, pos, hBitmap, NULL); */
+
+
+    for (i = pos + nOldButtons - 1; i >= pos; i--) {
+        ImageList_Remove(infoPtr->himlDef, i);
+    }
+
+    ImageList_AddMasked(infoPtr->himlDef, hBitmap, CLR_DEFAULT);
+
+    InvalidateRect(hwnd, NULL, FALSE);
+
+    return TRUE;
+}
 
 static LRESULT
@@ -3599 +3910 @@
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
-    if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
+    INT cx = LOWORD(lParam), cy = HIWORD(lParam);
+
+    if ((cx < 0) || (cy < 0))
     {
-        ERR("invalid parameter\n");
+        ERR("invalid parameter 0x%08lx\n", (DWORD)lParam);
         return FALSE;
     }
@@ -3612 +3924 @@
      * Further testing shows that we must actually perform the change too.
      */
-    infoPtr->nButtonWidth = (INT)LOWORD(lParam);
-    infoPtr->nButtonHeight = (INT)HIWORD(lParam);
+    /*
+     * The documentation also does not mention that if 0 is supplied for
+     * either size, the system changes it to the default of 24 wide and
+     * 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02 
+     */
+    infoPtr->nButtonWidth = (cx) ? cx : 24;
+    infoPtr->nButtonHeight = (cy) ? cy : 22;
     return TRUE;
 }
@@ -3681 +3998 @@
 
 
-/* << TOOLBAR_SetColorScheme >> */
-
-
 static LRESULT
 TOOLBAR_SetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -3718 +4032 @@
 }
 
-
 static LRESULT
 TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -3727 +4040 @@
     dwTemp = infoPtr->dwExStyle;
     infoPtr->dwExStyle = (DWORD)lParam;
+
+    if (infoPtr->dwExStyle & (TBSTYLE_EX_MIXEDBUTTONS |
+                              TBSTYLE_EX_HIDECLIPPEDBUTTONS)) {
+        FIXME("Extended style not implemented %s %s\n",
+              (infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) ?
+              "TBSTYLE_EX_MIXEDBUTTONS" : "",
+              (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS) ?
+              "TBSTYLE_EX_HIDECLIPPEDBUTTONS" : "");
+    }
+
+    if (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)
+        FIXME("Unknown Toolbar Extended Style 0x%08lx. Please report.\n",
+              (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL));
 
     return (LRESULT)dwTemp; 
@@ -3869 +4195 @@
 
 
-/* << TOOLBAR_SetPadding >> */
+static LRESULT
+TOOLBAR_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    DWORD  oldPad;
+
+    oldPad = MAKELONG(infoPtr->szPadding.cx, infoPtr->szPadding.cy);
+    infoPtr->szPadding.cx = LOWORD((DWORD)lParam);
+    infoPtr->szPadding.cy = HIWORD((DWORD)lParam);
+    FIXME("stub - nothing done with values, cx=%ld, cy=%ld\n",
+          infoPtr->szPadding.cx, infoPtr->szPadding.cy);
+    return (LRESULT) oldPad;
+}
 
 
@@ -4015 +4353 @@
 
 static LRESULT
+TOOLBAR_GetColorScheme (HWND hwnd, LPCOLORSCHEME lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+
+    lParam->clrBtnHighlight = (infoPtr->clrBtnHighlight == CLR_DEFAULT) ? 
+                               comctl32_color.clrBtnHighlight : 
+                               infoPtr->clrBtnHighlight;
+    lParam->clrBtnShadow = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? 
+                           comctl32_color.clrBtnShadow : infoPtr->clrBtnShadow;
+    return 1;
+}
+
+
+static LRESULT
+TOOLBAR_SetColorScheme (HWND hwnd, LPCOLORSCHEME lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+
+    TRACE("new colors Hl=%lx Shd=%lx, old colors Hl=%lx Shd=%lx\n",
+          lParam->clrBtnHighlight, lParam->clrBtnShadow,
+          infoPtr->clrBtnHighlight, infoPtr->clrBtnShadow);
+
+    infoPtr->clrBtnHighlight = lParam->clrBtnHighlight;
+    infoPtr->clrBtnShadow = lParam->clrBtnShadow;
+    InvalidateRect(hwnd, 0, 0);
+    return 0;
+}
+
+
+static LRESULT
 TOOLBAR_SetVersion (HWND hwnd, INT iVersion)
 {
@@ -4023 +4391 @@
 
     return iOldVersion;
+}
+
+
+/*********************************************************************/
+/*                                                                   */
+/* This is undocumented and appears to be a "Super" TB_SETHOTITEM    */
+/* without the restriction of TBSTYLE_FLAT. This implementation is   */
+/* based on relay traces of the native control and IE 5.5            */
+/*                                                                   */
+/*********************************************************************/
+static LRESULT
+TOOLBAR_Unkwn45E (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+    INT nOldHotItem = infoPtr->nHotItem;
+    TBUTTON_INFO *btnPtr;
+    INT no_hi = 0;
+    NMTBHOTITEM nmhotitem;
+
+    if ((INT) wParam < 0 || (INT)wParam > infoPtr->nNumButtons)
+        wParam = -2;
+
+    infoPtr->nHotItem = (INT)wParam;
+    if (nOldHotItem != infoPtr->nHotItem) {
+        nmhotitem.dwFlags = (DWORD)lParam;
+        if ( !(nmhotitem.dwFlags & HICF_ENTERING) )
+            nmhotitem.idOld = (nOldHotItem >= 0) ?
+                infoPtr->buttons[nOldHotItem].idCommand : 0;
+        if ( !(nmhotitem.dwFlags & HICF_LEAVING) )
+            nmhotitem.idNew = (infoPtr->nHotItem >= 0) ? 
+                infoPtr->buttons[infoPtr->nHotItem].idCommand : 0;
+        no_hi = TOOLBAR_SendNotify((NMHDR*)&nmhotitem, infoPtr, TBN_HOTITEMCHANGE);
+    }
+    if ((INT)wParam >=0) {
+        btnPtr = &infoPtr->buttons[(INT)wParam];
+        btnPtr->bHot = (no_hi) ? FALSE : TRUE;
+        InvalidateRect (hwnd, &btnPtr->rect,
+                        TOOLBAR_HasText(infoPtr, btnPtr));
+    }
+    if (nOldHotItem>=0) {
+        btnPtr = &infoPtr->buttons[nOldHotItem];
+        btnPtr->bHot = FALSE;
+        InvalidateRect (hwnd, &btnPtr->rect,
+                        TOOLBAR_HasText(infoPtr, btnPtr));
+    }
+    GetFocus();
+    TRACE("old item=%d, new item=%d, flags=%08lx, notify=%d\n",
+          nOldHotItem, infoPtr->nHotItem, (DWORD)lParam, no_hi);
+
+    if (nOldHotItem < 0)
+        return -1;
+
+    return (LRESULT)nOldHotItem;
+}
+
+
+static LRESULT
+TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    LPSIZE lpsize = (LPSIZE)lParam;
+
+    if (lpsize == NULL)
+        return FALSE;
+
+    /*
+     * Testing shows the following:
+     *   wParam    = 0 adjust cx value
+     *             = 1 set cy value to max size.
+     *   lParam    pointer to SIZE structure
+     *
+     */
+    TRACE("[0463] wParam %d, lParam 0x%08lx -> 0x%08lx 0x%08lx\n",
+          wParam, lParam, lpsize->cx, lpsize->cy);
+
+    switch(wParam) {
+    case 0:
+        if (lpsize->cx == -1) {
+            /* **** this is wrong, native measures each button and sets it */
+            lpsize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left;
+        }
+        else if(HIWORD(lpsize->cx)) {
+            RECT rc;
+            HWND hwndParent = GetParent(hwnd);
+
+            InvalidateRect(hwnd, 0, 1);
+            GetWindowRect(hwnd, &rc);
+            MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2);
+            TRACE("mapped to (%d,%d)-(%d,%d)\n",
+                rc.left, rc.top, rc.right, rc.bottom);
+            lpsize->cx = max(rc.right-rc.left,
+                             infoPtr->rcBound.right - infoPtr->rcBound.left);
+        }
+        else {
+            lpsize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left;
+        }
+        break;
+    case 1:
+        lpsize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
+        /* lpsize->cy = infoPtr->nHeight; */
+        break;
+    default:
+        ERR("Unknown wParam %d for Toolbar message [0463]. Please report\n",
+            wParam);
+        return 0;
+    }
+    TRACE("[0463] set to -> 0x%08lx 0x%08lx\n",
+          lpsize->cx, lpsize->cy);
+    return 1;
 }
 
@@ -4058 +4535 @@
     infoPtr->bAnchor = FALSE; /* no anchor highlighting */
     infoPtr->iVersion = 0;
-    infoPtr->bNtfUnicode = FALSE;
     infoPtr->hwndSelf = hwnd;
     infoPtr->bDoRedraw = TRUE;
+    infoPtr->clrBtnHighlight = CLR_DEFAULT;
+    infoPtr->clrBtnShadow = CLR_DEFAULT;
+    infoPtr->szPadding.cx = 7;
+    infoPtr->szPadding.cy = 6;
+    TOOLBAR_NotifyFormat(infoPtr, (WPARAM)hwnd, (LPARAM)NF_REQUERY);
 
     SystemParametersInfoA (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
@@ -4137 +4618 @@
     DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
     NMTBCUSTOMDRAW tbcd;
-    INT ret = FALSE, ntfret;
+    INT ret = FALSE;
+    DWORD ntfret;
 
     if (dwStyle & TBSTYLE_CUSTOMERASE) {
@@ -4144 +4626 @@
         tbcd.nmcd.hdc = (HDC)wParam;
         ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+        infoPtr->dwBaseCustDraw = ntfret & 0xffff;
+
         /* FIXME: in general the return flags *can* be or'ed together */
-        switch (ntfret) 
+        switch (infoPtr->dwBaseCustDraw) 
             {
             case CDRF_DODEFAULT:
@@ -4152 +4636 @@
                 return TRUE;
             default:
-                FIXME("[%04x] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+                FIXME("[%04x] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
                       hwnd, ntfret);
             }
@@ -4176 +4660 @@
         ret = DefWindowProcA (hwnd, WM_ERASEBKGND, wParam, lParam);
 
-    if (dwStyle & TBSTYLE_CUSTOMERASE) {
+    if ((dwStyle & TBSTYLE_CUSTOMERASE) && 
+        (infoPtr->dwBaseCustDraw & CDRF_NOTIFYPOSTERASE)) { 
         ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
         tbcd.nmcd.dwDrawStage = CDDS_POSTERASE;
         tbcd.nmcd.hdc = (HDC)wParam;
         ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
-        switch (ntfret) 
+        infoPtr->dwBaseCustDraw = ntfret & 0xffff;
+        switch (infoPtr->dwBaseCustDraw) 
             {
             case CDRF_DODEFAULT:
@@ -4188 +4674 @@
                 return TRUE;
             default:
-                FIXME("[%04x] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+                FIXME("[%04x] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
                       hwnd, ntfret);
             }
@@ -4345 +4831 @@
         infoPtr->buttons[infoPtr->nHotItem].bHot = TRUE;
 
-    if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0)) {
         btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
         btnPtr->fsState &= ~TBSTATE_PRESSED;
 
-        if (nHit == infoPtr->nButtonDown) {
-            if (btnPtr->fsStyle & TBSTYLE_CHECK) {
+        if (btnPtr->fsStyle & TBSTYLE_CHECK) {
                 if (btnPtr->fsStyle & TBSTYLE_GROUP) {
                     nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr,
-                        infoPtr->nButtonDown);
-                    if (nOldIndex == infoPtr->nButtonDown)
+                        nHit);
+                    if (nOldIndex == nHit)
                         bSendMessage = FALSE;
-                    if ((nOldIndex != infoPtr->nButtonDown) && 
+                    if ((nOldIndex != nHit) && 
                         (nOldIndex != -1))
                         infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
@@ -4367 +4851 @@
                         btnPtr->fsState |= TBSTATE_CHECKED;
                 }
-            }
-        }
-        else
-            bSendMessage = FALSE;
+        }
 
         if (nOldIndex != -1)
@@ -4383 +4864 @@
          * and obliterates nButtonDown and nOldHit (see TOOLBAR_CaptureChanged) 
          */
-        ReleaseCapture ();
+        if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0))
+            ReleaseCapture ();
 
         /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */
@@ -4404 +4886 @@
                         TBN_ENDDRAG);
 
-        if (bSendMessage)
-            SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
-                          MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
+        SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
+          MAKEWPARAM(infoPtr->buttons[nHit].idCommand, 0), (LPARAM)hwnd);
 
         /* !!! Undocumented - toolbar at 4.71 level and above sends
@@ -4416 +4897 @@
         TOOLBAR_SendNotify ((NMHDR *) &nmmouse, infoPtr,
                         NM_CLICK);
-    }
-
     return 0;
 }
@@ -4488 +4967 @@
 TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    TBUTTON_INFO *btnPtr, *oldBtnPtr;
+    TBUTTON_INFO *btnPtr = NULL, *oldBtnPtr = NULL;
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     POINT pt;
     INT   nHit;
     TRACKMOUSEEVENT trackinfo;
+    NMTBHOTITEM nmhotitem;
 
     /* fill in the TRACKMOUSEEVENT struct */
@@ -4530 +5010 @@
             oldBtnPtr = &infoPtr->buttons[infoPtr->nOldHit];
             oldBtnPtr->bHot = FALSE;
-                    
-            InvalidateRect (hwnd, &oldBtnPtr->rect,
-                TOOLBAR_HasText(infoPtr, oldBtnPtr));
-        }
+        }
 
         /* It's not a separator or in nowhere. It's a hot button. */
@@ -4546 +5023 @@
             {
                 btnPtr->bHot = TRUE;
-                InvalidateRect(hwnd, &btnPtr->rect,
-                    TOOLBAR_HasText(infoPtr, btnPtr));
             }
-
-        }
-
-    if (infoPtr->bCaptured) {
+        }
+
+        nmhotitem.dwFlags = HICF_MOUSE;
+        if (oldBtnPtr)
+            nmhotitem.idOld = oldBtnPtr->idCommand;
+        else
+            nmhotitem.dwFlags |= HICF_ENTERING;
+        if (btnPtr)
+            nmhotitem.idNew = btnPtr->idCommand;
+        else
+            nmhotitem.dwFlags |= HICF_LEAVING;
+        TOOLBAR_SendNotify((NMHDR*)&nmhotitem, infoPtr, TBN_HOTITEMCHANGE);
+
+        /* now invalidate the old and new buttons so they will be painted */
+        if (oldBtnPtr)
+            InvalidateRect (hwnd, &oldBtnPtr->rect,
+                            TOOLBAR_HasText(infoPtr, oldBtnPtr));
+        if (btnPtr && (btnPtr->fsState & TBSTATE_ENABLED))
+            InvalidateRect(hwnd, &btnPtr->rect,
+                           TOOLBAR_HasText(infoPtr, btnPtr));
+
+        if (infoPtr->bCaptured) {
             btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
             if (infoPtr->nOldHit == infoPtr->nButtonDown) {
@@ -4705 +5198 @@
 
         if (lppgc->dwFlag == PGF_CALCWIDTH) {
-            lppgc->iWidth = infoPtr->nWidth;
+            lppgc->iWidth = infoPtr->rcBound.right - infoPtr->rcBound.left;
             TRACE("processed PGN_CALCSIZE, returning horz size = %d\n", 
-                  infoPtr->nWidth);
+                  lppgc->iWidth);
         }
         else {
-            lppgc->iHeight = infoPtr->nHeight;
+            lppgc->iHeight = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
             TRACE("processed PGN_CALCSIZE, returning vert size = %d\n", 
-                  infoPtr->nHeight);
+                  lppgc->iHeight);
         }
         return 0;
@@ -4721 +5214 @@
 
     if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
-        SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,   wParam, lParam);
+        if (infoPtr->bNtfUnicode)
+            return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, 
+                                 wParam, lParam);
+        else
+            return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, 
+                                 wParam, lParam);
 
 #if 0
@@ -4740 +5238 @@
 
     return 0;
+}
+
+
+static LRESULT
+TOOLBAR_NotifyFormatFake(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    /* remove this routine when Toolbar is improved to pass infoPtr
+     * around instead of hwnd.
+     */
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+    return TOOLBAR_NotifyFormat(infoPtr, wParam, lParam);
+}
+
+
+static LRESULT
+TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
+{
+    INT i;
+
+    if (lParam == NF_REQUERY) {
+        i = SendMessageA(GetParent(infoPtr->hwndSelf),
+                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+        if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
+            ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+                i);
+            i = NFR_ANSI;
+        }
+        infoPtr->bNtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
+        return (LRESULT)i;
+    }
+    return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);
 }
 
@@ -4908 +5437 @@
 
 
+static LRESULT
+TOOLBAR_SysColorChange (HWND hwnd)
+{
+    COMCTL32_RefreshSysColors();
+
+    return 0;
+}
+
+
 
 static LRESULT WINAPI
@@ -4989 +5527 @@
             return TOOLBAR_GetButtonTextW (hwnd, wParam, lParam);
 
-/*      case TB_GETCOLORSCHEME:                 */ /* 4.71 */
-
         case TB_GETDISABLEDIMAGELIST:
             return TOOLBAR_GetDisabledImageList (hwnd, wParam, lParam);
@@ -5016 +5552 @@
 
 /*      case TB_GETOBJECT:                      */ /* 4.71 */
-/*      case TB_GETPADDING:                     */ /* 4.71 */
+
+        case TB_GETPADDING:
+            return TOOLBAR_GetPadding (hwnd);
 
         case TB_GETRECT:
@@ -5038 +5576 @@
         case TB_GETUNICODEFORMAT:
             return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam);
-
-        case CCM_GETVERSION:
-            return TOOLBAR_GetVersion (hwnd);
 
         case TB_HIDEBUTTON:
@@ -5089 +5624 @@
             return TOOLBAR_PressButton (hwnd, wParam, lParam);
 
-/*      case TB_REPLACEBITMAP: */
+        case TB_REPLACEBITMAP:
+            return TOOLBAR_ReplaceBitmap (hwnd, wParam, lParam);
 
         case TB_SAVERESTOREA:
@@ -5118 +5654 @@
             return TOOLBAR_SetCmdId (hwnd, wParam, lParam);
 
-/*      case TB_SETCOLORSCHEME:                 */ /* 4.71 */
-
         case TB_SETDISABLEDIMAGELIST:
             return TOOLBAR_SetDisabledImageList (hwnd, wParam, lParam);
@@ -5149 +5683 @@
             return TOOLBAR_SetMaxTextRows (hwnd, wParam, lParam);
 
-/*      case TB_SETPADDING:                     */ /* 4.71 */
+        case TB_SETPADDING:
+            return TOOLBAR_SetPadding (hwnd, wParam, lParam);
 
         case TB_SETPARENT:
@@ -5169 +5704 @@
             return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
 
+        case TB_UNKWN45E:
+            return TOOLBAR_Unkwn45E (hwnd, wParam, lParam);
+
+        case TB_UNKWN463:
+            return TOOLBAR_Unkwn463 (hwnd, wParam, lParam);
+
+
+/* Common Control Messages */
+
+/*      case TB_GETCOLORSCHEME:                 */ /* identical to CCM_ */
+        case CCM_GETCOLORSCHEME:
+            return TOOLBAR_GetColorScheme (hwnd, (LPCOLORSCHEME)lParam);
+
+/*      case TB_SETCOLORSCHEME:                 */ /* identical to CCM_ */
+        case CCM_SETCOLORSCHEME:
+            return TOOLBAR_SetColorScheme (hwnd, (LPCOLORSCHEME)lParam);
+
+        case CCM_GETVERSION:
+            return TOOLBAR_GetVersion (hwnd);
+
         case CCM_SETVERSION:
             return TOOLBAR_SetVersion (hwnd, (INT)wParam);
@@ -5223 +5778 @@
             return TOOLBAR_Notify (hwnd, wParam, lParam);
 
-/*      case WM_NOTIFYFORMAT: */
+        case WM_NOTIFYFORMAT:
+            TOOLBAR_NotifyFormatFake (hwnd, wParam, lParam);
 
         case WM_PAINT:
@@ -5237 +5793 @@
             return TOOLBAR_StyleChanged (hwnd, (INT)wParam, (LPSTYLESTRUCT)lParam);
 
-/*      case WM_SYSCOLORCHANGE: */
+        case WM_SYSCOLORCHANGE:
+            return TOOLBAR_SysColorChange (hwnd);
 
 /*      case WM_WININICHANGE: */
@@ -5254 +5811 @@
             }
 
+        /* We see this in Outlook Express 5.x and just does DefWindowProc */
+        case PGM_FORWARDMOUSE:
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+
         default:
             if (uMsg >= WM_USER)

trunk/src/comctl32/tooltips.cpp

@@ -27 +27 @@
 #include "ccbase.h"
 #include "comctl32.h"
+#ifdef __WIN32OS2__
+#include <dbglog.h>
+#endif
 
 #define ID_TIMERSHOW   1    /* show delay timer */