Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-14 21:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix message regressions from 54637.

Browse source 
svn path=/trunk/; revision=56403
This commit is contained in:
James Tabor 2012-04-24 02:29:07 +00:00
parent bbf9dac724
commit 1356410d99
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
reactos/win32ss/user/ntuser/message.c
View file

@ -1448,17 +1448,13 @@ co_IntSendMessageNoWait(HWND hWnd,
LPARAM lParam) LPARAM lParam)
{ {
ULONG_PTR Result = 0; ULONG_PTR Result = 0;
if (!co_IntSendMessageWithCallBack( hWnd, return co_IntSendMessageWithCallBack( hWnd,
Msg, Msg,
wParam, wParam,
lParam, lParam,
NULL, NULL,
0, 0,
&Result)) &Result);
{
Result = ((ULONG_PTR)-1);
}
return Result;
} }
/* MSDN: /* MSDN:
If you send a message in the range below WM_USER to the asynchronous message If you send a message in the range below WM_USER to the asynchronous message
@ -1507,6 +1503,15 @@ co_IntSendMessageWithCallBack( HWND hWnd,
RETURN(FALSE); RETURN(FALSE);
} }
if (Msg & 0x80000000 &&
Window->head.pti->MessageQueue == Win32Thread->MessageQueue)
{
ERR("SMWCB: Internal Message!\n");
Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam );
if (uResult) *uResult = Result;
RETURN( TRUE);
}
/* See if this message type is present in the table */ /* See if this message type is present in the table */
MsgMemoryEntry = FindMsgMemory(Msg); MsgMemoryEntry = FindMsgMemory(Msg);
if (NULL == MsgMemoryEntry) if (NULL == MsgMemoryEntry)
@ -1534,14 +1539,6 @@ co_IntSendMessageWithCallBack( HWND hWnd,
RETURN(FALSE); RETURN(FALSE);
} }
if (Msg & 0x80000000)
{
ERR("SMWCB: Internal Message!\n");
Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam );
if (uResult) *uResult = Result;
RETURN( TRUE);
}
IntCallWndProc( Window, hWnd, Msg, wParam, lParam); IntCallWndProc( Window, hWnd, Msg, wParam, lParam);
if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) if ( Window->state & WNDS_SERVERSIDEWINDOWPROC )
@ -1784,7 +1781,6 @@ UserSendNotifyMessage( HWND hWnd,
else else
{ {
Ret = co_IntSendMessageNoWait( hWnd, Msg, wParam, lParam); Ret = co_IntSendMessageNoWait( hWnd, Msg, wParam, lParam);
if (-1 == (int) Ret || !Ret) Ret = FALSE;
} }
return Ret; return Ret;
} }