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

The listbox test shows that the control id must be stored in WPARAM 

for the WM_DRAWITEM message.
Fix the listbox test so CreateWindow() does not fail on Windows.
This commit is contained in:
Francois Gouget 2005-08-08 11:02:54 +00:00 committed by Alexandre Julliard
parent cdd75bd413
commit ae7a646f8e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/user/listbox.c
View File

@ -578,7 +578,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect,
TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%ld,%ld-%ld,%ld\n", TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%ld,%ld-%ld,%ld\n",
descr->self, index, item ? debugstr_w(item->str) : "", action, descr->self, index, item ? debugstr_w(item->str) : "", action,
dis.itemState, rect->left, rect->top, rect->right, rect->bottom ); dis.itemState, rect->left, rect->top, rect->right, rect->bottom );
SendMessageW(descr->owner, WM_DRAWITEM, 0, (LPARAM)&dis); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis);
} }
else else
{ {

11
dlls/user/tests/listbox.c
View File

@ -47,10 +47,14 @@ static const char * const strings[4] = {
static HWND static HWND
create_listbox (DWORD add_style, HWND parent) create_listbox (DWORD add_style, HWND parent)
{ {
HWND handle=CreateWindow ("LISTBOX", "TestList", HWND handle;
int ctl_id=0;
if (parent)
ctl_id=1;
handle=CreateWindow ("LISTBOX", "TestList",
(LBS_STANDARD & ~LBS_SORT) | add_style, (LBS_STANDARD & ~LBS_SORT) | add_style,
0, 0, 100, 100, 0, 0, 100, 100,
parent, (HMENU)1, NULL, 0); parent, (HMENU)ctl_id, NULL, 0);
assert (handle); assert (handle);
SendMessage (handle, LB_ADDSTRING, 0, (LPARAM) (LPCTSTR) strings[0]); SendMessage (handle, LB_ADDSTRING, 0, (LPARAM) (LPCTSTR) strings[0]);
@ -212,7 +216,8 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA
trace("%p WM_DRAWITEM %08x %08lx\n", hwnd, wparam, lparam); trace("%p WM_DRAWITEM %08x %08lx\n", hwnd, wparam, lparam);
ok(wparam == 0, "wrong wparam %04x\n", wparam); ok(wparam == dis->CtlID, "got wParam=%08x instead of %08x\n",
wparam, dis->CtlID);
ok(dis->CtlType == ODT_LISTBOX, "wrong CtlType %04x\n", dis->CtlType); ok(dis->CtlType == ODT_LISTBOX, "wrong CtlType %04x\n", dis->CtlType);
GetClientRect(dis->hwndItem, &rc_client); GetClientRect(dis->hwndItem, &rc_client);