ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/listbox: Fix the listbox sorting algorithm. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2018-07-05 08:14:34 +03:00 committed by Alexandre Julliard
parent 7decba4e2b
commit 02c36b52b0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/comctl32/listbox.c
View File

@ -791,10 +791,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact )
{
INT index, min, max, res;
if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */
if (!descr->nb_items || !(descr->style & LBS_SORT)) return -1; /* Add it at the end */
min = 0;
max = descr->nb_items;
while (min != max)
max = descr->nb_items - 1;
while (min <= max)
{
index = (min + max) / 2;
if (HAS_STRINGS(descr))
@ -817,10 +818,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact )
res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis );
}
if (!res) return index;
if (res > 0) max = index;
if (res > 0) max = index - 1;
else min = index + 1;
}
return exact ? -1 : max;
return exact ? -1 : min;
}

2
dlls/comctl32/tests/listbox.c
View File

@ -2032,7 +2032,7 @@ static void test_WM_MEASUREITEM(void)
ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2");
ok(ret == 2, "expected 2, got %ld\n", ret);
ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE);
ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", FALSE);
DestroyWindow(listbox);
/* LBS_HASSTRINGS */