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

comctl32/header: Fix hittesting flags, extend tests a bit.

Browse Source
This commit is contained in:
Nikolay Sivov 2009-07-15 00:11:12 +04:00 committed by Alexandre Julliard
parent af6de9d7a3
commit ce372ca4db
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/comctl32/header.c
View File

@ -1224,10 +1224,12 @@ HEADER_GetUnicodeFormat (const HEADER_INFO *infoPtr)
static LRESULT static LRESULT
HEADER_HitTest (const HEADER_INFO *infoPtr, LPHDHITTESTINFO phti) HEADER_HitTest (const HEADER_INFO *infoPtr, LPHDHITTESTINFO phti)
{ {
UINT outside = HHT_NOWHERE | HHT_ABOVE | HHT_BELOW | HHT_TOLEFT | HHT_TORIGHT;
HEADER_InternalHitTest (infoPtr, &phti->pt, &phti->flags, &phti->iItem); HEADER_InternalHitTest (infoPtr, &phti->pt, &phti->flags, &phti->iItem);
if (phti->flags == HHT_NOWHERE) if (phti->flags & outside)
return -1; return phti->iItem = -1;
else else
return phti->iItem; return phti->iItem;
} }

7
dlls/comctl32/tests/header.c
View File

@ -904,6 +904,7 @@ static void test_hdm_hittest(HWND hParent)
retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo);
expect(0, retVal); expect(0, retVal);
expect(0, hdHitTestInfo.iItem); expect(0, hdHitTestInfo.iItem);
expect(HHT_ONDIVIDER, hdHitTestInfo.flags);
pt.x = secondItemRightBoundary - 1; pt.x = secondItemRightBoundary - 1;
pt.y = bottomBoundary - 1; pt.y = bottomBoundary - 1;
@ -911,15 +912,15 @@ static void test_hdm_hittest(HWND hParent)
retVal = SendMessage(hChild, HDM_HITTEST, 1, (LPARAM) &hdHitTestInfo); retVal = SendMessage(hChild, HDM_HITTEST, 1, (LPARAM) &hdHitTestInfo);
expect(1, retVal); expect(1, retVal);
expect(1, hdHitTestInfo.iItem); expect(1, hdHitTestInfo.iItem);
expect(HHT_ONDIVIDER, hdHitTestInfo.flags);
pt.x = secondItemRightBoundary; pt.x = secondItemRightBoundary;
pt.y = bottomBoundary + 1; pt.y = bottomBoundary + 1;
hdHitTestInfo.pt = pt; hdHitTestInfo.pt = pt;
todo_wine
{
retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo);
expect(-1, retVal); expect(-1, retVal);
} expect(-1, hdHitTestInfo.iItem);
expect(HHT_BELOW, hdHitTestInfo.flags);
ok_sequence(sequences, HEADER_SEQ_INDEX, hittest_seq, "hittest sequence testing", FALSE); ok_sequence(sequences, HEADER_SEQ_INDEX, hittest_seq, "hittest sequence testing", FALSE);