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

comctl32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2018-11-11 10:04:14 +03:00 committed by Alexandre Julliard
parent 4c5f38493d
commit 2813b43aeb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/listbox.c
View File

@ -2520,6 +2520,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc )
if (descr->style & LBS_OWNERDRAWFIXED) if (descr->style & LBS_OWNERDRAWFIXED)
{ {
descr->style &= ~LBS_OWNERDRAWVARIABLE;
if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN))
{ {
/* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */ /* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */

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

@ -435,6 +435,8 @@ static void test_ownerdraw(void)
NULL, NULL, NULL, 0); NULL, NULL, NULL, 0);
ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); ok(hLB != NULL, "last error 0x%08x\n", GetLastError());
ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n");
ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0);
ok(ret == 0, "Unexpected return value %d.\n", ret); ok(ret == 0, "Unexpected return value %d.\n", ret);
ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0);
@ -450,7 +452,6 @@ static void test_ownerdraw(void)
ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret);
ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0);
todo_wine
ok(ret == 42, "Unexpected item height %d.\n", ret); ok(ret == 42, "Unexpected item height %d.\n", ret);
ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0);