Commit 5c765431 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

user32: Fix the listbox sorting algorithm.

parent 18420c24
...@@ -828,10 +828,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) ...@@ -828,10 +828,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact )
{ {
INT index, min, max, res; 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; min = 0;
max = descr->nb_items; max = descr->nb_items - 1;
while (min != max) while (min <= max)
{ {
index = (min + max) / 2; index = (min + max) / 2;
if (HAS_STRINGS(descr)) if (HAS_STRINGS(descr))
...@@ -854,10 +855,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) ...@@ -854,10 +855,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact )
res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis );
} }
if (!res) return index; if (!res) return index;
if (res > 0) max = index; if (res > 0) max = index - 1;
else min = index + 1; else min = index + 1;
} }
return exact ? -1 : max; return exact ? -1 : min;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment