Piotr Caban : comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0bb2cb3d998cfb6a3a98e469807b7a0e5f55ca15
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0bb2cb3d998cfb6a3a98e4698...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Wed Feb 28 17:37:10 2018 +0100

comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/comctl32/listbox.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 3184e20..94712fd 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -1533,7 +1533,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index,
         RtlMoveMemory( item + 1, item,
                        (descr->nb_items - index) * sizeof(LB_ITEMDATA) );
     item->str      = str;
-    item->data     = data;
+    item->data     = HAS_STRINGS(descr) ? 0 : data;
     item->height   = 0;
     item->selected = FALSE;
     descr->nb_items++;
@@ -1548,7 +1548,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index,
         mis.CtlType    = ODT_LISTBOX;
         mis.CtlID      = id;
         mis.itemID     = index;
-        mis.itemData   = descr->items[index].data;
+        mis.itemData   = data;
         mis.itemHeight = descr->item_height;
         SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis );
         item->height = mis.itemHeight ? mis.itemHeight : 1;
@@ -1589,7 +1589,6 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index,
 static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str )
 {
     LPWSTR new_str = NULL;
-    ULONG_PTR data = 0;
     LRESULT ret;
 
     if (HAS_STRINGS(descr))
@@ -1603,10 +1602,9 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str )
         }
         strcpyW(new_str, str);
     }
-    else data = (ULONG_PTR)str;
 
     if (index == -1) index = descr->nb_items;
-    if ((ret = LISTBOX_InsertItem( descr, index, new_str, data )) != 0)
+    if ((ret = LISTBOX_InsertItem( descr, index, new_str, (ULONG_PTR)str )) != 0)
     {
         HeapFree( GetProcessHeap(), 0, new_str );
         return ret;