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

comctl32/listview: Fix find using partial string logic.

This commit is contained in:
Nikolay Sivov 2009-11-21 22:19:54 +03:00 committed by Alexandre Julliard
parent 90c4abe86f
commit b7b7b7113e
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/comctl32/listview.c
View File

@ -5954,7 +5954,8 @@ again:
{ {
if (lpFindInfo->flags & LVFI_PARTIAL) if (lpFindInfo->flags & LVFI_PARTIAL)
{ {
if (strstrW(lvItem.pszText, lpFindInfo->psz) == NULL) continue; WCHAR *p = strstrW(lvItem.pszText, lpFindInfo->psz);
if (!p || p != lvItem.pszText) continue;
} }
else else
{ {

39
dlls/comctl32/tests/listview.c
View File

@ -4023,7 +4023,7 @@ static void test_LVS_EX_TRANSPARENTBKGND(void)
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
static void test_ApproximateViewRect(void) static void test_approximate_viewrect(void)
{ {
HWND hwnd; HWND hwnd;
DWORD ret; DWORD ret;
@ -4097,6 +4097,40 @@ static void test_ApproximateViewRect(void)
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
static void test_finditem(void)
{
LVFINDINFOA fi;
static char f[5];
HWND hwnd;
DWORD r;
hwnd = create_listview_control(0);
insert_item(hwnd, 0);
memset(&fi, 0, sizeof(fi));
/* full string search, inserted text was "foo" */
strcpy(f, "foo");
fi.flags = LVFI_STRING;
fi.psz = f;
r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi);
expect(0, r);
/* partial string search, inserted text was "foo" */
strcpy(f, "fo");
fi.flags = LVFI_STRING | LVFI_PARTIAL;
fi.psz = f;
r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi);
expect(0, r);
/* partial string search, part after start char */
strcpy(f, "oo");
fi.flags = LVFI_STRING | LVFI_PARTIAL;
fi.psz = f;
r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi);
expect(-1, r);
DestroyWindow(hwnd);
}
START_TEST(listview) START_TEST(listview)
{ {
HMODULE hComctl32; HMODULE hComctl32;
@ -4154,7 +4188,8 @@ START_TEST(listview)
test_indentation(); test_indentation();
test_getitemspacing(); test_getitemspacing();
test_getcolumnwidth(); test_getcolumnwidth();
test_ApproximateViewRect(); test_approximate_viewrect();
test_finditem();
if (!load_v6_module(&ctx_cookie, &hCtx)) if (!load_v6_module(&ctx_cookie, &hCtx))
{ {