Author: jimtabor
Date: Wed Mar 30 01:26:54 2011
New Revision: 51202
URL:
http://svn.reactos.org/svn/reactos?rev=51202&view=rev
Log:
[User32]
- Connect the rest of the pump hooks and start tracking from application testing.
Modified:
trunk/reactos/dll/win32/user32/windows/message.c
Modified: trunk/reactos/dll/win32/user32/windows/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed Mar 30 01:26:54
2011
@@ -2491,11 +2491,13 @@
}
typedef DWORD (WINAPI * RealGetQueueStatusProc)(UINT flags);
typedef DWORD (WINAPI * RealMsgWaitForMultipleObjectsExProc)(DWORD nCount, CONST HANDLE
*lpHandles, DWORD dwMilliseconds, DWORD dwWakeMask, DWORD dwFlags);
+typedef BOOL (WINAPI * RealInternalGetMessageProc)(LPMSG,HWND,UINT,UINT,UINT,BOOL);
+typedef BOOL (WINAPI * RealWaitMessageExProc)(DWORD,UINT);
typedef struct _USER_MESSAGE_PUMP_ADDRESSES {
DWORD cbSize;
- //NtUserRealInternalGetMessageProc NtUserRealInternalGetMessage;
- //NtUserRealWaitMessageExProc NtUserRealWaitMessageEx;
+ RealInternalGetMessageProc NtUserRealInternalGetMessage;
+ RealWaitMessageExProc NtUserRealWaitMessageEx;
RealGetQueueStatusProc RealGetQueueStatus;
RealMsgWaitForMultipleObjectsExProc RealMsgWaitForMultipleObjectsEx;
} USER_MESSAGE_PUMP_ADDRESSES, * PUSER_MESSAGE_PUMP_ADDRESSES;
@@ -2515,8 +2517,8 @@
MESSAGEPUMPHOOKPROC gpfnInitMPH;
DWORD gcLoadMPH = 0;
USER_MESSAGE_PUMP_ADDRESSES gmph = {sizeof(USER_MESSAGE_PUMP_ADDRESSES),
- //NtUserRealInternalGetMessage,
- //NtUserRealInternalWaitMessageEx,
+ NtUserRealInternalGetMessage,
+ NtUserRealWaitMessageEx,
RealGetQueueStatus,
RealMsgWaitForMultipleObjectsEx
};
@@ -2532,8 +2534,8 @@
void WINAPI ResetMessagePumpHook(PUSER_MESSAGE_PUMP_ADDRESSES Addresses)
{
Addresses->cbSize = sizeof(USER_MESSAGE_PUMP_ADDRESSES);
- //Addresses->NtUserRealInternalGetMessage =
(NtUserRealInternalGetMessageProc)NtUserRealInternalGetMessage;
- //Addresses->NtUserRealWaitMessageEx =
(NtUserRealWaitMessageExProc)NtUserRealInternalWaitMessageEx;
+ Addresses->NtUserRealInternalGetMessage = NtUserRealInternalGetMessage;
+ Addresses->NtUserRealWaitMessageEx = NtUserRealWaitMessageEx;
Addresses->RealGetQueueStatus = RealGetQueueStatus;
Addresses->RealMsgWaitForMultipleObjectsEx = RealMsgWaitForMultipleObjectsEx;
}