Author: jimtabor
Date: Tue Nov 23 01:16:58 2010
New Revision: 49719
URL:
http://svn.reactos.org/svn/reactos?rev=49719&view=rev
Log:
[Win32k]
- Restore capturing the hit test in the desktop structure. Move journal record hook before
sending the mouse hook.
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Nov 23
01:16:58 2010
@@ -870,14 +870,6 @@
msg->hwnd = UserHMGetHandle(pwndMsg);
- /* FIXME: is this really the right place for this hook? */
- event.message = msg->message;
- event.time = msg->time;
- event.hwnd = msg->hwnd;
- event.paramL = msg->pt.x;
- event.paramH = msg->pt.y;
- co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&event );
-
#if 0
if (!check_hwnd_filter( msg, hwnd_filter )) RETURN(FALSE);
#endif
@@ -988,6 +980,15 @@
}
/* message is accepted now (but may still get dropped) */
+
+ pti->rpdesk->htEx = hittest; /* Now set the capture hit. */
+
+ event.message = msg->message;
+ event.time = msg->time;
+ event.hwnd = msg->hwnd;
+ event.paramL = msg->pt.x;
+ event.paramH = msg->pt.y;
+ co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&event );
hook.pt = msg->pt;
hook.hwnd = msg->hwnd;