user32/listbox: Use a helper to set item data by index.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32/listbox: Use a helper to set item data by index.
a01b90d3 · Gabriel Ivăncescu · Alexandre Julliard · 350123e1 · a01b90d3
Commit a01b90d3 authored Feb 28, 2019 by Gabriel Ivăncescu Committed by Alexandre Julliard Mar 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

listbox.c dlls/user32/listbox.c +6 -1

No files found.
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -156,6 +156,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index )
    return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data;
 }

+static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data )
+{
+    if (!(descr->style & LBS_NODATA)) descr->items[index].data = data;
+}
+
 static WCHAR *get_item_string( const LB_DESCR *descr, UINT index )
 {
    return HAS_STRINGS(descr) ? descr->items[index].str : NULL;
@@ -2743,7 +2748,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
            SetLastError(ERROR_INVALID_INDEX);
            return LB_ERR;
        }
-        if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam;
+        set_item_data(descr, wParam, lParam);
        /* undocumented: returns TRUE, not LB_OKAY (0) */
        return TRUE;