From: Tobiasz Laskowski <tlaskowski@codeweavers.com> If the index is negative or greater than or equal the number of items, we should return LB_ERR to match windows. If it is greater than the top index but less than the number of items, it still gets clamped. --- dlls/comctl32/tests/listbox.c | 6 ------ dlls/comctl32_v6/listbox.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 557433ed481..bcef9abe423 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -3037,28 +3037,22 @@ static void test_LB_SETTOPINDEX(void) { /* Greater than or equal to item count (out of bounds) */ ret = SendMessageA(listbox, LB_SETTOPINDEX, 10, 0); - todo_wine ok(ret == LB_ERR, "got %d\n", ret); ret = SendMessageA(listbox, LB_GETTOPINDEX, 0, 0); - todo_wine ok(ret == 2, "got %d\n", ret); ret = SendMessageA(listbox, LB_SETTOPINDEX, 20, 0); - todo_wine ok(ret == LB_ERR, "Expected LB_ERR, got %d\n", ret); ret = SendMessageA(listbox, LB_GETTOPINDEX, 0, 0); - todo_wine ok(ret == 2, "got %d\n", ret); /* Negative (out of bounds) */ ret = SendMessageA(listbox, LB_SETTOPINDEX, -1, 0); - todo_wine ok(ret == LB_ERR, "Expected LB_ERR, got %d\n", ret); ret = SendMessageA(listbox, LB_GETTOPINDEX, 0, 0); - todo_wine ok(ret == 2, "got %d\n", ret); DestroyWindow(listbox); diff --git a/dlls/comctl32_v6/listbox.c b/dlls/comctl32_v6/listbox.c index 7dec0e2d999..fecbc61c649 100644 --- a/dlls/comctl32_v6/listbox.c +++ b/dlls/comctl32_v6/listbox.c @@ -386,8 +386,8 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) TRACE("setting top item %d, scroll %d\n", index, scroll); + if (index < 0 || index >= descr->nb_items) return LB_ERR; if (index > max) index = max; - if (index < 0) index = 0; if (descr->style & LBS_MULTICOLUMN) index -= index % descr->page_size; if (descr->top_item == index) return LB_OKAY; if (scroll) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11507