Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 02:26:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

small fix to NtUserDispatchMessage()

Browse source 
svn path=/trunk/; revision=7289
This commit is contained in:
Thomas Bluemel 2003-12-28 13:53:14 +00:00
parent ff4cde9c00
commit 1ff3a7da81
2 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/subsys/win32k/include/msgqueue.h
View file

@ -145,6 +145,9 @@ IntSendMessage(HWND hWnd,
UINT Msg,
WPARAM wParam,
LPARAM lParam);
LRESULT FASTCALL
IntDispatchMessage(MSG* Msg);
VOID STDCALL
MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
VOID STDCALL

72
reactos/subsys/win32k/ntuser/message.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: message.c,v 1.43 2003/12/27 10:08:31 gvg Exp $
/* $Id: message.c,v 1.44 2003/12/28 13:53:14 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -62,45 +62,36 @@ IntCleanupMessageImpl(VOID)
return STATUS_SUCCESS;
}
LRESULT STDCALL
NtUserDispatchMessage(CONST MSG* UnsafeMsg)
LRESULT FASTCALL
IntDispatchMessage(MSG* Msg)
{
LRESULT Result;
PWINDOW_OBJECT WindowObject;
NTSTATUS Status;
MSG Msg;
Status = MmCopyFromCaller(&Msg, (PVOID) UnsafeMsg, sizeof(MSG));
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
return 0;
}
/* Process timer messages. */
if (Msg.message == WM_TIMER)
if (Msg->message == WM_TIMER)
{
if (Msg.lParam)
if (Msg->lParam)
{
LARGE_INTEGER LargeTickCount;
/* FIXME: Call hooks. */
/* FIXME: Check for continuing validity of timer. */
return IntCallWindowProc((WNDPROC)Msg.lParam,
KeQueryTickCount(&LargeTickCount);
return IntCallWindowProc((WNDPROC)Msg->lParam,
FALSE,
Msg.hwnd,
Msg.message,
Msg.wParam,
0 /* GetTickCount() */,
Msg->hwnd,
Msg->message,
Msg->wParam,
(LPARAM)LargeTickCount.u.LowPart,
-1);
}
}
if( Msg.hwnd == 0 ) return 0;
if( Msg->hwnd == 0 ) return 0;
/* Get the window object. */
WindowObject = IntGetWindowObject(Msg.hwnd);
WindowObject = IntGetWindowObject(Msg->hwnd);
if(!WindowObject)
{
SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
@ -119,20 +110,20 @@ NtUserDispatchMessage(CONST MSG* UnsafeMsg)
{
Result = IntCallWindowProc(WindowObject->WndProcW,
FALSE,
Msg.hwnd,
Msg.message,
Msg.wParam,
Msg.lParam,
Msg->hwnd,
Msg->message,
Msg->wParam,
Msg->lParam,
-1);
}
else
{
Result = IntCallWindowProc(WindowObject->WndProcA,
TRUE,
Msg.hwnd,
Msg.message,
Msg.wParam,
Msg.lParam,
Msg->hwnd,
Msg->message,
Msg->wParam,
Msg->lParam,
-1);
}
@ -141,6 +132,23 @@ NtUserDispatchMessage(CONST MSG* UnsafeMsg)
return Result;
}
LRESULT STDCALL
NtUserDispatchMessage(CONST MSG* UnsafeMsg)
{
NTSTATUS Status;
MSG Msg;
Status = MmCopyFromCaller(&Msg, (PVOID) UnsafeMsg, sizeof(MSG));
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
return 0;
}
return IntDispatchMessage(&Msg);
}
VOID FASTCALL
IntSendSpecialMessages(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg)
{