Module: wine Branch: master Commit: 8700ef560eb50602af40a418b163f2b3f42e58b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8700ef560eb50602af40a418b...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Mon Dec 3 13:32:09 2018 +0300
user32/listbox: Account for NULL item when painting ownerdrawn list.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/user32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6a33f81..b104bfd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -560,10 +560,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = item ? item->data : 0; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, + descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn );