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

use IntGetWindowObject() and IntReleaseWindowObject()

Browse source 
svn path=/trunk/; revision=6763
This commit is contained in:
Thomas Bluemel 2003-11-23 12:41:42 +00:00
parent bfb5636854
commit 1d4b120ca5
1 changed files with 27 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: message.c,v 1.34 2003/11/21 17:01:16 navaraf Exp $ /* $Id: message.c,v 1.35 2003/11/23 12:41:42 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -95,14 +95,10 @@ NtUserDispatchMessage(CONST MSG* UnsafeMsg)
if( Msg.hwnd == 0 ) return 0; if( Msg.hwnd == 0 ) return 0;
/* Get the window object. */ /* Get the window object. */
Status = WindowObject = IntGetWindowObject(Msg.hwnd);
ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation->HandleTable, if(!WindowObject)
Msg.hwnd,
otWindow,
(PVOID*)&WindowObject);
if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
return 0; return 0;
} }
@ -115,6 +111,8 @@ NtUserDispatchMessage(CONST MSG* UnsafeMsg)
Msg.wParam, Msg.wParam,
Msg.lParam); Msg.lParam);
IntReleaseWindowObject(WindowObject);
return Result; return Result;
} }
@ -226,16 +224,11 @@ NtUserPeekMessage(LPMSG UnsafeMsg,
/* Validate input */ /* Validate input */
if (NULL != Wnd) if (NULL != Wnd)
{ {
Status = ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation->HandleTable, Window = IntGetWindowObject(Wnd);
Wnd, otWindow, (PVOID*)&Window); if(!Window)
if (!NT_SUCCESS(Status))
{
Wnd = NULL; Wnd = NULL;
}
else else
{ IntReleaseWindowObject(Window);
ObmDereferenceObject(Window);
}
} }
if (MsgFilterMax < MsgFilterMin) if (MsgFilterMax < MsgFilterMin)
{ {
@ -311,16 +304,11 @@ NtUserGetMessage(LPMSG UnsafeMsg,
/* Validate input */ /* Validate input */
if (NULL != Wnd) if (NULL != Wnd)
{ {
Status = ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation->HandleTable, Window = IntGetWindowObject(Wnd);
Wnd, otWindow, (PVOID*)&Window); if(!Window)
if (!NT_SUCCESS(Status))
{
Wnd = NULL; Wnd = NULL;
}
else else
{ IntReleaseWindowObject(Window);
ObmDereferenceObject(Window);
}
} }
if (MsgFilterMax < MsgFilterMin) if (MsgFilterMax < MsgFilterMin)
{ {
@ -375,7 +363,6 @@ NtUserPostMessage(HWND hWnd,
PWINDOW_OBJECT Window; PWINDOW_OBJECT Window;
MSG Mesg; MSG Mesg;
PUSER_MESSAGE Message; PUSER_MESSAGE Message;
NTSTATUS Status;
LARGE_INTEGER LargeTickCount; LARGE_INTEGER LargeTickCount;
if (WM_QUIT == Msg) if (WM_QUIT == Msg)
@ -384,11 +371,10 @@ NtUserPostMessage(HWND hWnd,
} }
else else
{ {
Status = ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation->HandleTable, Window = IntGetWindowObject(hWnd);
hWnd, otWindow, (PVOID*)&Window); if (!Window)
if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
return FALSE; return FALSE;
} }
Mesg.hwnd = hWnd; Mesg.hwnd = hWnd;
@ -401,7 +387,7 @@ NtUserPostMessage(HWND hWnd,
Mesg.time = LargeTickCount.u.LowPart; Mesg.time = LargeTickCount.u.LowPart;
Message = MsqCreateMessage(&Mesg); Message = MsqCreateMessage(&Mesg);
MsqPostMessage(Window->MessageQueue, Message); MsqPostMessage(Window->MessageQueue, Message);
ObmDereferenceObject(Window); IntReleaseWindowObject(Window);
} }
return TRUE; return TRUE;
@ -465,14 +451,10 @@ IntSendMessage(HWND hWnd,
/* FIXME: Check for a broadcast or topmost destination. */ /* FIXME: Check for a broadcast or topmost destination. */
/* FIXME: Call hooks. */ /* FIXME: Call hooks. */
Window = IntGetWindowObject(hWnd);
Status = if (!Window)
ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation->HandleTable,
hWnd,
otWindow,
(PVOID*)&Window);
if (!NT_SUCCESS(Status))
{ {
SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
return 0; return 0;
} }
@ -485,11 +467,13 @@ IntSendMessage(HWND hWnd,
{ {
Result = IntCallTrampolineWindowProc(NULL, hWnd, Msg, wParam, Result = IntCallTrampolineWindowProc(NULL, hWnd, Msg, wParam,
lParam); lParam);
IntReleaseWindowObject(Window);
return Result; return Result;
} }
else else
{ {
Result = IntCallWindowProc(Window->WndProcW, hWnd, Msg, wParam, lParam); Result = IntCallWindowProc(Window->WndProcW, hWnd, Msg, wParam, lParam);
IntReleaseWindowObject(Window);
return Result; return Result;
} }
} }
@ -512,7 +496,7 @@ IntSendMessage(HWND hWnd,
Message->CompletionCallback = NULL; Message->CompletionCallback = NULL;
MsqSendMessage(Window->MessageQueue, Message); MsqSendMessage(Window->MessageQueue, Message);
ObmDereferenceObject(Window); IntReleaseWindowObject(Window);
Status = KeWaitForSingleObject(CompletionEvent, Status = KeWaitForSingleObject(CompletionEvent,
UserRequest, UserRequest,
UserMode, UserMode,