comctl32/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>

comctl32/listbox: Account for NULL item when painting ownerdrawn list.
79bb84d2 · Gabriel Ivăncescu · Alexandre Julliard · 656f3f5b · 79bb84d2
Commit 79bb84d2 authored Nov 23, 2018 by Gabriel Ivăncescu Committed by Alexandre Julliard Nov 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

listbox.c dlls/comctl32/listbox.c +2 -2

No files found.
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -535,10 +535,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 );