Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-19 03:45:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32_APITEST] - Log the dwDrawStage when the NM_CUSTOMDRAW is received to make the test slightly more descriptive.

Browse source 
svn path=/trunk/; revision=75320
This commit is contained in:
Giannis Adamopoulos 2017-07-12 12:17:05 +00:00
parent 4c8e09598a
commit 3841692020
1 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

62
rostests/apitests/comctl32/button.c
View file

@ -444,7 +444,15 @@ static LRESULT CALLBACK subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LP
case WM_NOTIFY: case WM_NOTIFY:
{ {
NMHDR* pnmhdr = (NMHDR*)lParam; NMHDR* pnmhdr = (NMHDR*)lParam;
if (pnmhdr->code == NM_CUSTOMDRAW)
{
NMCUSTOMDRAW* pnmcd = (NMCUSTOMDRAW*)lParam;
RECORD_MESSAGE(iwnd, message, SENT, pnmhdr->code, pnmcd->dwDrawStage);
}
else
{
RECORD_MESSAGE(iwnd, message, SENT, pnmhdr->idFrom,pnmhdr->code); RECORD_MESSAGE(iwnd, message, SENT, pnmhdr->idFrom,pnmhdr->code);
}
break; break;
} }
default: default:
@ -460,8 +468,16 @@ static LRESULT CALLBACK TestProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
if (iwnd != 0 && message == WM_NOTIFY) if (iwnd != 0 && message == WM_NOTIFY)
{ {
NMHDR* pnmhdr = (NMHDR*)lParam; NMHDR* pnmhdr = (NMHDR*)lParam;
if (pnmhdr->code == NM_CUSTOMDRAW)
{
NMCUSTOMDRAW* pnmcd = (NMCUSTOMDRAW*)lParam;
RECORD_MESSAGE(iwnd, message, SENT, pnmhdr->code, pnmcd->dwDrawStage);
}
else
{
RECORD_MESSAGE(iwnd, message, SENT, pnmhdr->idFrom,pnmhdr->code); RECORD_MESSAGE(iwnd, message, SENT, pnmhdr->idFrom,pnmhdr->code);
} }
}
else if (iwnd != 0 && message < WM_USER && message != WM_GETICON) else if (iwnd != 0 && message < WM_USER && message != WM_GETICON)
{ {
RECORD_MESSAGE(iwnd, message, SENT, 0,0); RECORD_MESSAGE(iwnd, message, SENT, 0,0);
@ -491,15 +507,15 @@ MSG_ENTRY paint_sequence[]={
{1, WM_ERASEBKGND}, {1, WM_ERASEBKGND},
{1, WM_PRINTCLIENT}, {1, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY paint_nonthemed_sequence[]={ MSG_ENTRY paint_nonthemed_sequence[]={
{2, WM_PAINT, POST}, {2, WM_PAINT, POST},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY redraw_sequence[]={ MSG_ENTRY redraw_sequence[]={
@ -508,29 +524,29 @@ MSG_ENTRY redraw_sequence[]={
{1, WM_ERASEBKGND}, {1, WM_ERASEBKGND},
{1, WM_PRINTCLIENT}, {1, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY redraw_nonthemed_sequence[]={ MSG_ENTRY redraw_nonthemed_sequence[]={
{2, WM_PAINT, POST}, {2, WM_PAINT, POST},
{2, WM_ERASEBKGND}, {2, WM_ERASEBKGND},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY printclnt_nonthemed_sequence[]={ MSG_ENTRY printclnt_nonthemed_sequence[]={
{2, WM_PRINTCLIENT}, {2, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY printclnt_sequence[]={ MSG_ENTRY printclnt_sequence[]={
{2, WM_PRINTCLIENT}, {2, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{0,0}}; {0,0}};
MSG_ENTRY pseudomove_sequence[]={ MSG_ENTRY pseudomove_sequence[]={
@ -543,8 +559,8 @@ MSG_ENTRY pseudomove_sequence[]={
{1, WM_ERASEBKGND}, {1, WM_ERASEBKGND},
{1, WM_PRINTCLIENT}, {1, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY pseudomove_nonthemed_sequence[]={ MSG_ENTRY pseudomove_nonthemed_sequence[]={
@ -555,8 +571,8 @@ MSG_ENTRY pseudomove_nonthemed_sequence[]={
{2, WM_PAINT, POST}, {2, WM_PAINT, POST},
{2, WM_ERASEBKGND}, {2, WM_ERASEBKGND},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY pseudohover_sequence[]={ MSG_ENTRY pseudohover_sequence[]={
@ -578,8 +594,8 @@ MSG_ENTRY mouseenter_sequence[]={
{1, WM_ERASEBKGND}, {1, WM_ERASEBKGND},
{1, WM_PRINTCLIENT}, {1, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY mouseenter_nonthemed_sequence[]={ MSG_ENTRY mouseenter_nonthemed_sequence[]={
@ -591,8 +607,8 @@ MSG_ENTRY mouseenter_nonthemed_sequence[]={
{2, WM_PAINT, POST}, {2, WM_PAINT, POST},
{2, WM_ERASEBKGND}, {2, WM_ERASEBKGND},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY mousemove_sequence[]={ MSG_ENTRY mousemove_sequence[]={
@ -610,8 +626,8 @@ MSG_ENTRY mouseleave_sequence[]={
{1, WM_ERASEBKGND}, {1, WM_ERASEBKGND},
{1, WM_PRINTCLIENT}, {1, WM_PRINTCLIENT},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
MSG_ENTRY mouseleave_nonthemed_sequence[]={ MSG_ENTRY mouseleave_nonthemed_sequence[]={
@ -620,8 +636,8 @@ MSG_ENTRY mouseleave_nonthemed_sequence[]={
{2, WM_PAINT, POST}, {2, WM_PAINT, POST},
{2, WM_ERASEBKGND}, {2, WM_ERASEBKGND},
{1, WM_CTLCOLORBTN}, {1, WM_CTLCOLORBTN},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREERASE},
{1, WM_NOTIFY, SENT, 0, NM_CUSTOMDRAW}, {1, WM_NOTIFY, SENT, NM_CUSTOMDRAW, CDDS_PREPAINT},
{0,0}}; {0,0}};
void Test_MessagesNonThemed() void Test_MessagesNonThemed()