[PATCH v4 04/11] comctl32/listbox: Check for NULL item when populating the WM_DRAWITEM struct or tracing the string
Gabriel Ivăncescu
gabrielopcode at gmail.com
Wed Nov 21 13:15:07 CST 2018
Needed for LBS_NODATA.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/comctl32/listbox.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index a380b59..a77de49 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -522,10 +522,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect,
(descr->caret_on) &&
(descr->in_focus)) 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, debugstr_w(item ? item->str : NULL), action,
dis.itemState, wine_dbgstr_rect(rect) );
SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis);
SelectClipRgn( hdc, hrgn );
--
2.19.1
More information about the wine-devel
mailing list