Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 21:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- [Win32k] Make DispatchMessage call direct to WinProc callback. Add more thread death checks.

Browse source 
svn path=/trunk/; revision=44340
This commit is contained in:
James Tabor 2009-12-01 05:35:05 +00:00
parent 378568a6d9
commit 4a32024814
1 changed files with 47 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

53
reactos/subsystems/win32/win32k/ntuser/message.c
View file

@ -335,6 +335,9 @@ IntDispatchMessage(PMSG pMsg)
LARGE_INTEGER TickCount; LARGE_INTEGER TickCount;
LONG Time; LONG Time;
LRESULT retval; LRESULT retval;
PMSGMEMORY MsgMemoryEntry;
INT lParamBufferSize;
LPARAM lParamPacked;
PWINDOW_OBJECT Window = NULL; PWINDOW_OBJECT Window = NULL;
if (pMsg->hwnd) if (pMsg->hwnd)
@ -376,9 +379,37 @@ IntDispatchMessage(PMSG pMsg)
} }
} }
// Need a window! // Need a window!
if (!Window) return 0; if ( !Window || !Window->Wnd ) return 0;
retval = co_IntPostOrSendMessage(pMsg->hwnd, pMsg->message, pMsg->wParam, pMsg->lParam); /* See if this message type is present in the table */
MsgMemoryEntry = FindMsgMemory(pMsg->message);
if ( !MsgMemoryEntry )
{
lParamBufferSize = -1;
}
else
{
lParamBufferSize = MsgMemorySize(MsgMemoryEntry, pMsg->wParam, pMsg->lParam);
}
if (! NT_SUCCESS(PackParam(&lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam)))
{
DPRINT1("Failed to pack message parameters\n");
return 0;
}
retval = co_IntCallWindowProc( Window->Wnd->lpfnWndProc,
!Window->Wnd->Unicode,
pMsg->hwnd,
pMsg->message,
pMsg->wParam,
lParamPacked,
lParamBufferSize);
if (! NT_SUCCESS(UnpackParam(lParamPacked, pMsg->message, pMsg->wParam, pMsg->lParam)))
{
DPRINT1("Failed to unpack message parameters\n");
}
if (pMsg->message == WM_PAINT) if (pMsg->message == WM_PAINT)
{ {
@ -1324,7 +1355,7 @@ UserPostThreadMessage( DWORD idThread,
if( Status == STATUS_SUCCESS ) if( Status == STATUS_SUCCESS )
{ {
pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; pThread = (PTHREADINFO)peThread->Tcb.Win32Thread;
if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP))
{ {
ObDereferenceObject( peThread ); ObDereferenceObject( peThread );
return FALSE; return FALSE;
@ -1370,7 +1401,6 @@ UserPostMessage(HWND Wnd,
wParam, wParam,
lParam); lParam);
pti = PsGetCurrentThreadWin32Thread();
if (Wnd == HWND_BROADCAST) if (Wnd == HWND_BROADCAST)
{ {
HWND *List; HWND *List;
@ -1392,11 +1422,19 @@ UserPostMessage(HWND Wnd,
PWINDOW_OBJECT Window; PWINDOW_OBJECT Window;
Window = UserGetWindowObject(Wnd); Window = UserGetWindowObject(Wnd);
if (NULL == Window) if ( !Window || !Window->Wnd )
{ {
return FALSE; return FALSE;
} }
if(Window->Status & WINDOWSTATUS_DESTROYING)
pti = Window->Wnd->head.pti;
if ( pti->TIF_flags & TIF_INCLEANUP )
{
DPRINT1("Attempted to post message to window 0x%x when the thread is in cleanup!\n", Wnd);
return FALSE;
}
if ( Window->Status & WINDOWSTATUS_DESTROYING )
{ {
DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd);
/* FIXME - last error code? */ /* FIXME - last error code? */
@ -1761,6 +1799,9 @@ co_IntDoSendMessage(HWND hWnd,
Info.Ansi = !Window->Wnd->Unicode; Info.Ansi = !Window->Wnd->Unicode;
Info.Proc = Window->Wnd->lpfnWndProc; Info.Proc = Window->Wnd->lpfnWndProc;
// Make the call from here if CALLWNDPROC or CALLWNDPROCRET are hooked
// or just do it in User32!
IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result); IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result);
} }
else else