Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32ss]

Browse source 
- Fix window from point so it handles disabled windows correctly.
- Cleanup processing mouse routine.
- See CORE-7447.

svn path=/trunk/; revision=66085
This commit is contained in:
James Tabor 2015-01-25 15:57:22 +00:00
parent a46eeba526
commit c094b4cd6e
2 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
reactos/win32ss/user/ntuser/msgqueue.c
View file

@ -61,7 +61,9 @@ IntTopLevelWindowFromPoint(INT x, INT y)
continue;
}
if ((pWnd->style & WS_VISIBLE) && IntPtInWindow(pWnd, x, y))
if ((pWnd->style & WS_VISIBLE) &&
(pWnd->ExStyle & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == 0 &&
IntPtInWindow(pWnd, x, y))
return pWnd;
}
@ -1476,18 +1478,17 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
MOUSEHOOKSTRUCT hook;
BOOL eatMsg = FALSE;
PWND pwndMsg, pwndDesktop, pwndOrig;
PWND pwndMsg, pwndDesktop;
PUSER_MESSAGE_QUEUE MessageQueue;
PTHREADINFO pti;
PSYSTEM_CURSORINFO CurInfo;
PDESKTOP pDesk;
DECLARE_RETURN(BOOL);
pti = PsGetCurrentThreadWin32Thread();
pwndDesktop = UserGetDesktopWindow();
MessageQueue = pti->MessageQueue;
CurInfo = IntGetSysCursorInfo();
pwndOrig = pwndMsg = ValidateHwndNoErr(msg->hwnd);
pwndMsg = ValidateHwndNoErr(msg->hwnd);
clk_msg = MessageQueue->msgDblClk;
pDesk = pwndDesktop->head.rpdesk;
@ -1496,7 +1497,6 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
{
hittest = HTCLIENT;
pwndMsg = MessageQueue->spwndCapture;
if (pwndMsg) UserReferenceObject(pwndMsg);
}
else
{
@ -1504,18 +1504,6 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
Start with null window. See wine win.c:test_mouse_input:WM_COMMAND tests.
*/
pwndMsg = co_WinPosWindowFromPoint( NULL, &msg->pt, &hittest, FALSE);
//
// CORE-6129, Override if a diabled window, it might have a visible popup.
//
if ( pwndOrig && pwndOrig->style & WS_DISABLED )
{
if ( hittest == (USHORT)HTERROR )
{
if (pwndMsg) UserReferenceObject(pwndMsg);
pwndMsg = pwndOrig;
UserReferenceObject(pwndMsg);
}
}
}
TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest);
@ -1525,7 +1513,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
{
/* Remove and ignore the message */
*RemoveMessages = TRUE;
RETURN(FALSE);
return FALSE;
}
if ( MessageQueue == gpqCursor ) // Cursor must use the same Queue!
@ -1600,7 +1588,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
if (!((first == 0 && last == 0) || (message >= first || message <= last)))
{
TRACE("Message out of range!!!\n");
RETURN(FALSE);
return FALSE;
}
/* update static double click conditions */
@ -1611,7 +1599,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
if (!((first == 0 && last == 0) || (message >= first || message <= last)))
{
TRACE("Message out of range!!!\n");
RETURN(FALSE);
return FALSE;
}
// Update mouse move down keys.
@ -1621,7 +1609,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
}
}
if(gspv.bMouseClickLock)
if (gspv.bMouseClickLock)
{
BOOL IsClkLck = FALSE;
@ -1649,11 +1637,11 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
/* Remove and ignore the message */
*RemoveMessages = TRUE;
TRACE("Remove and ignore the message\n");
RETURN(FALSE);
return FALSE;
}
}
/* message is accepted now (but may still get dropped) */
/* message is accepted now (but still get dropped) */
event.message = msg->message;
event.time = msg->time;
@ -1679,23 +1667,23 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
/* Remove and skip message */
*RemoveMessages = TRUE;
RETURN(FALSE);
return FALSE;
}
if ((hittest == (USHORT)HTERROR) || (hittest == (USHORT)HTNOWHERE))
{
co_IntSendMessage( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message ));
ERR("HT errors!\n");
/* Remove and skip message */
*RemoveMessages = TRUE;
RETURN(FALSE);
return FALSE;
}
if ((*RemoveMessages == FALSE) || MessageQueue->spwndCapture)
{
/* Accept the message */
msg->message = message;
RETURN(TRUE);
return TRUE;
}
if ((msg->message == WM_LBUTTONDOWN) ||
@ -1753,13 +1741,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT
co_IntSendMessage( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message ));
msg->message = message;
RETURN(!eatMsg);
CLEANUP:
if(pwndMsg)
UserDereferenceObject(pwndMsg);
END_CLEANUP;
return !eatMsg;
}
BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages)

43
reactos/win32ss/user/ntuser/winpos.c
View file

@ -2417,29 +2417,41 @@ co_WinPosSearchChildren(
IN BOOL Ignore
)
{
PWND pwndChild;
HWND *List, *phWnd;
PWND pwndChild = NULL;
/* not visible */
if (!(ScopeWin->style & WS_VISIBLE))
{
return NULL;
}
if (!Ignore && (ScopeWin->style & WS_DISABLED))
{
*HitTest = HTERROR;
return NULL;
}
/* not in window or in window region */
if (!IntPtInWindow(ScopeWin, Point->x, Point->y))
{
return NULL;
}
UserReferenceObject(ScopeWin);
if (RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y))
/* transparent */
if ((ScopeWin->ExStyle & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT))
{
return NULL;
}
if (!Ignore && (ScopeWin->style & WS_DISABLED))
{ /* disabled child */
if ((ScopeWin->style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return NULL;
/* process the hit error */
*HitTest = HTERROR;
return ScopeWin;
}
/* not minimized and check if point is inside the window */
if (!(ScopeWin->style & WS_MINIMIZE) &&
RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y) )
{
UserReferenceObject(ScopeWin);
List = IntWinListChildren(ScopeWin);
if (List)
{
@ -2462,6 +2474,7 @@ co_WinPosSearchChildren(
}
ExFreePoolWithTag(List, USERTAG_WINDOWLIST);
}
UserDereferenceObject(ScopeWin);
}
if (ScopeWin->head.pti == PsGetCurrentThreadWin32Thread())
@ -2470,20 +2483,23 @@ co_WinPosSearchChildren(
if ((*HitTest) == (USHORT)HTTRANSPARENT)
{
UserDereferenceObject(ScopeWin);
return NULL;
}
}
else
{
if (*HitTest == HTNOWHERE) *HitTest = HTCLIENT;
if (*HitTest == HTNOWHERE && pwndChild == NULL) *HitTest = HTCLIENT;
}
return ScopeWin;
}
PWND APIENTRY
co_WinPosWindowFromPoint(IN PWND ScopeWin, IN POINT *WinPoint, IN OUT USHORT* HitTest, IN BOOL Ignore)
co_WinPosWindowFromPoint(
IN PWND ScopeWin,
IN POINT *WinPoint,
IN OUT USHORT* HitTest,
IN BOOL Ignore)
{
PWND Window;
POINT Point = *WinPoint;
@ -3433,7 +3449,6 @@ NtUserWindowFromPoint(LONG X, LONG Y)
RETURN( NULL);
CLEANUP:
if (Window) UserDereferenceObject(Window);
if (DesktopWindow) UserDerefObjectCo(DesktopWindow);
TRACE("Leave NtUserWindowFromPoint, ret=%p\n", _ret_);